From 40dbeba01f62d480e9b43d93e8f9ab1dae954098 Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Mon, 11 Dec 2023 15:46:03 +0100
Subject: [PATCH 01/11] Update Document from upstream scip.proto

This copies the latest additions to the Document message:
 * a new language field and Language enum
 * a new text field, to embed the document content itself.
This is meant for the new SymbolInformation::signature_documentation
field.

This also updates some documentation comments.
---
 scip-java-proto/src/main/protobuf/scip.proto | 158 ++++++++++++++++++-
 1 file changed, 154 insertions(+), 4 deletions(-)

diff --git a/scip-java-proto/src/main/protobuf/scip.proto b/scip-java-proto/src/main/protobuf/scip.proto
index 6504ad740..63e6fc365 100644
--- a/scip-java-proto/src/main/protobuf/scip.proto
+++ b/scip-java-proto/src/main/protobuf/scip.proto
@@ -69,14 +69,38 @@ message ToolInfo {
 
 // Document defines the metadata about a source file on disk.
 message Document {
-  // (Required) Path to the text document relative to the directory supplied in
-  // the associated `Metadata.project_root`. Not URI-encoded. This value should
-  // not begin with a directory separator.
+  // The string ID for the programming language this file is written in.
+  // The `Language` enum contains the names of most common programming languages.
+  // This field is typed as a string to permit any programming language, including
+  // ones that are not specified by the `Language` enum.
+  string language = 4;
+  // (Required) Unique path to the text document.
+  //
+  // 1. The path must be relative to the directory supplied in the associated
+  //    `Metadata.project_root`.
+  // 2. The path must not begin with a leading '/'.
+  // 3. The path must point to a regular file, not a symbolic link.
+  // 4. The path must use '/' as the separator, including on Windows.
+  // 5. The path must be canonical; it cannot include empty components ('//'),
+  //    or '.' or '..'.
   string relative_path = 1;
   // Occurrences that appear in this file.
   repeated Occurrence occurrences = 2;
-  // Symbols that are defined within this document.
+  // Symbols that are "defined" within this document.
+  //
+  // This should include symbols which technically do not have any definition,
+  // but have a reference and are defined by some other symbol (see
+  // Relationship.is_definition).
   repeated SymbolInformation symbols = 3;
+
+  // (optional) Text contents of the this document. Indexers are not expected to
+  // include the text by default. It's preferrable that clients read the text
+  // contents from the file system by resolving the absolute path from joining
+  // `Index.metadata.project_root` and `Document.relative_path`. This field was
+  // introduced to support `SymbolInformation.signature_documentation`, but it
+  // can be used for other purposes as well, for example testing or when working
+  // with virtual/in-memory documents.
+  string text = 5;
 }
 
 // Symbol is similar to a URI, it identifies a class, method, or a local
@@ -382,3 +406,129 @@ enum DiagnosticTag {
     Unnecessary = 1;
     Deprecated = 2;
 }
+
+// Language standardises names of common programming languages that can be used
+// for the `Document.language` field. The primary purpose of this enum is to
+// prevent a situation where we have a single programming language ends up with
+// multiple string representations. For example, the C++ language uses the name
+// "CPP" in this enum and other names such as "cpp" are incompatible.
+// Feel free to send a pull-request to add missing programming languages.
+enum Language {
+  UnspecifiedLanguage = 0;
+  ABAP = 60;
+  Apex = 96;
+  APL = 49;
+  Ada = 39;
+  Agda = 45;
+  AsciiDoc = 86;
+  Assembly = 58;
+  Awk = 66;
+  Bat = 68;
+  BibTeX = 81;
+  C = 34;
+  COBOL = 59;
+  CPP = 35; // C++ (the name "CPP" was chosen for consistency with LSP)
+  CSS = 26;
+  CSharp = 1;
+  Clojure = 8;
+  Coffeescript = 21;
+  CommonLisp = 9;
+  Coq = 47;
+  CUDA = 97;
+  Dart = 3;
+  Delphi = 57;
+  Diff = 88;
+  Dockerfile = 80;
+  Dyalog = 50;
+  Elixir = 17;
+  Erlang = 18;
+  FSharp = 42;
+  Fish = 65;
+  Flow = 24;
+  Fortran = 56;
+  Git_Commit = 91;
+  Git_Config = 89;
+  Git_Rebase = 92;
+  Go = 33;
+  GraphQL = 98;
+  Groovy = 7;
+  HTML = 30;
+  Hack = 20;
+  Handlebars = 90;
+  Haskell = 44;
+  Idris = 46;
+  Ini = 72;
+  J = 51;
+  JSON = 75;
+  Java = 6;
+  JavaScript = 22;
+  JavaScriptReact = 93;
+  Jsonnet = 76;
+  Julia =  55;
+  Justfile = 109;
+  Kotlin = 4;
+  LaTeX = 83;
+  Lean = 48;
+  Less = 27;
+  Lua = 12;
+  Luau = 108;
+  Makefile = 79;
+  Markdown = 84;
+  Matlab = 52;
+  Nickel = 110; // https://nickel-lang.org/
+  Nix = 77;
+  OCaml = 41;
+  Objective_C = 36;
+  Objective_CPP = 37;
+  Pascal = 99;
+  PHP = 19;
+  PLSQL = 70;
+  Perl = 13;
+  PowerShell = 67;
+  Prolog = 71;
+  Protobuf = 100;
+  Python = 15;
+  R = 54;
+  Racket = 11;
+  Raku = 14;
+  Razor = 62;
+  Repro = 102; // Internal language for testing SCIP
+  ReST = 85;
+  Ruby = 16;
+  Rust = 40;
+  SAS = 61;
+  SCSS = 29;
+  SML = 43;
+  SQL = 69;
+  Sass = 28;
+  Scala = 5;
+  Scheme = 10;
+  ShellScript = 64; // Bash
+  Skylark = 78;
+  Slang = 107;
+  Solidity = 95;
+  Svelte = 106;
+  Swift = 2;
+  Tcl = 101;
+  TOML = 73;
+  TeX = 82;
+  Thrift = 103;
+  TypeScript = 23;
+  TypeScriptReact = 94;
+  Verilog = 104;
+  VHDL = 105;
+  VisualBasic = 63;
+  Vue = 25;
+  Wolfram = 53;
+  XML = 31;
+  XSL = 32;
+  YAML = 74;
+  Zig = 38;
+  // NextLanguage = 111;
+  // Steps add a new language:
+  // 1. Copy-paste the "NextLanguage = N" line above
+  // 2. Increment "NextLanguage = N" to "NextLanguage = N+1"
+  // 3. Replace "NextLanguage = N" with the name of the new language.
+  // 4. Move the new language to the correct line above using alphabetical order
+  // 5. (optional) Add a brief comment behind the language if the name is not self-explanatory
+}

From 42aac2ae8fa6fe5600347220a5fd45e14a8313db Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Mon, 11 Dec 2023 14:23:19 +0100
Subject: [PATCH 02/11] Update SymbolInformation from upstream scip.proto

This copies the latest additions to the SymbolInformation message:
 * the documentation field is explicitly not meant for signature
   documentation anymore, instead a new signature_documentation field
   is added
 * a new display_name field is added
 * a new enclosing_symbol field is added for local symbols
 * a new kind field is added along with a Kind enum to have a
   finer-grained classification than the one provided by descriptor
   suffixes (and is especially useful for local symbols which don't
   have suffixes)
---
 scip-java-proto/src/main/protobuf/scip.proto | 199 ++++++++++++++++++-
 1 file changed, 196 insertions(+), 3 deletions(-)

diff --git a/scip-java-proto/src/main/protobuf/scip.proto b/scip-java-proto/src/main/protobuf/scip.proto
index 63e6fc365..df5bd7fdf 100644
--- a/scip-java-proto/src/main/protobuf/scip.proto
+++ b/scip-java-proto/src/main/protobuf/scip.proto
@@ -169,12 +169,205 @@ message SymbolInformation {
   // The string must be formatted according to the grammar in `Symbol`.
   string symbol = 1;
   // (optional, but strongly recommended) The markdown-formatted documentation
-  // for this symbol. This field is repeated to allow different kinds of
-  // documentation.  For example, it's nice to include both the signature of a
-  // method (parameters and return type) along with the accompanying docstring.
+  // for this symbol. Use `SymbolInformation.signature_documentation` to
+  // document the method/class/type signature of this symbol.
+  // Due to historical reasons, indexers may include signature documentation in
+  // this field by rendering markdown code blocks. New indexers should only
+  // include non-code documentation in this field, for example docstrings.
   repeated string documentation = 3;
   // (optional) Relationships to other symbols (e.g., implements, type definition).
   repeated Relationship relationships = 4;
+  // The kind of this symbol. Use this field instead of
+  // `SymbolDescriptor.Suffix` to determine whether something is, for example, a
+  // class or a method.
+  Kind kind = 5;
+  // (optional) Kind represents the fine-grained category of a symbol, suitable for presenting
+  // information about the symbol's meaning in the language.
+  //
+  // For example:
+  // - A Java method would have the kind `Method` while a Go function would
+  //   have the kind `Function`, even if the symbols for these use the same
+  //   syntax for the descriptor `SymbolDescriptor.Suffix.Method`.
+  // - A Go struct has the symbol kind `Struct` while a Java class has
+  //   the symbol kind `Class` even if they both have the same descriptor:
+  //   `SymbolDescriptor.Suffix.Type`.
+  //
+  // Since Kind is more fine-grained than Suffix:
+  // - If two symbols have the same Kind, they should share the same Suffix.
+  // - If two symbols have different Suffixes, they should have different Kinds.
+  enum Kind {
+      UnspecifiedKind = 0;
+      // A method which may or may not have a body. For Java, Kotlin etc.
+      AbstractMethod = 66;
+      // For Ruby's attr_accessor
+      Accessor = 72;
+      Array = 1;
+      // For Alloy
+      Assertion = 2;
+      AssociatedType = 3;
+      // For C++
+      Attribute = 4;
+      // For Lean
+      Axiom = 5;
+      Boolean = 6;
+      Class = 7;
+      Constant = 8;
+      Constructor = 9;
+      // For Solidity
+      Contract = 62;
+      // For Haskell
+      DataFamily = 10;
+      // For C# and F#
+      Delegate = 73;
+      Enum = 11;
+      EnumMember = 12;
+      Error = 63;
+      Event = 13;
+      // For Alloy
+      Fact = 14;
+      Field = 15;
+      File = 16;
+      Function = 17;
+      // For 'get' in Swift, 'attr_reader' in Ruby
+      Getter = 18;
+      // For Raku
+      Grammar = 19;
+      // For Purescript and Lean
+      Instance = 20;
+      Interface = 21;
+      Key = 22;
+      // For Racket
+      Lang = 23;
+      // For Lean
+      Lemma = 24;
+      // For solidity
+      Library = 64;
+      Macro = 25;
+      Method = 26;
+      // For Ruby
+      MethodAlias = 74;
+      // Analogous to 'ThisParameter' and 'SelfParameter', but for languages
+      // like Go where the receiver doesn't have a conventional name.
+      MethodReceiver = 27;
+      // Analogous to 'AbstractMethod', for Go.
+      MethodSpecification = 67;
+      // For Protobuf
+      Message = 28;
+      // For Solidity
+      Modifier = 65;
+      Module = 29;
+      Namespace = 30;
+      Null = 31;
+      Number = 32;
+      Object = 33;
+      Operator = 34;
+      Package = 35;
+      PackageObject = 36;
+      Parameter = 37;
+      ParameterLabel = 38;
+      // For Haskell's PatternSynonyms
+      Pattern = 39;
+      // For Alloy
+      Predicate = 40;
+      Property = 41;
+      // Analogous to 'Trait' and 'TypeClass', for Swift and Objective-C
+      Protocol = 42;
+      // Analogous to 'AbstractMethod', for Swift and Objective-C.
+      ProtocolMethod = 68;
+      // Analogous to 'AbstractMethod', for C++.
+      PureVirtualMethod = 69;
+      // For Haskell
+      Quasiquoter = 43;
+      // 'self' in Python, Rust, Swift etc.
+      SelfParameter = 44;
+      // For 'set' in Swift, 'attr_writer' in Ruby
+      Setter = 45;
+      // For Alloy, analogous to 'Struct'.
+      Signature = 46;
+      // For Ruby
+      SingletonClass = 75;
+      // Analogous to 'StaticMethod', for Ruby.
+      SingletonMethod = 76;
+      // Analogous to 'StaticField', for C++
+      StaticDataMember = 77;
+      // For C#
+      StaticEvent = 78;
+      // For C#
+      StaticField = 79;
+      // For Java, C#, C++ etc.
+      StaticMethod = 80;
+      // For C#, TypeScript etc.
+      StaticProperty = 81;
+      // For C, C++
+      StaticVariable = 82;
+      String = 48;
+      Struct = 49;
+      // For Swift
+      Subscript = 47;
+      // For Lean
+      Tactic = 50;
+      // For Lean
+      Theorem = 51;
+      // Method receiver for languages
+      // 'this' in JavaScript, C++, Java etc.
+      ThisParameter = 52;
+      // Analogous to 'Protocol' and 'TypeClass', for Rust, Scala etc.
+      Trait = 53;
+      // Analogous to 'AbstractMethod', for Rust, Scala etc.
+      TraitMethod = 70;
+      // Data type definition for languages like OCaml which use `type`
+      // rather than separate keywords like `struct` and `enum`.
+      Type = 54;
+      TypeAlias = 55;
+      // Analogous to 'Trait' and 'Protocol', for Haskell, Purescript etc.
+      TypeClass = 56;
+      // Analogous to 'AbstractMethod', for Haskell, Purescript etc.
+      TypeClassMethod = 71;
+      // For Haskell
+      TypeFamily = 57;
+      TypeParameter = 58;
+      // For C, C++, Capn Proto
+      Union = 59;
+      Value = 60;
+      Variable = 61;
+      // Next = 83;
+      // Feel free to open a PR proposing new language-specific kinds.
+  }
+  // (optional) The name of this symbol as it should be displayed to the user.
+  // For example, the symbol "com/example/MyClass#myMethod(+1)." should have the
+  // display name "myMethod". The `symbol` field is not a reliable source of
+  // the display name for several reasons:
+  //
+  // - Local symbols don't encode the name.
+  // - Some languages have case-insensitive names, so the symbol is all-lowercase.
+  // - The symbol may encode names with special characters that should not be
+  //   displayed to the user.
+  string display_name = 6;
+  // (optional) The signature of this symbol as it's displayed in API
+  // documentation or in hover tooltips. For example, a Java method that adds
+  // two numbers this would have `Document.language = "java"` and `Document.text
+  // = "void add(int a, int b)". The `language` and `text` fields are required
+  // while other fields such as `Documentation.occurrences` can be optionally
+  // included to support hyperlinking referenced symbols in the signature.
+  Document signature_documentation = 7;
+  // (optional) The enclosing symbol if this is a local symbol.  For non-local
+  // symbols, the enclosing symbol should be parsed from the `symbol` field
+  // using the `Descriptor` grammar.
+  //
+  // The primary use-case for this field is to allow local symbol to be displayed
+  // in a symbol hierarchy for API documentation. It's OK to leave this field
+  // empty for local variables since local variables usually don't belong in API
+  // documentation. However, in the situation that you wish to include a local
+  // symbol in the hierarchy, then you can use `enclosing_symbol` to locate the
+  // "parent" or "owner" of this local symbol. For example, a Java indexer may
+  // choose to use local symbols for private class fields while providing an
+  // `enclosing_symbol` to reference the enclosing class to allow the field to
+  // be part of the class documentation hierarchy. From the perspective of an
+  // author of an indexer, the decision to use a local symbol or global symbol
+  // should exclusively be determined whether the local symbol is accessible
+  // outside the document, not by the capability to find the enclosing
+  // symbol.
+  string enclosing_symbol = 8;
 }
 
 message Relationship {

From 0e751447618bedc589a373953884f53cf51914a3 Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Mon, 11 Dec 2023 15:33:19 +0100
Subject: [PATCH 03/11] Forward display_name from SemanticDB to SCIP

The SemanticDB schema already provides a display_name field, forward it
to the SCIP output in scip-semanticdb.
This also adds support to the ScipPrinters testing utility and updates
the tests accordingly.
---
 .../sourcegraph/scip_java/ScipPrinters.scala  |   7 +
 .../scip_semanticdb/ScipSemanticdb.java       |   2 +
 .../src/main/generated/BaseByteRenderer.scala |  68 +++++
 .../src/main/generated/BaseCharRenderer.scala |  68 +++++
 .../src/main/generated/ByteParser.scala       | 148 +++++++++++
 .../src/main/generated/CharParser.scala       | 148 +++++++++++
 .../com/airbnb/epoxy/ActivityRecyclerPool.kt  |  29 +++
 .../airbnb/epoxy/AsyncEpoxyController.java    |   9 +
 .../com/airbnb/epoxy/AsyncEpoxyDiffer.java    |  68 +++++
 .../com/airbnb/epoxy/BaseEpoxyAdapter.java    |  83 ++++++
 .../airbnb/epoxy/BaseEpoxyTouchCallback.java  |   8 +
 .../com/airbnb/epoxy/BoundViewHolders.java    |  19 ++
 .../generated/com/airbnb/epoxy/Carousel.java  | 119 +++++++++
 .../com/airbnb/epoxy/ControllerHelper.java    |  12 +
 .../airbnb/epoxy/ControllerHelperLookup.java  |  19 ++
 .../com/airbnb/epoxy/ControllerModelList.java |  11 +
 .../com/airbnb/epoxy/DebugTimer.java          |  11 +
 .../com/airbnb/epoxy/DiffHelper.java          |  64 +++++
 .../com/airbnb/epoxy/DiffPayload.java         |  24 ++
 .../com/airbnb/epoxy/DiffResult.java          |  22 ++
 .../com/airbnb/epoxy/EpoxyAdapter.java        |  75 ++++++
 .../com/airbnb/epoxy/EpoxyAsyncUtil.java      |  13 +
 .../com/airbnb/epoxy/EpoxyController.java     | 170 ++++++++++++
 .../airbnb/epoxy/EpoxyControllerAdapter.java  |  71 ++++++
 .../com/airbnb/epoxy/EpoxyDiffLogger.java     |  21 ++
 .../com/airbnb/epoxy/EpoxyDragCallback.java   |  14 +
 .../com/airbnb/epoxy/EpoxyHolder.java         |   6 +
 .../epoxy/EpoxyItemSpacingDecorator.java      |  63 +++++
 .../com/airbnb/epoxy/EpoxyModel.java          | 123 +++++++++
 .../com/airbnb/epoxy/EpoxyModelGroup.java     |  87 +++++++
 .../airbnb/epoxy/EpoxyModelTouchCallback.java |  92 +++++++
 .../airbnb/epoxy/EpoxyModelWithHolder.java    |  32 +++
 .../com/airbnb/epoxy/EpoxyModelWithView.java  |   9 +
 .../com/airbnb/epoxy/EpoxyRecyclerView.kt     | 135 ++++++++++
 .../com/airbnb/epoxy/EpoxySwipeCallback.java  |  19 ++
 .../com/airbnb/epoxy/EpoxyTouchHelper.java    | 190 ++++++++++++++
 .../epoxy/EpoxyTouchHelperCallback.java       | 108 ++++++++
 .../com/airbnb/epoxy/EpoxyViewHolder.java     |  30 +++
 .../com/airbnb/epoxy/EpoxyVisibilityItem.kt   |  91 +++++++
 .../airbnb/epoxy/EpoxyVisibilityTracker.kt    | 140 ++++++++++
 .../com/airbnb/epoxy/GeneratedModel.java      |   9 +
 .../generated/com/airbnb/epoxy/GroupModel.kt  |   6 +
 .../com/airbnb/epoxy/HandlerExecutor.java     |   6 +
 .../com/airbnb/epoxy/HiddenEpoxyModel.java    |   7 +
 .../generated/com/airbnb/epoxy/IdUtils.java   |   9 +
 .../com/airbnb/epoxy/IllegalEpoxyUsage.java   |   3 +
 .../airbnb/epoxy/ImmutableModelException.java |  13 +
 .../com/airbnb/epoxy/InternalExposer.kt       |   5 +
 .../com/airbnb/epoxy/ListenersUtils.java      |   9 +
 .../com/airbnb/epoxy/MainThreadExecutor.java  |   5 +
 .../com/airbnb/epoxy/ModelCollector.kt        |   3 +
 .../com/airbnb/epoxy/ModelGroupHolder.kt      | 106 ++++++++
 .../generated/com/airbnb/epoxy/ModelList.java | 144 +++++++++++
 .../com/airbnb/epoxy/ModelState.java          |  15 ++
 .../airbnb/epoxy/NoOpControllerHelper.java    |   3 +
 .../generated/com/airbnb/epoxy/NoOpTimer.java |   5 +
 .../com/airbnb/epoxy/NotifyBlocker.java       |  23 ++
 .../airbnb/epoxy/OnModelBoundListener.java    |   7 +
 .../epoxy/OnModelBuildFinishedListener.java   |   3 +
 .../epoxy/OnModelCheckedChangeListener.java   |   9 +
 .../airbnb/epoxy/OnModelClickListener.java    |   8 +
 .../epoxy/OnModelLongClickListener.java       |   8 +
 .../airbnb/epoxy/OnModelUnboundListener.java  |   6 +
 .../OnModelVisibilityChangedListener.java     |  10 +
 ...OnModelVisibilityStateChangedListener.java |   7 +
 .../epoxy/QuantityStringResAttribute.java     |  21 ++
 .../com/airbnb/epoxy/SimpleEpoxyAdapter.java  |  50 ++++
 .../airbnb/epoxy/SimpleEpoxyController.java   |   8 +
 .../com/airbnb/epoxy/SimpleEpoxyModel.java    |  24 ++
 .../com/airbnb/epoxy/StringAttributeData.java |  33 +++
 .../airbnb/epoxy/StyleBuilderCallback.java    |   4 +
 .../generated/com/airbnb/epoxy/Timer.java     |   4 +
 .../airbnb/epoxy/Typed2EpoxyController.java   |  23 ++
 .../airbnb/epoxy/Typed3EpoxyController.java   |  27 ++
 .../airbnb/epoxy/Typed4EpoxyController.java   |  31 +++
 .../airbnb/epoxy/TypedEpoxyController.java    |  20 ++
 .../com/airbnb/epoxy/UnboundedViewPool.kt     |  18 ++
 .../generated/com/airbnb/epoxy/UpdateOp.java  |  27 ++
 .../com/airbnb/epoxy/UpdateOpHelper.java      |  52 ++++
 .../com/airbnb/epoxy/ViewHolderState.java     |  46 ++++
 .../com/airbnb/epoxy/ViewTypeManager.java     |  17 ++
 .../com/airbnb/epoxy/VisibilityState.java     |  10 +
 ...rappedEpoxyModelCheckedChangeListener.java |  15 ++
 .../epoxy/WrappedEpoxyModelClickListener.kt   |  50 ++++
 .../epoxy/preload/EpoxyModelPreloader.kt      |  65 +++++
 .../airbnb/epoxy/preload/EpoxyPreloader.kt    | 125 +++++++++
 .../epoxy/preload/PreloadTargetProvider.kt    |  12 +
 .../com/airbnb/epoxy/preload/Preloadable.kt   |   3 +
 .../preload/PreloadableViewDataProvider.kt    |  65 +++++
 .../epoxy/preload/PreloaderExtensions.kt      |  11 +
 .../stickyheader/StickyHeaderCallbacks.kt     |   7 +
 .../StickyHeaderLinearLayoutManager.kt        | 203 +++++++++++++++
 .../generated/com/airbnb/epoxy/utils/utils.kt |   2 +
 .../src/main/scala/minimized/Issue396.scala   |  12 +
 .../src/main/scala/minimized/Issue397.scala   |   4 +
 .../src/main/scala/minimized/Issue403.scala   |  14 +
 .../src/main/scala/minimized/Issue412.scala   |   6 +
 .../src/main/scala/minimized/Issue413.scala   |  11 +
 .../src/main/scala/minimized/Issue414.scala   |   7 +
 .../scala/minimized/Issue414Reference.scala   |   1 +
 .../scala/minimized/MinimizedScalaMain.scala  |   3 +
 .../minimized/MinimizedScalaSignatures.scala  |  66 +++++
 .../minimized/MinimizedScalaSynthetic.scala   |  11 +
 .../main/scala/minimized/ReflectiveCall.scala |   5 +
 .../main/java/minimized/AbstractClasses.java  |   4 +
 .../src/main/java/minimized/Annotations.java  |   3 +
 .../main/java/minimized/AnonymousClasses.java |   7 +
 .../src/main/java/minimized/Arrays.java       |   7 +
 .../src/main/java/minimized/ClassOf.java      |   3 +
 .../src/main/java/minimized/Docstrings.java   |   7 +
 .../src/main/java/minimized/Enums.java        |  11 +
 .../src/main/java/minimized/Fields.java       |  19 ++
 .../java/minimized/ForComprehensions.java     |   7 +
 .../src/main/java/minimized/InnerClasses.java |  44 ++++
 .../src/main/java/minimized/Interfaces.java   |   4 +
 .../main/java/minimized/LombokBuilder.java    |  12 +
 .../src/main/java/minimized/Methods.java      |  18 ++
 .../java/minimized/MinimizedJavaMain.java     |   4 +
 .../java/minimized/ParameterizedTypes.java    |  18 ++
 .../src/main/java/minimized/Primitives.java   |  13 +
 .../src/main/java/minimized/RawTypes.java     |   3 +
 .../src/main/java/minimized/SubClasses.java   |   6 +
 .../src/main/java/minimized/TabIndented.java  |   8 +
 .../main/java/minimized/TypeVariables.java    |  15 ++
 .../main/generated/ujson/AstTransformer.scala |  51 ++++
 .../generated/ujson/ByteArrayParser.scala     |  17 ++
 .../generated/ujson/ByteBufferParser.scala    |  18 ++
 .../generated/ujson/CharSequenceParser.scala  |  16 ++
 .../src/main/generated/ujson/Exceptions.scala |  27 ++
 .../main/generated/ujson/IndexedValue.scala   | 186 ++++++++++++++
 .../generated/ujson/InputStreamParser.scala   |  16 ++
 .../src/main/generated/ujson/JsVisitor.scala  |  44 ++++
 .../src/main/generated/ujson/Readable.scala   |  50 ++++
 .../src/main/generated/ujson/Renderer.scala   |  49 ++++
 .../main/generated/ujson/StringParser.scala   |  17 ++
 .../main/generated/ujson/Transformer.scala    |   9 +
 .../src/main/generated/ujson/Value.scala      | 241 ++++++++++++++++++
 .../src/main/generated/ujson/package.scala    |  54 ++++
 138 files changed, 4978 insertions(+)

diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
index eb73e1eff..e257abd5c 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
@@ -170,6 +170,13 @@ object ScipPrinters {
       case Some(info) if isDefinition =>
         val prefix =
           comment + (" " * indent.length) + (" " * carets.length) + " "
+        if (!info.getDisplayName.isEmpty) {
+          out
+            .append(prefix)
+            .append("display_name ")
+            .append(info.getDisplayName)
+            .append("\n")
+        }
         0.until(info.getDocumentationCount)
           .foreach { n =>
             val documentation = info.getDocumentation(n)
diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
index d566afeb2..5a06af821 100644
--- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
@@ -132,6 +132,8 @@ private void processTypedDocument(
         Scip.SymbolInformation.Builder scipInfo =
             Scip.SymbolInformation.newBuilder().setSymbol(typedSymbol(info.getSymbol(), pkg));
 
+        scipInfo.setDisplayName(info.getDisplayName());
+
         // TODO: this can be removed once https://github.com/sourcegraph/sourcegraph/issues/50927 is
         // fixed.
         ArrayList<String> inverseReferences = references.map.get(info.getSymbol());
diff --git a/tests/snapshots/src/main/generated/BaseByteRenderer.scala b/tests/snapshots/src/main/generated/BaseByteRenderer.scala
index 47f0674a1..be4ae23bb 100644
--- a/tests/snapshots/src/main/generated/BaseByteRenderer.scala
+++ b/tests/snapshots/src/main/generated/BaseByteRenderer.scala
@@ -23,12 +23,15 @@ import upickle.core.{ArrVisitor, ObjVisitor}
   */
 class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
+//                     display_name BaseByteRenderer
 //                     documentation ```scala\nclass BaseByteRenderer[T <: Output]\n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer.
 //    ________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer.
+//                     display_name BaseByteRenderer
 //                     documentation ```scala\nobject BaseByteRenderer\n```
 //                     relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
+//                       display_name T
 //                       documentation ```scala\nT <: Output\n```
 //                          ^^^^^^^ reference semanticdb maven . . upickle/
 //                                  ^^^^ reference semanticdb maven . . upickle/core/
@@ -36,25 +39,31 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.Output#
                       (out: T,
 //                     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
+//                         display_name out
 //                         documentation ```scala\nprivate[this] val out: T\n```
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(out)
 //                     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(out)
+//                         display_name out
 //                         documentation ```scala\nout: T \n```
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
+//                            display_name indent
 //                            documentation ```scala\nprivate[this] val indent: Int\n```
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(indent)
 //                     ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(indent)
+//                            display_name indent
 //                            documentation ```scala\ndefault indent: Int \n```
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                        escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
+//                                   display_name escapeUnicode
 //                                   documentation ```scala\nprivate[this] val escapeUnicode: Boolean\n```
 //                                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(escapeUnicode)
 //                     _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(escapeUnicode)
+//                                   display_name escapeUnicode
 //                                   documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
 //                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
@@ -64,6 +73,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                                                            ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   private[this] val elemBuilder = new upickle.core.ByteBuilder
 //                  ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
+//                              display_name elemBuilder
 //                              documentation ```scala\nprivate[this] val elemBuilder: ByteBuilder\n```
 //                                    ^^^^^^^ reference semanticdb maven . . upickle/
 //                                            ^^^^ reference semanticdb maven . . upickle/core/
@@ -71,6 +81,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                                            ^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#`<init>`().
   private[this] val unicodeCharBuilder = new upickle.core.CharBuilder()
 //                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#unicodeCharBuilder.
+//                                     display_name unicodeCharBuilder
 //                                     documentation ```scala\nprivate[this] val unicodeCharBuilder: CharBuilder\n```
 //                                           ^^^^^^^ reference semanticdb maven . . upickle/
 //                                                   ^^^^ reference semanticdb maven . . upickle/core/
@@ -78,6 +89,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#`<init>`().
   def flushByteBuilder() = {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushByteBuilder().
+//                     display_name flushByteBuilder
 //                     documentation ```scala\ndef flushByteBuilder(): Unit\n```
     elemBuilder.writeOutToIfLongerThan(out, if (depth == 0) 0 else 1000)
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
@@ -89,8 +101,10 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   private[this] var depth: Int = 0
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
+//                        display_name depth
 //                        documentation ```scala\nprivate[this] var depth: Int\n```
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`depth_=`().
+//                        display_name depth_=
 //                        documentation ```scala\nprivate[this] var depth_=(x$1: Int): Unit\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
@@ -98,13 +112,16 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   private[this] var commaBuffered = false
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
+//                                display_name commaBuffered
 //                                documentation ```scala\nprivate[this] var commaBuffered: Boolean\n```
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`commaBuffered_=`().
+//                                display_name commaBuffered_=
 //                                documentation ```scala\nprivate[this] var commaBuffered_=(x$1: Boolean): Unit\n```
 //                                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
 
   def flushBuffer() = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
+//                display_name flushBuffer
 //                documentation ```scala\ndef flushBuffer(): Unit\n```
     if (commaBuffered) {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
@@ -119,15 +136,19 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   }
   def visitArray(length: Int, index: Int) = new ArrVisitor[T, T] {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().
+//               display_name visitArray
 //               documentation ```scala\ndef visitArray(length: Int, index: Int): { def subVisitor: BaseByteRenderer[T] }\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().(length)
+//                      display_name length
 //                      documentation ```scala\nlength: Int \n```
 //                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().(index)
+//                                  display_name index
 //                                  documentation ```scala\nindex: Int \n```
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                              ^ definition local 1
+//                                                display_name $anon
 //                                                documentation ```scala\nfinal class $anon\n```
 //                                              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -146,17 +167,21 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
     def subVisitor = BaseByteRenderer.this
 //      ^^^^^^^^^^ definition local 0
+//                 display_name subVisitor
 //                 documentation ```scala\ndef subVisitor: BaseByteRenderer[T]\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 2
+//                 display_name visitValue
 //                 documentation ```scala\ndef visitValue(v: T, index: Int): Unit\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 4
+//                   display_name v
 //                   documentation ```scala\nv: T \n```
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                       ^^^^^ definition local 5
+//                             display_name index
 //                             documentation ```scala\nindex: Int \n```
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -167,9 +192,11 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
     }
     def visitEnd(index: Int) = {
 //      ^^^^^^^^ definition local 3
+//               display_name visitEnd
 //               documentation ```scala\ndef visitEnd(index: Int): T\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 6
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
       commaBuffered = false
@@ -191,15 +218,19 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   def visitObject(length: Int, index: Int) = new ObjVisitor[T, T] {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().
+//                display_name visitObject
 //                documentation ```scala\ndef visitObject(length: Int, index: Int): { def subVisitor: BaseByteRenderer[T]; def visitKey(index: Int): BaseByteRenderer[T] }\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().(length)
+//                       display_name length
 //                       documentation ```scala\nlength: Int \n```
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().(index)
+//                                   display_name index
 //                                   documentation ```scala\nindex: Int \n```
 //                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^ definition local 10
+//                                                 display_name $anon
 //                                                 documentation ```scala\nfinal class $anon\n```
 //                                               ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -217,22 +248,27 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
     def subVisitor = BaseByteRenderer.this
 //      ^^^^^^^^^^ definition local 7
+//                 display_name subVisitor
 //                 documentation ```scala\ndef subVisitor: BaseByteRenderer[T]\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitKey(index: Int) = BaseByteRenderer.this
 //      ^^^^^^^^ definition local 8
+//               display_name visitKey
 //               documentation ```scala\ndef visitKey(index: Int): BaseByteRenderer[T]\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition local 9
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitKeyValue(s: Any): Unit = {
 //      ^^^^^^^^^^^^^ definition local 11
+//                    display_name visitKeyValue
 //                    documentation ```scala\ndef visitKeyValue(s: Any): Unit\n```
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition local 14
+//                      display_name s
 //                      documentation ```scala\ns: Any \n```
 //                       ^^^ reference semanticdb maven . . scala/Any#
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -247,12 +283,15 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
     }
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 12
+//                 display_name visitValue
 //                 documentation ```scala\ndef visitValue(v: T, index: Int): Unit\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 15
+//                   display_name v
 //                   documentation ```scala\nv: T \n```
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                       ^^^^^ definition local 16
+//                             display_name index
 //                             documentation ```scala\nindex: Int \n```
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -261,9 +300,11 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
     }
     def visitEnd(index: Int) = {
 //      ^^^^^^^^ definition local 13
+//               display_name visitEnd
 //               documentation ```scala\ndef visitEnd(index: Int): T\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 17
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
       commaBuffered = false
@@ -285,9 +326,11 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   def visitNull(index: Int) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNull().
+//              display_name visitNull
 //              documentation ```scala\ndef visitNull(index: Int): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNull().(index)
+//                    display_name index
 //                    documentation ```scala\nindex: Int \n```
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -315,9 +358,11 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   def visitFalse(index: Int) = {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFalse().
+//               display_name visitFalse
 //               documentation ```scala\ndef visitFalse(index: Int): T\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFalse().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -348,9 +393,11 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   def visitTrue(index: Int) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitTrue().
+//              display_name visitTrue
 //              documentation ```scala\ndef visitTrue(index: Int): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitTrue().(index)
+//                    display_name index
 //                    documentation ```scala\nindex: Int \n```
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -378,18 +425,23 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().
+//                            display_name visitFloat64StringParts
 //                            documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): T\n```
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(s)
+//                              display_name s
 //                              documentation ```scala\ns: CharSequence \n```
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(decIndex)
+//                                                      display_name decIndex
 //                                                      documentation ```scala\ndecIndex: Int \n```
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(expIndex)
+//                                                                     display_name expIndex
 //                                                                     documentation ```scala\nexpIndex: Int \n```
 //                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(index)
+//                                                                                 display_name index
 //                                                                                 documentation ```scala\nindex: Int \n```
 //                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -401,9 +453,11 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                             ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     var i = 0
 //      ^ definition local 18
+//        display_name i
 //        documentation ```scala\ni: Int \n```
     val sLength = s.length
 //      ^^^^^^^ definition local 19
+//              display_name sLength
 //              documentation ```scala\nsLength: Int \n```
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(s)
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
@@ -429,13 +483,16 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   override def visitFloat64(d: Double, index: Int) = {
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().
+//                          display_name visitFloat64
 //                          documentation ```scala\ndef visitFloat64(d: Double, index: Int): T\n```
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(d)
+//                            display_name d
 //                            documentation ```scala\nd: Double \n```
 //                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(index)
+//                                           display_name index
 //                                           documentation ```scala\nindex: Int \n```
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     d match{
@@ -450,6 +507,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
       case d if java.lang.Double.isNaN(d) => visitNonNullString("NaN", -1)
 //         ^ definition local 21
+//           display_name d
 //           documentation ```scala\nd: Double \n```
 //              ^^^^ reference semanticdb maven . . java/
 //                   ^^^^ reference semanticdb maven . . java/lang/
@@ -459,9 +517,11 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
       case d =>
 //         ^ definition local 22
+//           display_name d
 //           documentation ```scala\nd: Double \n```
         val i = d.toInt
 //          ^ definition local 23
+//            display_name i
 //            documentation ```scala\ni: Int \n```
 //              ^ reference local 22
 //                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toInt().
@@ -489,12 +549,15 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   def visitString(s: CharSequence, index: Int) = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().
+//                display_name visitString
 //                documentation ```scala\ndef visitString(s: CharSequence, index: Int): T\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().(s)
+//                  display_name s
 //                  documentation ```scala\ns: CharSequence \n```
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().(index)
+//                                       display_name index
 //                                       documentation ```scala\nindex: Int \n```
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
@@ -511,11 +574,14 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   def visitNonNullString(s: CharSequence, index: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
+//                       display_name visitNonNullString
 //                       documentation ```scala\ndef visitNonNullString(s: CharSequence, index: Int): T\n```
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().(s)
+//                         display_name s
 //                         documentation ```scala\ns: CharSequence \n```
 //                          ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().(index)
+//                                              display_name index
 //                                              documentation ```scala\nindex: Int \n```
 //                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -537,6 +603,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
   final def renderIndent() = {
 //          ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
+//                       display_name renderIndent
 //                       documentation ```scala\nfinal def renderIndent(): Unit\n```
     if (indent == -1) ()
 //      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
@@ -544,6 +611,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
     else {
       var i = indent * depth
 //        ^ definition local 24
+//          display_name i
 //          documentation ```scala\ni: Int \n```
 //            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
 //                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`*`(+3).
diff --git a/tests/snapshots/src/main/generated/BaseCharRenderer.scala b/tests/snapshots/src/main/generated/BaseCharRenderer.scala
index e721ec366..3bff02ebb 100644
--- a/tests/snapshots/src/main/generated/BaseCharRenderer.scala
+++ b/tests/snapshots/src/main/generated/BaseCharRenderer.scala
@@ -23,12 +23,15 @@ import upickle.core.{ArrVisitor, ObjVisitor}
   */
 class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
+//                     display_name BaseCharRenderer
 //                     documentation ```scala\nclass BaseCharRenderer[T <: Output]\n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer.
 //    ________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer.
+//                     display_name BaseCharRenderer
 //                     documentation ```scala\nobject BaseCharRenderer\n```
 //                     relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
+//                       display_name T
 //                       documentation ```scala\nT <: Output\n```
 //                          ^^^^^^^ reference semanticdb maven . . upickle/
 //                                  ^^^^ reference semanticdb maven . . upickle/core/
@@ -36,25 +39,31 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.Output#
                       (out: T,
 //                     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
+//                         display_name out
 //                         documentation ```scala\nprivate[this] val out: T\n```
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(out)
 //                     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(out)
+//                         display_name out
 //                         documentation ```scala\nout: T \n```
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
+//                            display_name indent
 //                            documentation ```scala\nprivate[this] val indent: Int\n```
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(indent)
 //                     ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(indent)
+//                            display_name indent
 //                            documentation ```scala\ndefault indent: Int \n```
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                        escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
+//                                   display_name escapeUnicode
 //                                   documentation ```scala\nprivate[this] val escapeUnicode: Boolean\n```
 //                                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(escapeUnicode)
 //                     _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(escapeUnicode)
+//                                   display_name escapeUnicode
 //                                   documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
 //                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
@@ -64,6 +73,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                                                            ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   private[this] val elemBuilder = new upickle.core.CharBuilder
 //                  ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
+//                              display_name elemBuilder
 //                              documentation ```scala\nprivate[this] val elemBuilder: CharBuilder\n```
 //                                    ^^^^^^^ reference semanticdb maven . . upickle/
 //                                            ^^^^ reference semanticdb maven . . upickle/core/
@@ -71,6 +81,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                                            ^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#`<init>`().
   private[this] val unicodeCharBuilder = new upickle.core.CharBuilder()
 //                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#unicodeCharBuilder.
+//                                     display_name unicodeCharBuilder
 //                                     documentation ```scala\nprivate[this] val unicodeCharBuilder: CharBuilder\n```
 //                                           ^^^^^^^ reference semanticdb maven . . upickle/
 //                                                   ^^^^ reference semanticdb maven . . upickle/core/
@@ -78,6 +89,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#`<init>`().
   def flushCharBuilder() = {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushCharBuilder().
+//                     display_name flushCharBuilder
 //                     documentation ```scala\ndef flushCharBuilder(): Unit\n```
     elemBuilder.writeOutToIfLongerThan(out, if (depth == 0) 0 else 1000)
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
@@ -89,8 +101,10 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   private[this] var depth: Int = 0
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
+//                        display_name depth
 //                        documentation ```scala\nprivate[this] var depth: Int\n```
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`depth_=`().
+//                        display_name depth_=
 //                        documentation ```scala\nprivate[this] var depth_=(x$1: Int): Unit\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
@@ -98,13 +112,16 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   private[this] var commaBuffered = false
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
+//                                display_name commaBuffered
 //                                documentation ```scala\nprivate[this] var commaBuffered: Boolean\n```
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`commaBuffered_=`().
+//                                display_name commaBuffered_=
 //                                documentation ```scala\nprivate[this] var commaBuffered_=(x$1: Boolean): Unit\n```
 //                                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
 
   def flushBuffer() = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
+//                display_name flushBuffer
 //                documentation ```scala\ndef flushBuffer(): Unit\n```
     if (commaBuffered) {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
@@ -119,15 +136,19 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   }
   def visitArray(length: Int, index: Int) = new ArrVisitor[T, T] {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().
+//               display_name visitArray
 //               documentation ```scala\ndef visitArray(length: Int, index: Int): { def subVisitor: BaseCharRenderer[T] }\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().(length)
+//                      display_name length
 //                      documentation ```scala\nlength: Int \n```
 //                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().(index)
+//                                  display_name index
 //                                  documentation ```scala\nindex: Int \n```
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                              ^ definition local 1
+//                                                display_name $anon
 //                                                documentation ```scala\nfinal class $anon\n```
 //                                              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -146,17 +167,21 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
     def subVisitor = BaseCharRenderer.this
 //      ^^^^^^^^^^ definition local 0
+//                 display_name subVisitor
 //                 documentation ```scala\ndef subVisitor: BaseCharRenderer[T]\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 2
+//                 display_name visitValue
 //                 documentation ```scala\ndef visitValue(v: T, index: Int): Unit\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 4
+//                   display_name v
 //                   documentation ```scala\nv: T \n```
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                       ^^^^^ definition local 5
+//                             display_name index
 //                             documentation ```scala\nindex: Int \n```
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -167,9 +192,11 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
     }
     def visitEnd(index: Int) = {
 //      ^^^^^^^^ definition local 3
+//               display_name visitEnd
 //               documentation ```scala\ndef visitEnd(index: Int): T\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 6
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
       commaBuffered = false
@@ -191,15 +218,19 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   def visitObject(length: Int, index: Int) = new ObjVisitor[T, T] {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().
+//                display_name visitObject
 //                documentation ```scala\ndef visitObject(length: Int, index: Int): { def subVisitor: BaseCharRenderer[T]; def visitKey(index: Int): BaseCharRenderer[T] }\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().(length)
+//                       display_name length
 //                       documentation ```scala\nlength: Int \n```
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().(index)
+//                                   display_name index
 //                                   documentation ```scala\nindex: Int \n```
 //                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^ definition local 10
+//                                                 display_name $anon
 //                                                 documentation ```scala\nfinal class $anon\n```
 //                                               ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -217,22 +248,27 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
     def subVisitor = BaseCharRenderer.this
 //      ^^^^^^^^^^ definition local 7
+//                 display_name subVisitor
 //                 documentation ```scala\ndef subVisitor: BaseCharRenderer[T]\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitKey(index: Int) = BaseCharRenderer.this
 //      ^^^^^^^^ definition local 8
+//               display_name visitKey
 //               documentation ```scala\ndef visitKey(index: Int): BaseCharRenderer[T]\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition local 9
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitKeyValue(s: Any): Unit = {
 //      ^^^^^^^^^^^^^ definition local 11
+//                    display_name visitKeyValue
 //                    documentation ```scala\ndef visitKeyValue(s: Any): Unit\n```
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition local 14
+//                      display_name s
 //                      documentation ```scala\ns: Any \n```
 //                       ^^^ reference semanticdb maven . . scala/Any#
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -247,12 +283,15 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
     }
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 12
+//                 display_name visitValue
 //                 documentation ```scala\ndef visitValue(v: T, index: Int): Unit\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 15
+//                   display_name v
 //                   documentation ```scala\nv: T \n```
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                       ^^^^^ definition local 16
+//                             display_name index
 //                             documentation ```scala\nindex: Int \n```
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -261,9 +300,11 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
     }
     def visitEnd(index: Int) = {
 //      ^^^^^^^^ definition local 13
+//               display_name visitEnd
 //               documentation ```scala\ndef visitEnd(index: Int): T\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 17
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
       commaBuffered = false
@@ -285,9 +326,11 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   def visitNull(index: Int) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNull().
+//              display_name visitNull
 //              documentation ```scala\ndef visitNull(index: Int): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNull().(index)
+//                    display_name index
 //                    documentation ```scala\nindex: Int \n```
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -315,9 +358,11 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   def visitFalse(index: Int) = {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFalse().
+//               display_name visitFalse
 //               documentation ```scala\ndef visitFalse(index: Int): T\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFalse().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -348,9 +393,11 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   def visitTrue(index: Int) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitTrue().
+//              display_name visitTrue
 //              documentation ```scala\ndef visitTrue(index: Int): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitTrue().(index)
+//                    display_name index
 //                    documentation ```scala\nindex: Int \n```
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -378,18 +425,23 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().
+//                            display_name visitFloat64StringParts
 //                            documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): T\n```
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(s)
+//                              display_name s
 //                              documentation ```scala\ns: CharSequence \n```
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(decIndex)
+//                                                      display_name decIndex
 //                                                      documentation ```scala\ndecIndex: Int \n```
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(expIndex)
+//                                                                     display_name expIndex
 //                                                                     documentation ```scala\nexpIndex: Int \n```
 //                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(index)
+//                                                                                 display_name index
 //                                                                                 documentation ```scala\nindex: Int \n```
 //                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -401,9 +453,11 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                             ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     var i = 0
 //      ^ definition local 18
+//        display_name i
 //        documentation ```scala\ni: Int \n```
     val sLength = s.length
 //      ^^^^^^^ definition local 19
+//              display_name sLength
 //              documentation ```scala\nsLength: Int \n```
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(s)
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
@@ -429,13 +483,16 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   override def visitFloat64(d: Double, index: Int) = {
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().
+//                          display_name visitFloat64
 //                          documentation ```scala\ndef visitFloat64(d: Double, index: Int): T\n```
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(d)
+//                            display_name d
 //                            documentation ```scala\nd: Double \n```
 //                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(index)
+//                                           display_name index
 //                                           documentation ```scala\nindex: Int \n```
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     d match{
@@ -450,6 +507,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
       case d if java.lang.Double.isNaN(d) => visitNonNullString("NaN", -1)
 //         ^ definition local 21
+//           display_name d
 //           documentation ```scala\nd: Double \n```
 //              ^^^^ reference semanticdb maven . . java/
 //                   ^^^^ reference semanticdb maven . . java/lang/
@@ -459,9 +517,11 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
       case d =>
 //         ^ definition local 22
+//           display_name d
 //           documentation ```scala\nd: Double \n```
         val i = d.toInt
 //          ^ definition local 23
+//            display_name i
 //            documentation ```scala\ni: Int \n```
 //              ^ reference local 22
 //                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toInt().
@@ -489,12 +549,15 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   def visitString(s: CharSequence, index: Int) = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().
+//                display_name visitString
 //                documentation ```scala\ndef visitString(s: CharSequence, index: Int): T\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().(s)
+//                  display_name s
 //                  documentation ```scala\ns: CharSequence \n```
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().(index)
+//                                       display_name index
 //                                       documentation ```scala\nindex: Int \n```
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
@@ -511,11 +574,14 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   def visitNonNullString(s: CharSequence, index: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
+//                       display_name visitNonNullString
 //                       documentation ```scala\ndef visitNonNullString(s: CharSequence, index: Int): T\n```
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().(s)
+//                         display_name s
 //                         documentation ```scala\ns: CharSequence \n```
 //                          ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().(index)
+//                                              display_name index
 //                                              documentation ```scala\nindex: Int \n```
 //                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
@@ -537,6 +603,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
   final def renderIndent() = {
 //          ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
+//                       display_name renderIndent
 //                       documentation ```scala\nfinal def renderIndent(): Unit\n```
     if (indent == -1) ()
 //      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
@@ -544,6 +611,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
     else {
       var i = indent * depth
 //        ^ definition local 24
+//          display_name i
 //          documentation ```scala\ni: Int \n```
 //            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
 //                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`*`(+3).
diff --git a/tests/snapshots/src/main/generated/ByteParser.scala b/tests/snapshots/src/main/generated/ByteParser.scala
index 2f0a87c0f..48793d3e4 100644
--- a/tests/snapshots/src/main/generated/ByteParser.scala
+++ b/tests/snapshots/src/main/generated/ByteParser.scala
@@ -39,22 +39,27 @@ import scala.annotation.{switch, tailrec}
   */
 abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#
+//                        display_name ByteParser
 //                        documentation ```scala\nabstract class ByteParser[J]\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
+//                          display_name J
 //                          documentation ```scala\nJ\n```
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#`<init>`().
+//                             display_name <init>
 //                             documentation ```scala\ndef this()\n```
 //                                   ^^^^^^^ reference semanticdb maven . . upickle/
 //                                           ^^^^ reference semanticdb maven . . upickle/core/
 //                                                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#
   private[this] val elemOps = upickle.core.ByteOps
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
+//                          display_name elemOps
 //                          documentation ```scala\nprivate[this] val elemOps: \n```
 //                            ^^^^^^^ reference semanticdb maven . . upickle/
 //                                    ^^^^ reference semanticdb maven . . upickle/core/
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.
   private[this] val outputBuilder = new upickle.core.ByteBuilder()
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
+//                                display_name outputBuilder
 //                                documentation ```scala\nprivate[this] val outputBuilder: ByteBuilder\n```
 //                                      ^^^^^^^ reference semanticdb maven . . upickle/
 //                                              ^^^^ reference semanticdb maven . . upickle/core/
@@ -63,8 +68,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   def requestUntilOrThrow(i: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
+//                        display_name requestUntilOrThrow
 //                        documentation ```scala\ndef requestUntilOrThrow(i: Int): Unit\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().(i)
+//                          display_name i
 //                          documentation ```scala\ni: Int \n```
 //                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if (requestUntil(i)) throw new IncompleteParseException("exhausted input")
@@ -75,9 +82,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   }
   override def getByteSafe(i: Int): Byte = {
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
+//                         display_name getByteSafe
 //                         documentation ```scala\ndef getByteSafe(i: Int): Byte\n```
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteSafe().
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().(i)
+//                           display_name i
 //                           documentation ```scala\ni: Int \n```
 //                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
@@ -94,8 +103,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] def atEof(i: Int) = requestUntil(i)
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
+//                          display_name atEof
 //                          documentation ```scala\ndef atEof(i: Int): Boolean\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().(i)
+//                            display_name i
 //                            documentation ```scala\ni: Int \n```
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#requestUntil().
@@ -106,6 +117,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] def close(): Unit
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
+//                          display_name close
 //                          documentation ```scala\ndef close(): Unit\n```
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#close().
@@ -119,36 +131,43 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
+//                                       display_name ARRBEG
 //                                       documentation ```scala\n@inline\nprivate[this] final val ARRBEG: 6\n```
   @inline private[this] final val OBJBEG = 7
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
+//                                       display_name OBJBEG
 //                                       documentation ```scala\n@inline\nprivate[this] final val OBJBEG: 7\n```
   @inline private[this] final val DATA = 1
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
+//                                     display_name DATA
 //                                     documentation ```scala\n@inline\nprivate[this] final val DATA: 1\n```
   @inline private[this] final val KEY = 2
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#KEY.
+//                                    display_name KEY
 //                                    documentation ```scala\n@inline\nprivate[this] final val KEY: 2\n```
   @inline private[this] final val COLON = 3
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#COLON.
+//                                      display_name COLON
 //                                      documentation ```scala\n@inline\nprivate[this] final val COLON: 3\n```
   @inline private[this] final val ARREND = 4
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARREND.
+//                                       display_name ARREND
 //                                       documentation ```scala\n@inline\nprivate[this] final val ARREND: 4\n```
   @inline private[this] final val OBJEND = 5
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJEND.
+//                                       display_name OBJEND
 //                                       documentation ```scala\n@inline\nprivate[this] final val OBJEND: 5\n```
 
   /**
@@ -160,21 +179,26 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     */
   final def parse(facade: Visitor[_, J]): J = {
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().
+//                display_name parse
 //                documentation ```scala\nfinal def parse(facade: Visitor[local0, J[): J\n```
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().(facade)
+//                       display_name facade
 //                       documentation ```scala\nfacade: Visitor[local0, J[ \n```
 //                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     val (value, i) = parseTopLevel(0, facade)
 //       ^^^^^ definition local 2
+//             display_name value
 //             documentation ```scala\nvalue: J \n```
 //              ^ definition local 3
+//                display_name i
 //                documentation ```scala\ni: Int \n```
 //                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().(facade)
     var j = i
 //      ^ definition local 4
+//        display_name j
 //        documentation ```scala\nj: Int \n```
 //          ^ reference local 3
     while (!atEof(j)) {
@@ -209,16 +233,20 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] def die(i: Int, msg: String): Nothing = {
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
+//                        display_name die
 //                        documentation ```scala\ndef die(i: Int, msg: String): Nothing\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(i)
+//                          display_name i
 //                          documentation ```scala\ni: Int \n```
 //                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(msg)
+//                                    display_name msg
 //                                    documentation ```scala\nmsg: String \n```
 //                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                              ^^^^^^^ reference semanticdb maven . . scala/Nothing#
     val out = new upickle.core.ByteBuilder()
 //      ^^^ definition local 6
+//          display_name out
 //          documentation ```scala\nout: ByteBuilder \n```
 //                ^^^^^^^ reference semanticdb maven . . upickle/
 //                        ^^^^ reference semanticdb maven . . upickle/core/
@@ -250,6 +278,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     )
     val s = "%s got %s" format (msg, out.makeString())
 //      ^ definition local 7
+//        display_name s
 //        documentation ```scala\ns: String \n```
 //                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/StringOps#format().
 //                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(msg)
@@ -273,34 +302,42 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] final def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[_, J]): Int = {
 //                          ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().
+//                                   display_name parseNum
 //                                   documentation ```scala\nfinal def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[local8, J[): Int\n```
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
+//                                     display_name i
 //                                     documentation ```scala\ni: Int \n```
 //                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(ctxt)
+//                                                display_name ctxt
 //                                                documentation ```scala\nctxt: ObjArrVisitor[Any, J] \n```
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                               ^^^ reference semanticdb maven . . scala/Any#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(facade)
+//                                                                               display_name facade
 //                                                                               documentation ```scala\nfacade: Visitor[local8, J[ \n```
 //                                                                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 9
+//        display_name j
 //        documentation ```scala\nj: Int \n```
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
     var c = getByteSafe(j)
 //      ^ definition local 10
+//        display_name c
 //        documentation ```scala\nc: Byte \n```
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                      ^ reference local 9
     var decIndex = -1
 //      ^^^^^^^^ definition local 11
+//               display_name decIndex
 //               documentation ```scala\ndecIndex: Int \n```
     var expIndex = -1
 //      ^^^^^^^^ definition local 12
+//               display_name expIndex
 //               documentation ```scala\nexpIndex: Int \n```
 
     if (c == '-') {
@@ -327,6 +364,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     } else {
       val j0 = j
 //        ^^ definition local 13
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
@@ -366,6 +404,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                    ^ reference local 9
       val j0 = j
 //        ^^ definition local 15
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
@@ -422,6 +461,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       val j0 = j
 //        ^^ definition local 17
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
@@ -460,25 +500,31 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   def visitFloat64StringPartsWithWrapper(facade: Visitor[_, J],
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().
+//                                       display_name visitFloat64StringPartsWithWrapper
 //                                       documentation ```scala\ndef visitFloat64StringPartsWithWrapper(facade: Visitor[local19, J[, decIndex: Int, expIndex: Int, i: Int, j: Int): J\n```
 //                                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(facade)
+//                                              display_name facade
 //                                              documentation ```scala\nfacade: Visitor[local19, J[ \n```
 //                                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
                                          decIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(decIndex)
+//                                                display_name decIndex
 //                                                documentation ```scala\ndecIndex: Int \n```
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          expIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(expIndex)
+//                                                display_name expIndex
 //                                                documentation ```scala\nexpIndex: Int \n```
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          i: Int,
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(i)
+//                                         display_name i
 //                                         documentation ```scala\ni: Int \n```
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          j: Int) = {
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(j)
+//                                         display_name j
 //                                         documentation ```scala\nj: Int \n```
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     facade.visitFloat64StringParts(
@@ -515,11 +561,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] final def parseNumTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().
+//                                           display_name parseNumTopLevel
 //                                           documentation ```scala\nfinal def parseNumTopLevel(i: Int, facade: Visitor[local20, J[): (J, Int)\n```
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
+//                                             display_name i
 //                                             documentation ```scala\ni: Int \n```
 //                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(facade)
+//                                                          display_name facade
 //                                                          documentation ```scala\nfacade: Visitor[local20, J[ \n```
 //                                                           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -527,18 +576,22 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 21
+//        display_name j
 //        documentation ```scala\nj: Int \n```
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
     var c = getByteSafe(j)
 //      ^ definition local 22
+//        display_name c
 //        documentation ```scala\nc: Byte \n```
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                      ^ reference local 21
     var decIndex = -1
 //      ^^^^^^^^ definition local 23
+//               display_name decIndex
 //               documentation ```scala\ndecIndex: Int \n```
     var expIndex = -1
 //      ^^^^^^^^ definition local 24
+//               display_name expIndex
 //               documentation ```scala\nexpIndex: Int \n```
 
     if (c == '-') {
@@ -578,6 +631,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     } else {
       val j0 = j
 //        ^^ definition local 25
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
@@ -630,6 +684,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                    ^ reference local 21
       val j0 = j
 //        ^^ definition local 27
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
@@ -699,6 +754,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       val j0 = j
 //        ^^ definition local 29
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
@@ -751,8 +807,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] final def descape(i: Int): Char = {
 //                          ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().
+//                                  display_name descape
 //                                  documentation ```scala\nfinal def descape(i: Int): Char\n```
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
+//                                    display_name i
 //                                    documentation ```scala\ni: Int \n```
 //                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
@@ -763,6 +821,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                  ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
     var x = 0
 //      ^ definition local 31
+//        display_name x
 //        documentation ```scala\nx: Int \n```
     x = (x << 4) | hex(getByteSafe(i+2).toInt)
 //  ^ reference local 31
@@ -817,11 +876,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] final def parseTrue(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().
+//                                    display_name parseTrue
 //                                    documentation ```scala\nfinal def parseTrue(i: Int, facade: Visitor[local32, J[): J\n```
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
+//                                      display_name i
 //                                      documentation ```scala\ni: Int \n```
 //                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(facade)
+//                                                   display_name facade
 //                                                   documentation ```scala\nfacade: Visitor[local32, J[ \n```
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -863,11 +925,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] final def parseFalse(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().
+//                                     display_name parseFalse
 //                                     documentation ```scala\nfinal def parseFalse(i: Int, facade: Visitor[local33, J[): J\n```
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
+//                                       display_name i
 //                                       documentation ```scala\ni: Int \n```
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(facade)
+//                                                    display_name facade
 //                                                    documentation ```scala\nfacade: Visitor[local33, J[ \n```
 //                                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -915,11 +980,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    */
   protected[this] final def parseNull(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().
+//                                    display_name parseNull
 //                                    documentation ```scala\nfinal def parseNull(i: Int, facade: Visitor[local34, J[): J\n```
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
+//                                      display_name i
 //                                      documentation ```scala\ni: Int \n```
 //                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(facade)
+//                                                   display_name facade
 //                                                   documentation ```scala\nfacade: Visitor[local34, J[ \n```
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -956,11 +1024,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   protected[this] final def parseTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().
+//                                        display_name parseTopLevel
 //                                        documentation ```scala\nfinal def parseTopLevel(i: Int, facade: Visitor[local35, J[): (J, Int)\n```
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(i)
+//                                          display_name i
 //                                          documentation ```scala\ni: Int \n```
 //                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(facade)
+//                                                       display_name facade
 //                                                       documentation ```scala\nfacade: Visitor[local35, J[ \n```
 //                                                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -982,11 +1053,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseTopLevel0(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
+//                                         display_name parseTopLevel0
 //                                         documentation ```scala\n@tailrec\nfinal def parseTopLevel0(i: Int, facade: Visitor[local38, J[): (J, Int)\n```
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
+//                                           display_name i
 //                                           documentation ```scala\ni: Int \n```
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
+//                                                        display_name facade
 //                                                        documentation ```scala\nfacade: Visitor[local38, J[ \n```
 //                                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -1069,17 +1143,21 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   def reject(j: Int): PartialFunction[Throwable, Nothing] = {
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().
+//           display_name reject
 //           documentation ```scala\ndef reject(j: Int): PartialFunction[Throwable, Nothing]\n```
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().(j)
+//             display_name j
 //             documentation ```scala\nj: Int \n```
 //              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/PartialFunction#
 //                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Throwable#
 //                                               ^^^^^^^ reference semanticdb maven . . scala/Nothing#
 //                                                          ^ definition local 39
+//                                                            display_name $anonfun
 //                                                            documentation ```scala\n@SerialVersionUID\nfinal class $anonfun\n```
     case e: Abort =>
 //       ^ definition local 46
+//         display_name e
 //         documentation ```scala\ne: Abort \n```
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort#
       throw new AbortException(e.msg, j, -1, -1, e)
@@ -1112,21 +1190,26 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseNested(state: Int,
 //                          ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
+//                                      display_name parseNested
 //                                      documentation ```scala\n@tailrec\nfinal def parseNested(state: Int, i: Int, stackHead: ObjArrVisitor[local50, J[, stackTail: List[ObjArrVisitor[local51, J[]): (J, Int)\n```
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(state)
+//                                            display_name state
 //                                            documentation ```scala\nstate: Int \n```
 //                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                         i: Int,
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
+//                                        display_name i
 //                                        documentation ```scala\ni: Int \n```
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                         stackHead: ObjArrVisitor[_, J],
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
+//                                                display_name stackHead
 //                                                documentation ```scala\nstackHead: ObjArrVisitor[local50, J[ \n```
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
                                         stackTail: List[ObjArrVisitor[_, J]]) : (J, Int) = {
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
+//                                                display_name stackTail
 //                                                documentation ```scala\nstackTail: List[ObjArrVisitor[local51, J[] \n```
 //                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
@@ -1153,6 +1236,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                   ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
             val nextJ = try parseStringKey(i, stackHead) catch reject(i)
 //              ^^^^^ definition local 52
+//                    display_name nextJ
 //                    documentation ```scala\nnextJ: Int \n```
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
@@ -1171,6 +1255,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
             val nextJ = try parseStringValue(i, stackHead) catch reject(i)
 //              ^^^^^ definition local 55
+//                    display_name nextJ
 //                    documentation ```scala\nnextJ: Int \n```
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().
 //                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
@@ -1216,6 +1301,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
         val ctx =
 //          ^^^ definition local 58
+//              display_name ctx
 //              documentation ```scala\nctx: ArrVisitor[local59, J[ \n```
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitArray(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
@@ -1245,6 +1331,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
         val ctx =
 //          ^^^ definition local 63
+//              display_name ctx
 //              documentation ```scala\nctx: ObjVisitor[local64, J[ \n```
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitObject(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
@@ -1274,6 +1361,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
         val ctx =
 //          ^^^ definition local 68
+//              display_name ctx
 //              documentation ```scala\nctx: Int \n```
           try parseNum(i, stackHead.narrow, stackHead.subVisitor.asInstanceOf[Visitor[_, J]])
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().
@@ -1434,12 +1522,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
               case Some(t) => t
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                      ^ definition local 77
+//                        display_name t
 //                        documentation ```scala\nt: (J, Int) \n```
 //                            ^ reference local 77
               case None =>
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 78
+//                                display_name stackTailHead
 //                                documentation ```scala\nstackTailHead: ObjArrVisitor[local51, J[ \n```
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
@@ -1473,12 +1563,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
               case Some(t) => t
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                      ^ definition local 79
+//                        display_name t
 //                        documentation ```scala\nt: (J, Int) \n```
 //                            ^ reference local 79
               case None =>
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 80
+//                                display_name stackTailHead
 //                                documentation ```scala\nstackTailHead: ObjArrVisitor[local51, J[ \n```
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
@@ -1508,15 +1600,19 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   def dieWithFailureMessage(i: Int, state: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().
+//                          display_name dieWithFailureMessage
 //                          documentation ```scala\ndef dieWithFailureMessage(i: Int, state: Int): Nothing\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(i)
+//                            display_name i
 //                            documentation ```scala\ni: Int \n```
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(state)
+//                                        display_name state
 //                                        documentation ```scala\nstate: Int \n```
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     val expected = state match{
 //      ^^^^^^^^ definition local 81
+//               display_name expected
 //               documentation ```scala\nexpected: String \n```
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(state)
       case ARRBEG => "json value or ]"
@@ -1543,11 +1639,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   def failIfNotData(state: Int, i: Int) = (state: @switch) match{
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().
+//                  display_name failIfNotData
 //                  documentation ```scala\ndef failIfNotData(state: Int, i: Int): Unit\n```
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(state)
+//                        display_name state
 //                        documentation ```scala\nstate: Int \n```
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(i)
+//                                display_name i
 //                                documentation ```scala\ni: Int \n```
 //                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(state)
@@ -1562,17 +1661,21 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   def tryCloseCollection(stackHead: ObjArrVisitor[_, J], stackTail: List[ObjArrVisitor[_, J]], i: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().
+//                       display_name tryCloseCollection
 //                       documentation ```scala\ndef tryCloseCollection(stackHead: ObjArrVisitor[local82, J[, stackTail: List[ObjArrVisitor[local83, J[], i: Int): Option[(J, Int)]\n```
 //                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackHead)
+//                                 display_name stackHead
 //                                 documentation ```scala\nstackHead: ObjArrVisitor[local82, J[ \n```
 //                                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
+//                                                                 display_name stackTail
 //                                                                 documentation ```scala\nstackTail: List[ObjArrVisitor[local83, J[] \n```
 //                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
 //                                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
+//                                                                                               display_name i
 //                                                                                               documentation ```scala\ni: Int \n```
 //                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if (stackTail.isEmpty) {
@@ -1590,6 +1693,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     } else {
       val ctxt2 = stackTail.head.narrow
 //        ^^^^^ definition local 86
+//              display_name ctxt2
 //              documentation ```scala\nctxt2: ObjArrVisitor[Any, J] \n```
 //                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
 //                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
@@ -1610,8 +1714,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   }
   def collectionEndFor(stackHead: ObjArrVisitor[_, _]) = {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
+//                     display_name collectionEndFor
 //                     documentation ```scala\ndef collectionEndFor(stackHead: ObjArrVisitor[local89, local90[): Int\n```
 //                     ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().(stackHead)
+//                               display_name stackHead
 //                               documentation ```scala\nstackHead: ObjArrVisitor[local89, local90[ \n```
 //                                ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
     if (stackHead.isObj) OBJEND
@@ -1631,17 +1737,21 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     */
   protected[this] final def parseStringSimple(i: Int): Int = {
 //                          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
+//                                            display_name parseStringSimple
 //                                            documentation ```scala\nfinal def parseStringSimple(i: Int): Int\n```
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().(i)
+//                                              display_name i
 //                                              documentation ```scala\ni: Int \n```
 //                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 91
+//        display_name j
 //        documentation ```scala\nj: Int \n```
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().(i)
     var c = elemOps.toUnsignedInt(getByteSafe(j))
 //      ^ definition local 92
+//        display_name c
 //        documentation ```scala\nc: Int \n```
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.toUnsignedInt().
@@ -1685,17 +1795,21 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     */
   protected[this] final def parseStringComplex(i0: Int): Int = {
 //                          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().
+//                                             display_name parseStringComplex
 //                                             documentation ```scala\nfinal def parseStringComplex(i0: Int): Int\n```
 //                                             ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().(i0)
+//                                                display_name i0
 //                                                documentation ```scala\ni0: Int \n```
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var i = i0
 //      ^ definition local 94
+//        display_name i
 //        documentation ```scala\ni: Int \n```
 //          ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().(i0)
     var c = elemOps.toUnsignedInt(getByteSafe(i))
 //      ^ definition local 95
+//        display_name c
 //        documentation ```scala\nc: Int \n```
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.toUnsignedInt().
@@ -1765,6 +1879,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
           case 'u' =>
             val d = descape(i)
 //              ^ definition local 97
+//                display_name d
 //                documentation ```scala\nd: Char \n```
 //                  ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().
 //                          ^ reference local 94
@@ -1779,6 +1894,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
           case c => die(i + 1, s"illegal escape sequence after \\")
 //             ^ definition local 98
+//               display_name c
 //               documentation ```scala\nc: Byte \n```
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                      ^ reference local 94
@@ -1822,11 +1938,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     */
   protected[this] final def parseStringValue(i: Int, stackHead: ObjArrVisitor[_, J]): Int = {
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().
+//                                           display_name parseStringValue
 //                                           documentation ```scala\nfinal def parseStringValue(i: Int, stackHead: ObjArrVisitor[local99, J[): Int\n```
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
+//                                             display_name i
 //                                             documentation ```scala\ni: Int \n```
 //                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(stackHead)
+//                                                             display_name stackHead
 //                                                             documentation ```scala\nstackHead: ObjArrVisitor[local99, J[ \n```
 //                                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -1834,6 +1953,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 100
+//        display_name k
 //        documentation ```scala\nk: Int \n```
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
@@ -1857,6 +1977,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     } else {
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 101
+//           display_name k2
 //           documentation ```scala\nk2: Int \n```
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
@@ -1874,11 +1995,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   protected[this] final def parseStringKey(i: Int, stackHead: ObjArrVisitor[_, J]): Int = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().
+//                                         display_name parseStringKey
 //                                         documentation ```scala\nfinal def parseStringKey(i: Int, stackHead: ObjArrVisitor[local102, J[): Int\n```
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
+//                                           display_name i
 //                                           documentation ```scala\ni: Int \n```
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(stackHead)
+//                                                           display_name stackHead
 //                                                           documentation ```scala\nstackHead: ObjArrVisitor[local102, J[ \n```
 //                                                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -1886,6 +2010,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 103
+//        display_name k
 //        documentation ```scala\nk: Int \n```
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
@@ -1909,6 +2034,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     } else {
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 104
+//           display_name k2
 //           documentation ```scala\nk2: Int \n```
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
@@ -1927,11 +2053,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   def parseStringToOutputBuilder(i: Int, k: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
+//                               display_name parseStringToOutputBuilder
 //                               documentation ```scala\ndef parseStringToOutputBuilder(i: Int, k: Int): Int\n```
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(i)
+//                                 display_name i
 //                                 documentation ```scala\ni: Int \n```
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
+//                                         display_name k
 //                                         documentation ```scala\nk: Int \n```
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     outputBuilder.reset()
@@ -1949,6 +2078,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(i)
     val k2 = parseStringComplex(-k - 1)
 //      ^^ definition local 105
+//         display_name k2
 //         documentation ```scala\nk2: Int \n```
 //           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
@@ -1960,19 +2090,24 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   def visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[_, J]) = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().
+//                display_name visitString
 //                documentation ```scala\ndef visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local106, J[): Unit\n```
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(i)
+//                  display_name i
 //                  documentation ```scala\ni: Int \n```
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(s)
+//                          display_name s
 //                          documentation ```scala\ns: CharSequence \n```
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                         ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(stackHead)
+//                                                   display_name stackHead
 //                                                   documentation ```scala\nstackHead: ObjArrVisitor[local106, J[ \n```
 //                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     val v = stackHead.subVisitor.visitString(s, i)
 //      ^ definition local 107
+//        display_name v
 //        documentation ```scala\nv: Any \n```
 //          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(stackHead)
 //                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1988,19 +2123,24 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   }
   def visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[_, J]) = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().
+//                   display_name visitStringKey
 //                   documentation ```scala\ndef visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local108, J[): Unit\n```
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(i)
+//                     display_name i
 //                     documentation ```scala\ni: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(s)
+//                             display_name s
 //                             documentation ```scala\ns: CharSequence \n```
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(stackHead)
+//                                                      display_name stackHead
 //                                                      documentation ```scala\nstackHead: ObjArrVisitor[local108, J[ \n```
 //                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     val obj = stackHead.asInstanceOf[ObjVisitor[Any, _]]
 //      ^^^ definition local 109
+//          display_name obj
 //          documentation ```scala\nobj: ObjVisitor[Any, Any] \n```
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(stackHead)
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
@@ -2008,6 +2148,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                              ^^^ reference semanticdb maven . . scala/Any#
     val keyVisitor = obj.visitKey(i)
 //      ^^^^^^^^^^ definition local 110
+//                 display_name keyVisitor
 //                 documentation ```scala\nkeyVisitor: Visitor[local111, Any[ \n```
 //                   ^^^ reference local 109
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
@@ -2024,11 +2165,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
   protected[this] final def parseStringTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().
+//                                              display_name parseStringTopLevel
 //                                              documentation ```scala\nfinal def parseStringTopLevel(i: Int, facade: Visitor[local112, J[): (J, Int)\n```
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
+//                                                display_name i
 //                                                documentation ```scala\ni: Int \n```
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
+//                                                             display_name facade
 //                                                             documentation ```scala\nfacade: Visitor[local112, J[ \n```
 //                                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -2037,6 +2181,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 113
+//        display_name k
 //        documentation ```scala\nk: Int \n```
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
@@ -2046,6 +2191,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
       val res = facade.visitString(unsafeCharSeqForRange(i + 1, k - i - 2), i)
 //        ^^^ definition local 114
+//            display_name res
 //            documentation ```scala\nres: J \n```
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
@@ -2063,12 +2209,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     } else {
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 115
+//           display_name k2
 //           documentation ```scala\nk2: Int \n```
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
 //                                           ^ reference local 113
       val res = facade.visitString(outputBuilder.makeString(), i)
 //        ^^^ definition local 116
+//            display_name res
 //            documentation ```scala\nres: J \n```
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
diff --git a/tests/snapshots/src/main/generated/CharParser.scala b/tests/snapshots/src/main/generated/CharParser.scala
index 22cff58e4..d8f099f1c 100644
--- a/tests/snapshots/src/main/generated/CharParser.scala
+++ b/tests/snapshots/src/main/generated/CharParser.scala
@@ -39,22 +39,27 @@ import scala.annotation.{switch, tailrec}
   */
 abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#
+//                        display_name CharParser
 //                        documentation ```scala\nabstract class CharParser[J]\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
+//                          display_name J
 //                          documentation ```scala\nJ\n```
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#`<init>`().
+//                             display_name <init>
 //                             documentation ```scala\ndef this()\n```
 //                                   ^^^^^^^ reference semanticdb maven . . upickle/
 //                                           ^^^^ reference semanticdb maven . . upickle/core/
 //                                                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#
   private[this] val elemOps = upickle.core.CharOps
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
+//                          display_name elemOps
 //                          documentation ```scala\nprivate[this] val elemOps: \n```
 //                            ^^^^^^^ reference semanticdb maven . . upickle/
 //                                    ^^^^ reference semanticdb maven . . upickle/core/
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.
   private[this] val outputBuilder = new upickle.core.CharBuilder()
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
+//                                display_name outputBuilder
 //                                documentation ```scala\nprivate[this] val outputBuilder: CharBuilder\n```
 //                                      ^^^^^^^ reference semanticdb maven . . upickle/
 //                                              ^^^^ reference semanticdb maven . . upickle/core/
@@ -63,8 +68,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   def requestUntilOrThrow(i: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
+//                        display_name requestUntilOrThrow
 //                        documentation ```scala\ndef requestUntilOrThrow(i: Int): Unit\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().(i)
+//                          display_name i
 //                          documentation ```scala\ni: Int \n```
 //                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if (requestUntil(i)) throw new IncompleteParseException("exhausted input")
@@ -75,9 +82,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   }
   override def getCharSafe(i: Int): Char = {
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
+//                         display_name getCharSafe
 //                         documentation ```scala\ndef getCharSafe(i: Int): Char\n```
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharSafe().
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().(i)
+//                           display_name i
 //                           documentation ```scala\ni: Int \n```
 //                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
@@ -94,8 +103,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] def atEof(i: Int) = requestUntil(i)
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
+//                          display_name atEof
 //                          documentation ```scala\ndef atEof(i: Int): Boolean\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().(i)
+//                            display_name i
 //                            documentation ```scala\ni: Int \n```
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#requestUntil().
@@ -106,6 +117,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] def close(): Unit
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
+//                          display_name close
 //                          documentation ```scala\ndef close(): Unit\n```
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#close().
@@ -118,36 +130,43 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
+//                                       display_name ARRBEG
 //                                       documentation ```scala\n@inline\nprivate[this] final val ARRBEG: 6\n```
   @inline private[this] final val OBJBEG = 7
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
+//                                       display_name OBJBEG
 //                                       documentation ```scala\n@inline\nprivate[this] final val OBJBEG: 7\n```
   @inline private[this] final val DATA = 1
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
+//                                     display_name DATA
 //                                     documentation ```scala\n@inline\nprivate[this] final val DATA: 1\n```
   @inline private[this] final val KEY = 2
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#KEY.
+//                                    display_name KEY
 //                                    documentation ```scala\n@inline\nprivate[this] final val KEY: 2\n```
   @inline private[this] final val COLON = 3
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#COLON.
+//                                      display_name COLON
 //                                      documentation ```scala\n@inline\nprivate[this] final val COLON: 3\n```
   @inline private[this] final val ARREND = 4
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARREND.
+//                                       display_name ARREND
 //                                       documentation ```scala\n@inline\nprivate[this] final val ARREND: 4\n```
   @inline private[this] final val OBJEND = 5
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJEND.
+//                                       display_name OBJEND
 //                                       documentation ```scala\n@inline\nprivate[this] final val OBJEND: 5\n```
 
   /**
@@ -159,21 +178,26 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     */
   final def parse(facade: Visitor[_, J]): J = {
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().
+//                display_name parse
 //                documentation ```scala\nfinal def parse(facade: Visitor[local0, J[): J\n```
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().(facade)
+//                       display_name facade
 //                       documentation ```scala\nfacade: Visitor[local0, J[ \n```
 //                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     val (value, i) = parseTopLevel(0, facade)
 //       ^^^^^ definition local 2
+//             display_name value
 //             documentation ```scala\nvalue: J \n```
 //              ^ definition local 3
+//                display_name i
 //                documentation ```scala\ni: Int \n```
 //                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().(facade)
     var j = i
 //      ^ definition local 4
+//        display_name j
 //        documentation ```scala\nj: Int \n```
 //          ^ reference local 3
     while (!atEof(j)) {
@@ -208,16 +232,20 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] def die(i: Int, msg: String): Nothing = {
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
+//                        display_name die
 //                        documentation ```scala\ndef die(i: Int, msg: String): Nothing\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(i)
+//                          display_name i
 //                          documentation ```scala\ni: Int \n```
 //                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(msg)
+//                                    display_name msg
 //                                    documentation ```scala\nmsg: String \n```
 //                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                              ^^^^^^^ reference semanticdb maven . . scala/Nothing#
     val out = new upickle.core.CharBuilder()
 //      ^^^ definition local 6
+//          display_name out
 //          documentation ```scala\nout: CharBuilder \n```
 //                ^^^^^^^ reference semanticdb maven . . upickle/
 //                        ^^^^ reference semanticdb maven . . upickle/core/
@@ -249,6 +277,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     )
     val s = "%s got %s" format (msg, out.makeString())
 //      ^ definition local 7
+//        display_name s
 //        documentation ```scala\ns: String \n```
 //                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/StringOps#format().
 //                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(msg)
@@ -272,34 +301,42 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] final def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[_, J]): Int = {
 //                          ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().
+//                                   display_name parseNum
 //                                   documentation ```scala\nfinal def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[local8, J[): Int\n```
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
+//                                     display_name i
 //                                     documentation ```scala\ni: Int \n```
 //                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(ctxt)
+//                                                display_name ctxt
 //                                                documentation ```scala\nctxt: ObjArrVisitor[Any, J] \n```
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                               ^^^ reference semanticdb maven . . scala/Any#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(facade)
+//                                                                               display_name facade
 //                                                                               documentation ```scala\nfacade: Visitor[local8, J[ \n```
 //                                                                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 9
+//        display_name j
 //        documentation ```scala\nj: Int \n```
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
     var c = getCharSafe(j)
 //      ^ definition local 10
+//        display_name c
 //        documentation ```scala\nc: Char \n```
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                      ^ reference local 9
     var decIndex = -1
 //      ^^^^^^^^ definition local 11
+//               display_name decIndex
 //               documentation ```scala\ndecIndex: Int \n```
     var expIndex = -1
 //      ^^^^^^^^ definition local 12
+//               display_name expIndex
 //               documentation ```scala\nexpIndex: Int \n```
 
     if (c == '-') {
@@ -326,6 +363,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     } else {
       val j0 = j
 //        ^^ definition local 13
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
@@ -365,6 +403,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                    ^ reference local 9
       val j0 = j
 //        ^^ definition local 15
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
@@ -421,6 +460,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       val j0 = j
 //        ^^ definition local 17
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
@@ -459,25 +499,31 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   def visitFloat64StringPartsWithWrapper(facade: Visitor[_, J],
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().
+//                                       display_name visitFloat64StringPartsWithWrapper
 //                                       documentation ```scala\ndef visitFloat64StringPartsWithWrapper(facade: Visitor[local19, J[, decIndex: Int, expIndex: Int, i: Int, j: Int): J\n```
 //                                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(facade)
+//                                              display_name facade
 //                                              documentation ```scala\nfacade: Visitor[local19, J[ \n```
 //                                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
                                          decIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(decIndex)
+//                                                display_name decIndex
 //                                                documentation ```scala\ndecIndex: Int \n```
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          expIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(expIndex)
+//                                                display_name expIndex
 //                                                documentation ```scala\nexpIndex: Int \n```
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          i: Int,
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(i)
+//                                         display_name i
 //                                         documentation ```scala\ni: Int \n```
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          j: Int) = {
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(j)
+//                                         display_name j
 //                                         documentation ```scala\nj: Int \n```
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     facade.visitFloat64StringParts(
@@ -514,11 +560,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] final def parseNumTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().
+//                                           display_name parseNumTopLevel
 //                                           documentation ```scala\nfinal def parseNumTopLevel(i: Int, facade: Visitor[local20, J[): (J, Int)\n```
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
+//                                             display_name i
 //                                             documentation ```scala\ni: Int \n```
 //                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(facade)
+//                                                          display_name facade
 //                                                          documentation ```scala\nfacade: Visitor[local20, J[ \n```
 //                                                           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -526,18 +575,22 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 21
+//        display_name j
 //        documentation ```scala\nj: Int \n```
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
     var c = getCharSafe(j)
 //      ^ definition local 22
+//        display_name c
 //        documentation ```scala\nc: Char \n```
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                      ^ reference local 21
     var decIndex = -1
 //      ^^^^^^^^ definition local 23
+//               display_name decIndex
 //               documentation ```scala\ndecIndex: Int \n```
     var expIndex = -1
 //      ^^^^^^^^ definition local 24
+//               display_name expIndex
 //               documentation ```scala\nexpIndex: Int \n```
 
     if (c == '-') {
@@ -577,6 +630,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     } else {
       val j0 = j
 //        ^^ definition local 25
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
@@ -629,6 +683,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                    ^ reference local 21
       val j0 = j
 //        ^^ definition local 27
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
@@ -698,6 +753,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       val j0 = j
 //        ^^ definition local 29
+//           display_name j0
 //           documentation ```scala\nj0: Int \n```
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
@@ -750,8 +806,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] final def descape(i: Int): Char = {
 //                          ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().
+//                                  display_name descape
 //                                  documentation ```scala\nfinal def descape(i: Int): Char\n```
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
+//                                    display_name i
 //                                    documentation ```scala\ni: Int \n```
 //                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
@@ -762,6 +820,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                  ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
     var x = 0
 //      ^ definition local 31
+//        display_name x
 //        documentation ```scala\nx: Int \n```
     x = (x << 4) | hex(getCharSafe(i+2).toInt)
 //  ^ reference local 31
@@ -816,11 +875,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] final def parseTrue(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().
+//                                    display_name parseTrue
 //                                    documentation ```scala\nfinal def parseTrue(i: Int, facade: Visitor[local32, J[): J\n```
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
+//                                      display_name i
 //                                      documentation ```scala\ni: Int \n```
 //                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(facade)
+//                                                   display_name facade
 //                                                   documentation ```scala\nfacade: Visitor[local32, J[ \n```
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -862,11 +924,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] final def parseFalse(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().
+//                                     display_name parseFalse
 //                                     documentation ```scala\nfinal def parseFalse(i: Int, facade: Visitor[local33, J[): J\n```
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
+//                                       display_name i
 //                                       documentation ```scala\ni: Int \n```
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(facade)
+//                                                    display_name facade
 //                                                    documentation ```scala\nfacade: Visitor[local33, J[ \n```
 //                                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -914,11 +979,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    */
   protected[this] final def parseNull(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().
+//                                    display_name parseNull
 //                                    documentation ```scala\nfinal def parseNull(i: Int, facade: Visitor[local34, J[): J\n```
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
+//                                      display_name i
 //                                      documentation ```scala\ni: Int \n```
 //                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(facade)
+//                                                   display_name facade
 //                                                   documentation ```scala\nfacade: Visitor[local34, J[ \n```
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -955,11 +1023,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   protected[this] final def parseTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().
+//                                        display_name parseTopLevel
 //                                        documentation ```scala\nfinal def parseTopLevel(i: Int, facade: Visitor[local35, J[): (J, Int)\n```
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(i)
+//                                          display_name i
 //                                          documentation ```scala\ni: Int \n```
 //                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(facade)
+//                                                       display_name facade
 //                                                       documentation ```scala\nfacade: Visitor[local35, J[ \n```
 //                                                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -981,11 +1052,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseTopLevel0(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
+//                                         display_name parseTopLevel0
 //                                         documentation ```scala\n@tailrec\nfinal def parseTopLevel0(i: Int, facade: Visitor[local38, J[): (J, Int)\n```
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
+//                                           display_name i
 //                                           documentation ```scala\ni: Int \n```
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
+//                                                        display_name facade
 //                                                        documentation ```scala\nfacade: Visitor[local38, J[ \n```
 //                                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -1068,17 +1142,21 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   def reject(j: Int): PartialFunction[Throwable, Nothing] = {
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().
+//           display_name reject
 //           documentation ```scala\ndef reject(j: Int): PartialFunction[Throwable, Nothing]\n```
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().(j)
+//             display_name j
 //             documentation ```scala\nj: Int \n```
 //              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/PartialFunction#
 //                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Throwable#
 //                                               ^^^^^^^ reference semanticdb maven . . scala/Nothing#
 //                                                          ^ definition local 39
+//                                                            display_name $anonfun
 //                                                            documentation ```scala\n@SerialVersionUID\nfinal class $anonfun\n```
     case e: Abort =>
 //       ^ definition local 46
+//         display_name e
 //         documentation ```scala\ne: Abort \n```
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort#
       throw new AbortException(e.msg, j, -1, -1, e)
@@ -1111,21 +1189,26 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseNested(state: Int,
 //                          ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
+//                                      display_name parseNested
 //                                      documentation ```scala\n@tailrec\nfinal def parseNested(state: Int, i: Int, stackHead: ObjArrVisitor[local50, J[, stackTail: List[ObjArrVisitor[local51, J[]): (J, Int)\n```
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(state)
+//                                            display_name state
 //                                            documentation ```scala\nstate: Int \n```
 //                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                         i: Int,
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
+//                                        display_name i
 //                                        documentation ```scala\ni: Int \n```
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                         stackHead: ObjArrVisitor[_, J],
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
+//                                                display_name stackHead
 //                                                documentation ```scala\nstackHead: ObjArrVisitor[local50, J[ \n```
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
                                         stackTail: List[ObjArrVisitor[_, J]]) : (J, Int) = {
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
+//                                                display_name stackTail
 //                                                documentation ```scala\nstackTail: List[ObjArrVisitor[local51, J[] \n```
 //                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
@@ -1152,6 +1235,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                   ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
             val nextJ = try parseStringKey(i, stackHead) catch reject(i)
 //              ^^^^^ definition local 52
+//                    display_name nextJ
 //                    documentation ```scala\nnextJ: Int \n```
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
@@ -1170,6 +1254,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
             val nextJ = try parseStringValue(i, stackHead) catch reject(i)
 //              ^^^^^ definition local 55
+//                    display_name nextJ
 //                    documentation ```scala\nnextJ: Int \n```
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().
 //                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
@@ -1215,6 +1300,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
         val ctx =
 //          ^^^ definition local 58
+//              display_name ctx
 //              documentation ```scala\nctx: ArrVisitor[local59, J[ \n```
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitArray(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
@@ -1244,6 +1330,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
         val ctx =
 //          ^^^ definition local 63
+//              display_name ctx
 //              documentation ```scala\nctx: ObjVisitor[local64, J[ \n```
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitObject(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
@@ -1273,6 +1360,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
         val ctx =
 //          ^^^ definition local 68
+//              display_name ctx
 //              documentation ```scala\nctx: Int \n```
           try parseNum(i, stackHead.narrow, stackHead.subVisitor.asInstanceOf[Visitor[_, J]])
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().
@@ -1433,12 +1521,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
               case Some(t) => t
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                      ^ definition local 77
+//                        display_name t
 //                        documentation ```scala\nt: (J, Int) \n```
 //                            ^ reference local 77
               case None =>
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 78
+//                                display_name stackTailHead
 //                                documentation ```scala\nstackTailHead: ObjArrVisitor[local51, J[ \n```
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
@@ -1472,12 +1562,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
               case Some(t) => t
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                      ^ definition local 79
+//                        display_name t
 //                        documentation ```scala\nt: (J, Int) \n```
 //                            ^ reference local 79
               case None =>
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 80
+//                                display_name stackTailHead
 //                                documentation ```scala\nstackTailHead: ObjArrVisitor[local51, J[ \n```
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
@@ -1507,15 +1599,19 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   def dieWithFailureMessage(i: Int, state: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().
+//                          display_name dieWithFailureMessage
 //                          documentation ```scala\ndef dieWithFailureMessage(i: Int, state: Int): Nothing\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(i)
+//                            display_name i
 //                            documentation ```scala\ni: Int \n```
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(state)
+//                                        display_name state
 //                                        documentation ```scala\nstate: Int \n```
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     val expected = state match{
 //      ^^^^^^^^ definition local 81
+//               display_name expected
 //               documentation ```scala\nexpected: String \n```
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(state)
       case ARRBEG => "json value or ]"
@@ -1542,11 +1638,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   def failIfNotData(state: Int, i: Int) = (state: @switch) match{
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().
+//                  display_name failIfNotData
 //                  documentation ```scala\ndef failIfNotData(state: Int, i: Int): Unit\n```
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(state)
+//                        display_name state
 //                        documentation ```scala\nstate: Int \n```
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(i)
+//                                display_name i
 //                                documentation ```scala\ni: Int \n```
 //                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(state)
@@ -1561,17 +1660,21 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   def tryCloseCollection(stackHead: ObjArrVisitor[_, J], stackTail: List[ObjArrVisitor[_, J]], i: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().
+//                       display_name tryCloseCollection
 //                       documentation ```scala\ndef tryCloseCollection(stackHead: ObjArrVisitor[local82, J[, stackTail: List[ObjArrVisitor[local83, J[], i: Int): Option[(J, Int)]\n```
 //                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackHead)
+//                                 display_name stackHead
 //                                 documentation ```scala\nstackHead: ObjArrVisitor[local82, J[ \n```
 //                                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
+//                                                                 display_name stackTail
 //                                                                 documentation ```scala\nstackTail: List[ObjArrVisitor[local83, J[] \n```
 //                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
 //                                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
+//                                                                                               display_name i
 //                                                                                               documentation ```scala\ni: Int \n```
 //                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if (stackTail.isEmpty) {
@@ -1589,6 +1692,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     } else {
       val ctxt2 = stackTail.head.narrow
 //        ^^^^^ definition local 86
+//              display_name ctxt2
 //              documentation ```scala\nctxt2: ObjArrVisitor[Any, J] \n```
 //                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
 //                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
@@ -1609,8 +1713,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   }
   def collectionEndFor(stackHead: ObjArrVisitor[_, _]) = {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
+//                     display_name collectionEndFor
 //                     documentation ```scala\ndef collectionEndFor(stackHead: ObjArrVisitor[local89, local90[): Int\n```
 //                     ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().(stackHead)
+//                               display_name stackHead
 //                               documentation ```scala\nstackHead: ObjArrVisitor[local89, local90[ \n```
 //                                ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
     if (stackHead.isObj) OBJEND
@@ -1630,17 +1736,21 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     */
   protected[this] final def parseStringSimple(i: Int): Int = {
 //                          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
+//                                            display_name parseStringSimple
 //                                            documentation ```scala\nfinal def parseStringSimple(i: Int): Int\n```
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().(i)
+//                                              display_name i
 //                                              documentation ```scala\ni: Int \n```
 //                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 91
+//        display_name j
 //        documentation ```scala\nj: Int \n```
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().(i)
     var c = elemOps.toUnsignedInt(getCharSafe(j))
 //      ^ definition local 92
+//        display_name c
 //        documentation ```scala\nc: Int \n```
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.toUnsignedInt().
@@ -1684,17 +1794,21 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     */
   protected[this] final def parseStringComplex(i0: Int): Int = {
 //                          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().
+//                                             display_name parseStringComplex
 //                                             documentation ```scala\nfinal def parseStringComplex(i0: Int): Int\n```
 //                                             ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().(i0)
+//                                                display_name i0
 //                                                documentation ```scala\ni0: Int \n```
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var i = i0
 //      ^ definition local 94
+//        display_name i
 //        documentation ```scala\ni: Int \n```
 //          ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().(i0)
     var c = elemOps.toUnsignedInt(getCharSafe(i))
 //      ^ definition local 95
+//        display_name c
 //        documentation ```scala\nc: Int \n```
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.toUnsignedInt().
@@ -1764,6 +1878,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
           case 'u' =>
             val d = descape(i)
 //              ^ definition local 97
+//                display_name d
 //                documentation ```scala\nd: Char \n```
 //                  ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().
 //                          ^ reference local 94
@@ -1778,6 +1893,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
           case c => die(i + 1, s"illegal escape sequence after \\")
 //             ^ definition local 98
+//               display_name c
 //               documentation ```scala\nc: Char \n```
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                      ^ reference local 94
@@ -1821,11 +1937,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     */
   protected[this] final def parseStringValue(i: Int, stackHead: ObjArrVisitor[_, J]): Int = {
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().
+//                                           display_name parseStringValue
 //                                           documentation ```scala\nfinal def parseStringValue(i: Int, stackHead: ObjArrVisitor[local99, J[): Int\n```
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
+//                                             display_name i
 //                                             documentation ```scala\ni: Int \n```
 //                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(stackHead)
+//                                                             display_name stackHead
 //                                                             documentation ```scala\nstackHead: ObjArrVisitor[local99, J[ \n```
 //                                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -1833,6 +1952,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 100
+//        display_name k
 //        documentation ```scala\nk: Int \n```
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
@@ -1856,6 +1976,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     } else {
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 101
+//           display_name k2
 //           documentation ```scala\nk2: Int \n```
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
@@ -1873,11 +1994,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   protected[this] final def parseStringKey(i: Int, stackHead: ObjArrVisitor[_, J]): Int = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().
+//                                         display_name parseStringKey
 //                                         documentation ```scala\nfinal def parseStringKey(i: Int, stackHead: ObjArrVisitor[local102, J[): Int\n```
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
+//                                           display_name i
 //                                           documentation ```scala\ni: Int \n```
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(stackHead)
+//                                                           display_name stackHead
 //                                                           documentation ```scala\nstackHead: ObjArrVisitor[local102, J[ \n```
 //                                                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -1885,6 +2009,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 103
+//        display_name k
 //        documentation ```scala\nk: Int \n```
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
@@ -1908,6 +2033,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     } else {
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 104
+//           display_name k2
 //           documentation ```scala\nk2: Int \n```
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
@@ -1926,11 +2052,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   def parseStringToOutputBuilder(i: Int, k: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
+//                               display_name parseStringToOutputBuilder
 //                               documentation ```scala\ndef parseStringToOutputBuilder(i: Int, k: Int): Int\n```
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(i)
+//                                 display_name i
 //                                 documentation ```scala\ni: Int \n```
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
+//                                         display_name k
 //                                         documentation ```scala\nk: Int \n```
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     outputBuilder.reset()
@@ -1948,6 +2077,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(i)
     val k2 = parseStringComplex(-k - 1)
 //      ^^ definition local 105
+//         display_name k2
 //         documentation ```scala\nk2: Int \n```
 //           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
@@ -1959,19 +2089,24 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   def visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[_, J]) = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().
+//                display_name visitString
 //                documentation ```scala\ndef visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local106, J[): Unit\n```
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(i)
+//                  display_name i
 //                  documentation ```scala\ni: Int \n```
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(s)
+//                          display_name s
 //                          documentation ```scala\ns: CharSequence \n```
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                         ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(stackHead)
+//                                                   display_name stackHead
 //                                                   documentation ```scala\nstackHead: ObjArrVisitor[local106, J[ \n```
 //                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     val v = stackHead.subVisitor.visitString(s, i)
 //      ^ definition local 107
+//        display_name v
 //        documentation ```scala\nv: Any \n```
 //          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(stackHead)
 //                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1987,19 +2122,24 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   }
   def visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[_, J]) = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().
+//                   display_name visitStringKey
 //                   documentation ```scala\ndef visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local108, J[): Unit\n```
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(i)
+//                     display_name i
 //                     documentation ```scala\ni: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(s)
+//                             display_name s
 //                             documentation ```scala\ns: CharSequence \n```
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(stackHead)
+//                                                      display_name stackHead
 //                                                      documentation ```scala\nstackHead: ObjArrVisitor[local108, J[ \n```
 //                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     val obj = stackHead.asInstanceOf[ObjVisitor[Any, _]]
 //      ^^^ definition local 109
+//          display_name obj
 //          documentation ```scala\nobj: ObjVisitor[Any, Any] \n```
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(stackHead)
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
@@ -2007,6 +2147,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                              ^^^ reference semanticdb maven . . scala/Any#
     val keyVisitor = obj.visitKey(i)
 //      ^^^^^^^^^^ definition local 110
+//                 display_name keyVisitor
 //                 documentation ```scala\nkeyVisitor: Visitor[local111, Any[ \n```
 //                   ^^^ reference local 109
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
@@ -2023,11 +2164,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
   protected[this] final def parseStringTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().
+//                                              display_name parseStringTopLevel
 //                                              documentation ```scala\nfinal def parseStringTopLevel(i: Int, facade: Visitor[local112, J[): (J, Int)\n```
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
+//                                                display_name i
 //                                                documentation ```scala\ni: Int \n```
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
+//                                                             display_name facade
 //                                                             documentation ```scala\nfacade: Visitor[local112, J[ \n```
 //                                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -2036,6 +2180,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 113
+//        display_name k
 //        documentation ```scala\nk: Int \n```
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
@@ -2045,6 +2190,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
       val res = facade.visitString(unsafeCharSeqForRange(i + 1, k - i - 2), i)
 //        ^^^ definition local 114
+//            display_name res
 //            documentation ```scala\nres: J \n```
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
@@ -2062,12 +2208,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     } else {
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 115
+//           display_name k2
 //           documentation ```scala\nk2: Int \n```
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
 //                                           ^ reference local 113
       val res = facade.visitString(outputBuilder.makeString(), i)
 //        ^^^ definition local 116
+//            display_name res
 //            documentation ```scala\nres: J \n```
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ActivityRecyclerPool.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ActivityRecyclerPool.kt
index 8305ff043..13e08876b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ActivityRecyclerPool.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ActivityRecyclerPool.kt
@@ -39,8 +39,10 @@ import java.util.ArrayList
 
 internal class ActivityRecyclerPool {
 //             ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#
+//                                  display_name ActivityRecyclerPool
 //                                  documentation ```kt\ninternal final class ActivityRecyclerPool\n```
 //             ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#`<init>`().
+//                                  display_name ActivityRecyclerPool
 //                                  documentation ```kt\npublic constructor ActivityRecyclerPool()\n```
 
     /**
@@ -49,8 +51,10 @@ internal class ActivityRecyclerPool {
      */
     private val pools = ArrayList<PoolReference>(5)
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPools().
+//                    display_name pools
 //                    documentation ```kt\nprivate final val pools: java.util.ArrayList<com.airbnb.epoxy.PoolReference>\n```\n\n----\n\n\n Store one unique pool per activity. They are cleared out when activities are destroyed, so this\n only needs to hold pools for active activities.\n
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#pools.
+//                    display_name pools
 //                    documentation ```kt\nprivate final val pools: java.util.ArrayList<com.airbnb.epoxy.PoolReference>\n```\n\n----\n\n\n Store one unique pool per activity. They are cleared out when activities are destroyed, so this\n only needs to hold pools for active activities.\n
 //                      ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
 //                                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#
@@ -59,24 +63,29 @@ internal class ActivityRecyclerPool {
 //   ^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/jvm/JvmOverloads#`<init>`().
     fun getPool(
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().
+//              display_name getPool
 //              documentation ```kt\npublic final fun getPool(context: [Error type: Unresolved type for Context], poolFactory: () -> [Error type: Unresolved type for RecyclerView.RecycledViewPool]): com.airbnb.epoxy.PoolReference\n```
         context: Context,
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().(context)
+//              display_name context
 //              documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
         poolFactory: () -> RecyclerView.RecycledViewPool
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPool().(poolFactory)
+//                  display_name poolFactory
 //                  documentation ```kt\nvalue-parameter poolFactory: () -> [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
     ): PoolReference {
 //     ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#
 
         val iterator = pools.iterator()
 //          ^^^^^^^^ definition local 0
+//                   display_name iterator
 //                   documentation ```kt\nval iterator: kotlin.collections.MutableIterator<com.airbnb.epoxy.PoolReference>\n```
 //                     ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#getPools().
 //                     ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#pools.
 //                           ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
         var poolToUse: PoolReference? = null
 //          ^^^^^^^^^ definition local 1
+//                    display_name poolToUse
 //                    documentation ```kt\nvar poolToUse: com.airbnb.epoxy.PoolReference?\n```
 //                     ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#
 
@@ -85,6 +94,7 @@ internal class ActivityRecyclerPool {
 //                      ^^^^^^^ reference semanticdb maven . . kotlin/collections/MutableIterator#hasNext().
             val poolReference = iterator.next()
 //              ^^^^^^^^^^^^^ definition local 2
+//                            display_name poolReference
 //                            documentation ```kt\nval poolReference: com.airbnb.epoxy.PoolReference\n```
 //                              ^^^^^^^^ reference local 0
 //                                       ^^^^ reference semanticdb maven . . kotlin/collections/MutableIterator#next().
@@ -145,8 +155,10 @@ internal class ActivityRecyclerPool {
 
     fun clearIfDestroyed(pool: PoolReference) {
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#clearIfDestroyed().
+//                       display_name clearIfDestroyed
 //                       documentation ```kt\npublic final fun clearIfDestroyed(pool: com.airbnb.epoxy.PoolReference)\n```
 //                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#clearIfDestroyed().(pool)
+//                            display_name pool
 //                            documentation ```kt\nvalue-parameter pool: com.airbnb.epoxy.PoolReference\n```
 //                             ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#
         if (pool.context.isActivityDestroyed()) {
@@ -166,6 +178,7 @@ internal class ActivityRecyclerPool {
 
     private fun Context.lifecycle(): Lifecycle? {
 //                      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#lifecycle().
+//                                display_name lifecycle
 //                                documentation ```kt\nprivate final fun [Error type: Unresolved type for Context].lifecycle(): androidx.lifecycle.Lifecycle?\n```
 //                                   ^^^^^^^^^ reference semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/Lifecycle#
         if (this is LifecycleOwner) {
@@ -185,34 +198,45 @@ internal class ActivityRecyclerPool {
 
 internal class PoolReference(
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#
+//                           display_name PoolReference
 //                           documentation ```kt\ninternal final class PoolReference : androidx.lifecycle.LifecycleObserver\n```
 //                           relationship is_reference is_implementation semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/LifecycleObserver#
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().
+//                           display_name PoolReference
 //                           documentation ```kt\npublic constructor PoolReference(context: [Error type: Unresolved type for Context], viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool], parent: com.airbnb.epoxy.ActivityRecyclerPool)\n```
     context: Context,
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(context)
+//          display_name context
 //          documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
     val viewPool: RecyclerView.RecycledViewPool,
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(viewPool)
+//               display_name viewPool
 //               documentation ```kt\nvalue-parameter viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getViewPool().
+//               display_name viewPool
 //               documentation ```kt\npublic final val viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#viewPool.
+//               display_name viewPool
 //               documentation ```kt\npublic final val viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
     private val parent: ActivityRecyclerPool
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#`<init>`().(parent)
+//                     display_name parent
 //                     documentation ```kt\nvalue-parameter parent: com.airbnb.epoxy.ActivityRecyclerPool\n```
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getParent().
+//                     display_name parent
 //                     documentation ```kt\nprivate final val parent: com.airbnb.epoxy.ActivityRecyclerPool\n```
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#parent.
+//                     display_name parent
 //                     documentation ```kt\nprivate final val parent: com.airbnb.epoxy.ActivityRecyclerPool\n```
 //                      ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#
 ) : LifecycleObserver {
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/LifecycleObserver#
     private val contextReference: WeakReference<Context> = WeakReference(context)
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#contextReference.
+//                               display_name contextReference
 //                               documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[Error type: Unresolved type for Context]>\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getContextReference().
+//                               display_name contextReference
 //                               documentation ```kt\nprivate final val contextReference: java.lang.ref.WeakReference<[Error type: Unresolved type for Context]>\n```
 //                                ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/ref/WeakReference#
 //                                                         ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/ref/WeakReference#`<init>`().
@@ -220,8 +244,10 @@ internal class PoolReference(
 
     val context: Context? get() = contextReference.get()
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#context.
+//              display_name context
 //              documentation ```kt\npublic final val context: [Error type: Unresolved type for Context]?\n```
 //                        ^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#getContext().
+//                            display_name get
 //                            documentation ```kt\npublic final fun `<get-context>`(): [Error type: Unresolved type for Context]?\n```
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#contextReference.
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#getContextReference().
@@ -229,6 +255,7 @@ internal class PoolReference(
 
     fun clearIfDestroyed() {
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#clearIfDestroyed().
+//                       display_name clearIfDestroyed
 //                       documentation ```kt\npublic final fun clearIfDestroyed()\n```
         parent.clearIfDestroyed(this)
 //      ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#getParent().
@@ -244,6 +271,7 @@ internal class PoolReference(
 //                                    ^^^^^^^^^^ reference semanticdb maven maven/androidx.lifecycle/lifecycle-common 2.0.0 androidx/lifecycle/Lifecycle#Event#ON_DESTROY#
     fun onContextDestroyed() {
 //      ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/PoolReference#onContextDestroyed().
+//                         display_name onContextDestroyed
 //                         documentation ```kt\npublic final fun onContextDestroyed()\n```
         clearIfDestroyed()
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/PoolReference#clearIfDestroyed().
@@ -252,6 +280,7 @@ internal class PoolReference(
 
 internal fun Context?.isActivityDestroyed(): Boolean {
 //                    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPoolKt#isActivityDestroyed().
+//                                        display_name isActivityDestroyed
 //                                        documentation ```kt\ninternal fun [Error type: Unresolved type for Context]?.isActivityDestroyed(): kotlin.Boolean\n```
 //                                           ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
     if (this == null) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
index ef66a1ffc..c46b74f0a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
@@ -24,6 +24,7 @@
  */
 public abstract class AsyncEpoxyController extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#
+//                                         display_name AsyncEpoxyController
 //                                         documentation ```java\npublic abstract class AsyncEpoxyController\n```
 //                                         documentation  A subclass of {@link EpoxyController} that makes it easy to do model building and diffing in\n the background.\n <p>\n See https://github.com/airbnb/epoxy/wiki/Epoxy-Controller#asynchronous-support\n
 //                                         relationship is_implementation semanticdb maven . . ModelCollector#
@@ -36,6 +37,7 @@ public abstract class AsyncEpoxyController extends EpoxyController {
    */
   public AsyncEpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`().
+//                            display_name <init>
 //                            documentation ```java\npublic AsyncEpoxyController()\n```
 //                            documentation  A new instance that does model building and diffing asynchronously.\n
     this(true);
@@ -48,9 +50,11 @@ public AsyncEpoxyController() {
    */
   public AsyncEpoxyController(boolean enableAsync) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1).
+//                            display_name <init>
 //                            documentation ```java\npublic AsyncEpoxyController(boolean enableAsync)\n```
 //                            documentation  @param enableAsync True to do model building and diffing asynchronously, false to do them\n                    both on the main thread.\n
 //                                    ^^^^^^^^^^^ definition local 0
+//                                                display_name enableAsync
 //                                                documentation ```java\nboolean enableAsync\n```
     this(enableAsync, enableAsync);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
@@ -63,11 +67,14 @@ public AsyncEpoxyController(boolean enableAsync) {
    */
   public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
+//                            display_name <init>
 //                            documentation ```java\npublic AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing)\n```
 //                            documentation  Individually control whether model building and diffing are done async or on the main thread.\n
 //                                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 1
+//                                                             display_name enableAsyncModelBuilding
 //                                                             documentation ```java\nboolean enableAsyncModelBuilding\n```
 //                                                                      ^^^^^^^^^^^^^^^^^^ definition local 2
+//                                                                                         display_name enableAsyncDiffing
 //                                                                                         documentation ```java\nboolean enableAsyncDiffing\n```
     super(getHandler(enableAsyncModelBuilding), getHandler(enableAsyncDiffing));
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
@@ -80,8 +87,10 @@ public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyn
   private static Handler getHandler(boolean enableAsync) {
 //               ^^^^^^^ reference semanticdb maven . . Handler#
 //                       ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#getHandler().
+//                                  display_name getHandler
 //                                  documentation ```java\nprivate static unresolved_type getHandler(boolean enableAsync)\n```
 //                                          ^^^^^^^^^^^ definition local 3
+//                                                      display_name enableAsync
 //                                                      documentation ```java\nboolean enableAsync\n```
     return enableAsync ? getAsyncBackgroundHandler() : MAIN_THREAD_HANDLER;
 //         ^^^^^^^^^^^ reference local 3
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
index b0315e3ab..ffaa8d016 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
@@ -51,59 +51,71 @@
  */
 class AsyncEpoxyDiffer {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#
+//                     display_name AsyncEpoxyDiffer
 //                     documentation ```java\nclass AsyncEpoxyDiffer\n```
 //                     documentation  An adaptation of Google's {@link androidx.recyclerview.widget.AsyncListDiffer}\n that adds support for payloads in changes.\n <p>\n Also adds support for canceling an in progress diff, and makes everything thread safe.\n
 
   interface ResultCallback {
 //          ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
+//                         display_name ResultCallback
 //                         documentation ```java\ninterface ResultCallback\n```
     void onResult(@NonNull DiffResult result);
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult().
+//                display_name onResult
 //                documentation ```java\npublic abstract void onResult(DiffResult result)\n```
 //                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
 //                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                                    ^^^^^^ definition local 0
+//                                           display_name result
 //                                           documentation ```java\n@NonNull\nDiffResult result\n```
   }
 
   private final Executor executor;
 //              ^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/Executor#
 //                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
+//                                display_name executor
 //                                documentation ```java\nprivate final Executor executor\n```
   private final ResultCallback resultCallback;
 //              ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#resultCallback.
+//                                            display_name resultCallback
 //                                            documentation ```java\nprivate final ResultCallback resultCallback\n```
   private final ItemCallback<EpoxyModel<?>> diffCallback;
 //              ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#diffCallback.
+//                                                       display_name diffCallback
 //                                                       documentation ```java\nprivate final unresolved_type diffCallback\n```
   private final GenerationTracker generationTracker = new GenerationTracker();
 //              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
 //                                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
+//                                                  display_name generationTracker
 //                                                  documentation ```java\nprivate final GenerationTracker generationTracker\n```
 //                                                        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#`<init>`().
 
   AsyncEpoxyDiffer(
 //^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`().
+//                 display_name <init>
 //                 documentation ```java\nAsyncEpoxyDiffer(unresolved_type handler, ResultCallback resultCallback, unresolved_type diffCallback)\n```
       @NonNull Handler handler,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^ reference semanticdb maven . . Handler#
 //                     ^^^^^^^ definition local 1
+//                             display_name handler
 //                             documentation ```java\n@NonNull\nunresolved_type handler\n```
       @NonNull ResultCallback resultCallback,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
 //                            ^^^^^^^^^^^^^^ definition local 2
+//                                           display_name resultCallback
 //                                           documentation ```java\n@NonNull\nResultCallback resultCallback\n```
       @NonNull ItemCallback<EpoxyModel<?>> diffCallback
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^^^^^^^^ definition local 3
+//                                                      display_name diffCallback
 //                                                      documentation ```java\n@NonNull\nunresolved_type diffCallback\n```
   ) {
     this.executor = new HandlerExecutor(handler);
@@ -124,6 +136,7 @@ interface ResultCallback {
 //                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#list.
+//                                                    display_name list
 //                                                    documentation ```java\n@Nullable\nprivate List<? extends EpoxyModel<?>> list\n```
 
   /**
@@ -137,6 +150,7 @@ interface ResultCallback {
 //                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#readOnlyList.
+//                                                            display_name readOnlyList
 //                                                            documentation ```java\n@NonNull\nprivate List<? extends EpoxyModel<?>> readOnlyList\n```
 //                                                            documentation  Non-null, unmodifiable version of list.\n <p>\n Collections.emptyList when list is null, wrapped by Collections.unmodifiableList otherwise\n
 //                                                              ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
@@ -161,6 +175,7 @@ public List<? extends EpoxyModel<?>> getCurrentList() {
 //       ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#getCurrentList().
+//                                                    display_name getCurrentList
 //                                                    documentation ```java\n@AnyThread\n@NonNull\npublic List<? extends EpoxyModel<?>> getCurrentList()\n```
 //                                                    documentation  Get the current List - any diffing to present this list has already been computed and\n dispatched via the ListUpdateCallback.\n <p>\n If a <code>null</code> List, or no List has been submitted, an empty list will be returned.\n <p>\n The returned list may not be mutated - mutations to content must be done through\n {@link #submitList(List)}.\n\n @return current List.\n
     return readOnlyList;
@@ -177,6 +192,7 @@ public List<? extends EpoxyModel<?>> getCurrentList() {
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/AnyThread#
   public boolean cancelDiff() {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff().
+//                          display_name cancelDiff
 //                          documentation ```java\n@SuppressWarnings("WeakerAccess")\n@AnyThread\npublic boolean cancelDiff()\n```
 //                          documentation  Prevents any ongoing diff from dispatching results. Returns true if there was an ongoing\n diff to cancel, false otherwise.\n
     return generationTracker.finishMaxGeneration();
@@ -193,6 +209,7 @@ public boolean cancelDiff() {
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/AnyThread#
   public boolean isDiffInProgress() {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#isDiffInProgress().
+//                                display_name isDiffInProgress
 //                                documentation ```java\n@SuppressWarnings("WeakerAccess")\n@AnyThread\npublic boolean isDiffInProgress()\n```
 //                                documentation  @return True if a diff operation is in progress.\n
     return generationTracker.hasUnfinishedGeneration();
@@ -210,20 +227,24 @@ public boolean isDiffInProgress() {
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/AnyThread#
   public synchronized boolean forceListOverride(@Nullable List<EpoxyModel<?>> newList) {
 //                            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
+//                                              display_name forceListOverride
 //                                              documentation ```java\n@AnyThread\npublic boolean forceListOverride(List<EpoxyModel<?>> newList)\n```
 //                                              documentation  Set the current list without performing any diffing. Cancels any diff in progress.\n <p>\n This can be used if you notified a change to the adapter manually and need this list to be\n synced.\n
 //                                               ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                            ^^^^^^^ definition local 4
+//                                                                                    display_name newList
 //                                                                                    documentation ```java\n@Nullable\nList<EpoxyModel<?>> newList\n```
     // We need to make sure that generation changes and list updates are synchronized
     final boolean interruptedDiff = cancelDiff();
 //                ^^^^^^^^^^^^^^^ definition local 5
+//                                display_name interruptedDiff
 //                                documentation ```java\nfinal boolean interruptedDiff\n```
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff().
     int generation = generationTracker.incrementAndGetNextScheduled();
 //      ^^^^^^^^^^ definition local 6
+//                 display_name generation
 //                 documentation ```java\nint generation\n```
 //                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#incrementAndGetNextScheduled().
@@ -251,21 +272,25 @@ public synchronized boolean forceListOverride(@Nullable List<EpoxyModel<?>> newL
 // ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
   public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
+//                       display_name submitList
 //                       documentation ```java\n@AnyThread\n@SuppressWarnings("WeakerAccess")\npublic void submitList(List<? extends EpoxyModel<?>> newList)\n```
 //                       documentation  Set a new List representing your latest data.\n <p>\n A diff will be computed between this list and the last list set. If this has not previously\n been called then an empty list is used as the previous list.\n <p>\n The diff computation will be done on the thread given by the handler in the constructor.\n When the diff is done it will be applied (dispatched to the result callback),\n and the new List will be swapped in.\n
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                       ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^^^^^^^ definition local 7
+//                                                                             display_name newList
 //                                                                             documentation ```java\n@Nullable\nfinal List<? extends EpoxyModel<?>> newList\n```
     final int runGeneration;
 //            ^^^^^^^^^^^^^ definition local 8
+//                          display_name runGeneration
 //                          documentation ```java\nfinal int runGeneration\n```
     @Nullable final List<? extends EpoxyModel<?>> previousList;
 //   ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^^^^^^^^ definition local 9
+//                                                             display_name previousList
 //                                                             documentation ```java\n@Nullable\nfinal List<? extends EpoxyModel<?>> previousList\n```
 
     synchronized (this) {
@@ -302,6 +327,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
       DiffResult result = null;
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //               ^^^^^^ definition local 10
+//                      display_name result
 //                      documentation ```java\nDiffResult result\n```
       if (previousList != null && !previousList.isEmpty()) {
 //        ^^^^^^^^^^^^ reference local 9
@@ -338,6 +364,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
     final DiffCallback wrappedCallback = new DiffCallback(previousList, newList, diffCallback);
 //        ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
 //                     ^^^^^^^^^^^^^^^ definition local 11
+//                                     display_name wrappedCallback
 //                                     documentation ```java\nfinal DiffCallback wrappedCallback\n```
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
 //                                                        ^^^^^^^^^^^^ reference local 9
@@ -352,12 +379,14 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //     ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
       public void run() {
 //                ^^^ definition local 13
+//                    display_name run
 //                    documentation ```java\n@Override\npublic void run()\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         DiffUtil.DiffResult result = DiffUtil.calculateDiff(wrappedCallback);
 //      ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //               ^^^^^^^^^^ reference semanticdb maven . . DiffUtil/DiffResult#
 //                          ^^^^^^ definition local 14
+//                                 display_name result
 //                                 documentation ```java\nunresolved_type result\n```
 //                                   ^^^^^^^^ reference semanticdb maven . . DiffUtil#
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . DiffUtil#calculateDiff#
@@ -377,20 +406,24 @@ public void run() {
 
   private void onRunCompleted(
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#onRunCompleted().
+//                            display_name onRunCompleted
 //                            documentation ```java\nprivate void onRunCompleted(int runGeneration, List<? extends EpoxyModel<?>> newList, DiffResult result)\n```
       final int runGeneration,
 //              ^^^^^^^^^^^^^ definition local 15
+//                            display_name runGeneration
 //                            documentation ```java\nfinal int runGeneration\n```
       @Nullable final List<? extends EpoxyModel<?>> newList,
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^ definition local 16
+//                                                          display_name newList
 //                                                          documentation ```java\n@Nullable\nfinal List<? extends EpoxyModel<?>> newList\n```
       @Nullable final DiffResult result
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                               ^^^^^^ definition local 17
+//                                      display_name result
 //                                      documentation ```java\n@Nullable\nfinal DiffResult result\n```
   ) {
 
@@ -405,10 +438,12 @@ private void onRunCompleted(
 //     ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
       public void run() {
 //                ^^^ definition local 19
+//                    display_name run
 //                    documentation ```java\n@Override\npublic void run()\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         final boolean dispatchResult = tryLatchList(newList, runGeneration);
 //                    ^^^^^^^^^^^^^^ definition local 20
+//                                   display_name dispatchResult
 //                                   documentation ```java\nfinal boolean dispatchResult\n```
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
 //                                                  ^^^^^^^ reference local 16
@@ -435,15 +470,18 @@ public void run() {
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/AnyThread#
   private synchronized boolean tryLatchList(@Nullable List<? extends EpoxyModel<?>> newList,
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
+//                                          display_name tryLatchList
 //                                          documentation ```java\n@AnyThread\nprivate boolean tryLatchList(List<? extends EpoxyModel<?>> newList, int runGeneration)\n```
 //                                          documentation  Marks the generation as done, and updates the list if the generation is the most recent.\n\n @return True if the given generation is the most recent, in which case the given list was\n set. False if the generation is old and the list was ignored.\n
 //                                           ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                  ^^^^^^^ definition local 21
+//                                                                                          display_name newList
 //                                                                                          documentation ```java\n@Nullable\nList<? extends EpoxyModel<?>> newList\n```
       int runGeneration) {
 //        ^^^^^^^^^^^^^ definition local 22
+//                      display_name runGeneration
 //                      documentation ```java\nint runGeneration\n```
     if (generationTracker.finishGeneration(runGeneration)) {
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
@@ -486,21 +524,26 @@ private synchronized boolean tryLatchList(@Nullable List<? extends EpoxyModel<?>
    */
   private static class GenerationTracker {
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
+//                                       display_name GenerationTracker
 //                                       documentation ```java\nprivate static class GenerationTracker\n```
 //                                       documentation  The concept of a "generation" is used to associate a diff result with a point in time when\n it was created. This allows us to handle list updates concurrently, and ignore outdated diffs.\n <p>\n We track the highest start generation, and the highest finished generation, and these must\n be kept in sync, so all access to this class is synchronized.\n <p>\n The general synchronization strategy for this class is that when a generation number\n is queried that action must be synchronized with accessing the current list, so that the\n generation number is synced with the list state at the time it was created.\n
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#`<init>`().
+//                                       display_name <init>
 //                                       documentation ```java\nprivate GenerationTracker()\n```
 
     // Max generation of currently scheduled runnable
     private volatile int maxScheduledGeneration;
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
+//                                              display_name maxScheduledGeneration
 //                                              documentation ```java\nprivate int maxScheduledGeneration\n```
     private volatile int maxFinishedGeneration;
 //                       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxFinishedGeneration.
+//                                             display_name maxFinishedGeneration
 //                                             documentation ```java\nprivate int maxFinishedGeneration\n```
 
     synchronized int incrementAndGetNextScheduled() {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#incrementAndGetNextScheduled().
+//                                                display_name incrementAndGetNextScheduled
 //                                                documentation ```java\nint incrementAndGetNextScheduled()\n```
       return ++maxScheduledGeneration;
 //             ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
@@ -508,9 +551,11 @@ synchronized int incrementAndGetNextScheduled() {
 
     synchronized boolean finishMaxGeneration() {
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishMaxGeneration().
+//                                           display_name finishMaxGeneration
 //                                           documentation ```java\nboolean finishMaxGeneration()\n```
       boolean isInterrupting = hasUnfinishedGeneration();
 //            ^^^^^^^^^^^^^^ definition local 23
+//                           display_name isInterrupting
 //                           documentation ```java\nboolean isInterrupting\n```
 //                             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#hasUnfinishedGeneration().
       maxFinishedGeneration = maxScheduledGeneration;
@@ -522,6 +567,7 @@ synchronized boolean finishMaxGeneration() {
 
     synchronized boolean hasUnfinishedGeneration() {
 //                       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#hasUnfinishedGeneration().
+//                                               display_name hasUnfinishedGeneration
 //                                               documentation ```java\nboolean hasUnfinishedGeneration()\n```
       return maxScheduledGeneration > maxFinishedGeneration;
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
@@ -530,11 +576,14 @@ synchronized boolean hasUnfinishedGeneration() {
 
     synchronized boolean finishGeneration(int runGeneration) {
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishGeneration().
+//                                        display_name finishGeneration
 //                                        documentation ```java\nboolean finishGeneration(int runGeneration)\n```
 //                                            ^^^^^^^^^^^^^ definition local 24
+//                                                          display_name runGeneration
 //                                                          documentation ```java\nint runGeneration\n```
       boolean isLatestGeneration =
 //            ^^^^^^^^^^^^^^^^^^ definition local 25
+//                               display_name isLatestGeneration
 //                               documentation ```java\nboolean isLatestGeneration\n```
           maxScheduledGeneration == runGeneration && runGeneration > maxFinishedGeneration;
 //        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
@@ -556,6 +605,7 @@ synchronized boolean finishGeneration(int runGeneration) {
 
   private static class DiffCallback extends DiffUtil.Callback {
 //                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
+//                                  display_name DiffCallback
 //                                  documentation ```java\nprivate static class DiffCallback\n```
 //                                  relationship is_implementation semanticdb maven . . DiffUtil/Callback#
 //                                          ^^^^^^^^ reference semanticdb maven . . DiffUtil/
@@ -565,33 +615,40 @@ private static class DiffCallback extends DiffUtil.Callback {
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
+//                                              display_name oldList
 //                                              documentation ```java\nfinal List<? extends EpoxyModel<?>> oldList\n```
     final List<? extends EpoxyModel<?>> newList;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList.
+//                                              display_name newList
 //                                              documentation ```java\nfinal List<? extends EpoxyModel<?>> newList\n```
     private final ItemCallback<EpoxyModel<?>> diffCallback;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
+//                                                         display_name diffCallback
 //                                                         documentation ```java\nprivate final unresolved_type diffCallback\n```
 
     DiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList,
 //  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
+//               display_name <init>
 //               documentation ```java\nDiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList, unresolved_type diffCallback)\n```
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^ definition local 26
+//                                                     display_name oldList
 //                                                     documentation ```java\nList<? extends EpoxyModel<?>> oldList\n```
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^^^ definition local 27
+//                                                                                            display_name newList
 //                                                                                            documentation ```java\nList<? extends EpoxyModel<?>> newList\n```
         ItemCallback<EpoxyModel<?>> diffCallback) {
 //      ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^^^^^^^ definition local 28
+//                                               display_name diffCallback
 //                                               documentation ```java\nunresolved_type diffCallback\n```
       this.oldList = oldList;
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
@@ -608,6 +665,7 @@ private static class DiffCallback extends DiffUtil.Callback {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public int getOldListSize() {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getOldListSize().
+//                            display_name getOldListSize
 //                            documentation ```java\n@Override\npublic int getOldListSize()\n```
       return oldList.size();
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
@@ -618,6 +676,7 @@ public int getOldListSize() {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public int getNewListSize() {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getNewListSize().
+//                            display_name getNewListSize
 //                            documentation ```java\n@Override\npublic int getNewListSize()\n```
       return newList.size();
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList.
@@ -628,10 +687,13 @@ public int getNewListSize() {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areItemsTheSame().
+//                                 display_name areItemsTheSame
 //                                 documentation ```java\n@Override\npublic boolean areItemsTheSame(int oldItemPosition, int newItemPosition)\n```
 //                                     ^^^^^^^^^^^^^^^ definition local 29
+//                                                     display_name oldItemPosition
 //                                                     documentation ```java\nint oldItemPosition\n```
 //                                                          ^^^^^^^^^^^^^^^ definition local 30
+//                                                                          display_name newItemPosition
 //                                                                          documentation ```java\nint newItemPosition\n```
       return diffCallback.areItemsTheSame(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
@@ -651,10 +713,13 @@ public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
 //                 ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areContentsTheSame().
+//                                    display_name areContentsTheSame
 //                                    documentation ```java\n@Override\npublic boolean areContentsTheSame(int oldItemPosition, int newItemPosition)\n```
 //                                        ^^^^^^^^^^^^^^^ definition local 31
+//                                                        display_name oldItemPosition
 //                                                        documentation ```java\nint oldItemPosition\n```
 //                                                             ^^^^^^^^^^^^^^^ definition local 32
+//                                                                             display_name newItemPosition
 //                                                                             documentation ```java\nint newItemPosition\n```
       return diffCallback.areContentsTheSame(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
@@ -677,10 +742,13 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
     public Object getChangePayload(int oldItemPosition, int newItemPosition) {
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getChangePayload().
+//                                 display_name getChangePayload
 //                                 documentation ```java\n@Nullable\n@Override\npublic Object getChangePayload(int oldItemPosition, int newItemPosition)\n```
 //                                     ^^^^^^^^^^^^^^^ definition local 33
+//                                                     display_name oldItemPosition
 //                                                     documentation ```java\nint oldItemPosition\n```
 //                                                          ^^^^^^^^^^^^^^^ definition local 34
+//                                                                          display_name newItemPosition
 //                                                                          documentation ```java\nint newItemPosition\n```
       return diffCallback.getChangePayload(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
index 6e93bc4c4..c0dfdb39d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
@@ -61,6 +61,7 @@
 
 public abstract class BaseEpoxyAdapter
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
+//                                     display_name BaseEpoxyAdapter
 //                                     documentation ```java\npublic abstract class BaseEpoxyAdapter\n```
 //                                     relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                     relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -74,15 +75,18 @@ public abstract class BaseEpoxyAdapter
   private static final String SAVED_STATE_ARG_VIEW_HOLDERS = "saved_state_view_holders";
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#SAVED_STATE_ARG_VIEW_HOLDERS.
+//                                                         display_name SAVED_STATE_ARG_VIEW_HOLDERS
 //                                                         documentation ```java\nprivate static final String SAVED_STATE_ARG_VIEW_HOLDERS\n```
 
   private int spanCount = 1;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
+//                      display_name spanCount
 //                      documentation ```java\nprivate int spanCount\n```
 
   private final ViewTypeManager viewTypeManager = new ViewTypeManager();
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
+//                                              display_name viewTypeManager
 //                                              documentation ```java\nprivate final ViewTypeManager viewTypeManager\n```
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#`<init>`().
   /**
@@ -92,18 +96,21 @@ public abstract class BaseEpoxyAdapter
   private final BoundViewHolders boundViewHolders = new BoundViewHolders();
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders.
+//                                                display_name boundViewHolders
 //                                                documentation ```java\nprivate final BoundViewHolders boundViewHolders\n```
 //                                                documentation  Keeps track of view holders that are currently bound so we can save their state in {@link\n #onSaveInstanceState(Bundle)}.\n
 //                                                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#`<init>`().
   private ViewHolderState viewHolderState = new ViewHolderState();
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 //                        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
+//                                        display_name viewHolderState
 //                                        documentation ```java\nprivate ViewHolderState viewHolderState\n```
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`().
 
   private final SpanSizeLookup spanSizeLookup = new SpanSizeLookup() {
 //              ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanSizeLookup.
+//                                            display_name spanSizeLookup
 //                                            documentation ```java\nprivate final unresolved_type spanSizeLookup\n```
 //                                                  ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 
@@ -128,6 +135,7 @@ public int getSpanSize(int position) {
 
   public BaseEpoxyAdapter() {
 //       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#`<init>`().
+//                        display_name <init>
 //                        documentation ```java\npublic BaseEpoxyAdapter()\n```
     // Defaults to stable ids since view models generate unique ids. Set this to false in the
     // subclass if you don't want to support it
@@ -144,11 +152,13 @@ public BaseEpoxyAdapter() {
    */
   protected void onExceptionSwallowed(RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onExceptionSwallowed().
+//                                    display_name onExceptionSwallowed
 //                                    documentation ```java\nprotected void onExceptionSwallowed(RuntimeException exception)\n```
 //                                    documentation  This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy\n will recover, but you can override this to be aware of when they happen.\n
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed().
 //                                    ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                     ^^^^^^^^^ definition local 0
+//                                                               display_name exception
 //                                                               documentation ```java\nRuntimeException exception\n```
 
   }
@@ -157,6 +167,7 @@ protected void onExceptionSwallowed(RuntimeException exception) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getItemCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemCount().
+//                        display_name getItemCount
 //                        documentation ```java\n@Override\npublic int getItemCount()\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
     return getCurrentModels().size();
@@ -169,6 +180,7 @@ public int getItemCount() {
 //         ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
+//                                                        display_name getCurrentModels
 //                                                        documentation ```java\nabstract List<? extends EpoxyModel<?>> getCurrentModels()\n```
 //                                                        documentation Return the models currently being used by the adapter to populate the recyclerview. 
 //                                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getCurrentModels().
@@ -176,6 +188,7 @@ public int getItemCount() {
 
   public boolean isEmpty() {
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isEmpty().
+//                       display_name isEmpty
 //                       documentation ```java\npublic boolean isEmpty()\n```
     return getCurrentModels().isEmpty();
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
@@ -186,8 +199,10 @@ public boolean isEmpty() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public long getItemId(int position) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemId().
+//                      display_name getItemId
 //                      documentation ```java\n@Override\npublic long getItemId(int position)\n```
 //                          ^^^^^^^^ definition local 1
+//                                   display_name position
 //                                   documentation ```java\nint position\n```
     // This does not call getModelForPosition so that we don't use the id of the empty model when
     // hidden,
@@ -203,8 +218,10 @@ public long getItemId(int position) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getItemViewType(int position) {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemViewType().
+//                           display_name getItemViewType
 //                           documentation ```java\n@Override\npublic int getItemViewType(int position)\n```
 //                               ^^^^^^^^ definition local 2
+//                                        display_name position
 //                                        documentation ```java\nint position\n```
     return viewTypeManager.getViewTypeAndRememberModel(getModelForPosition(position));
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
@@ -218,15 +235,19 @@ public int getItemViewType(int position) {
   public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
+//                                          display_name onCreateViewHolder
 //                                          documentation ```java\n@Override\npublic EpoxyViewHolder onCreateViewHolder(unresolved_type parent, int viewType)\n```
 //                                          ^^^^^^^^^ reference semanticdb maven . . ViewGroup#
 //                                                    ^^^^^^ definition local 3
+//                                                           display_name parent
 //                                                           documentation ```java\nunresolved_type parent\n```
 //                                                                ^^^^^^^^ definition local 4
+//                                                                         display_name viewType
 //                                                                         documentation ```java\nint viewType\n```
     EpoxyModel<?> model = viewTypeManager.getModelForViewType(this, viewType);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 5
+//                      display_name model
 //                      documentation ```java\nEpoxyModel<?> model\n```
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
 //                                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
@@ -234,6 +255,7 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     View view = model.buildView(parent);
 //  ^^^^ reference semanticdb maven . . View#
 //       ^^^^ definition local 6
+//            display_name view
 //            documentation ```java\nunresolved_type view\n```
 //              ^^^^^ reference local 5
 //                    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
@@ -250,11 +272,14 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onBindViewHolder(EpoxyViewHolder holder, int position) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder().
+//                             display_name onBindViewHolder
 //                             documentation ```java\n@Override\npublic void onBindViewHolder(EpoxyViewHolder holder, int position)\n```
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^ definition local 7
+//                                                    display_name holder
 //                                                    documentation ```java\nEpoxyViewHolder holder\n```
 //                                                         ^^^^^^^^ definition local 8
+//                                                                  display_name position
 //                                                                  documentation ```java\nint position\n```
     onBindViewHolder(holder, position, Collections.emptyList());
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
@@ -268,19 +293,24 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object> payloads) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
+//                             display_name onBindViewHolder
 //                             documentation ```java\n@Override\npublic void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object> payloads)\n```
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^ definition local 9
+//                                                    display_name holder
 //                                                    documentation ```java\nEpoxyViewHolder holder\n```
 //                                                         ^^^^^^^^ definition local 10
+//                                                                  display_name position
 //                                                                  documentation ```java\nint position\n```
 //                                                                   ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                ^^^^^^^^ definition local 11
+//                                                                                         display_name payloads
 //                                                                                         documentation ```java\nList<Object> payloads\n```
     EpoxyModel<?> modelToShow = getModelForPosition(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^^^^^^^ definition local 12
+//                            display_name modelToShow
 //                            documentation ```java\nEpoxyModel<?> modelToShow\n```
 //                              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                                  ^^^^^^^^ reference local 10
@@ -288,6 +318,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
     EpoxyModel<?> previouslyBoundModel = null;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^^^^^^^^^^^^^^^^ definition local 13
+//                                     display_name previouslyBoundModel
 //                                     documentation ```java\nEpoxyModel<?> previouslyBoundModel\n```
     if (diffPayloadsEnabled()) {
 //      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
@@ -345,6 +376,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
 
   boolean diffPayloadsEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
+//                            display_name diffPayloadsEnabled
 //                            documentation ```java\nboolean diffPayloadsEnabled()\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#diffPayloadsEnabled().
     return false;
@@ -356,21 +388,26 @@ boolean diffPayloadsEnabled() {
    */
   protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position,
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound().
+//                            display_name onModelBound
 //                            documentation ```java\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, List<Object> payloads)\n```
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound.\n
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                            ^^^^^^ definition local 14
+//                                                   display_name holder
 //                                                   documentation ```java\nEpoxyViewHolder holder\n```
 //                                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^ definition local 15
+//                                                                        display_name model
 //                                                                        documentation ```java\nEpoxyModel<?> model\n```
 //                                                                             ^^^^^^^^ definition local 16
+//                                                                                      display_name position
 //                                                                                      documentation ```java\nint position\n```
       @Nullable List<Object> payloads) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                   ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                           ^^^^^^^^ definition local 17
+//                                    display_name payloads
 //                                    documentation ```java\n@Nullable\nList<Object> payloads\n```
     onModelBound(holder, model, position);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
@@ -381,20 +418,25 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int pos
 
   void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position,
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
+//                  display_name onModelBound
 //                  documentation ```java\nvoid onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, EpoxyModel<?> previouslyBoundModel)\n```
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
 //                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                  ^^^^^^ definition local 18
+//                                         display_name holder
 //                                         documentation ```java\nEpoxyViewHolder holder\n```
 //                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^ definition local 19
+//                                                              display_name model
 //                                                              documentation ```java\nEpoxyModel<?> model\n```
 //                                                                   ^^^^^^^^ definition local 20
+//                                                                            display_name position
 //                                                                            documentation ```java\nint position\n```
       @Nullable EpoxyModel<?> previouslyBoundModel) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 21
+//                                                 display_name previouslyBoundModel
 //                                                 documentation ```java\n@Nullable\nEpoxyModel<?> previouslyBoundModel\n```
     onModelBound(holder, model, position);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
@@ -409,15 +451,19 @@ void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position,
    */
   protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position) {
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
+//                            display_name onModelBound
 //                            documentation ```java\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position)\n```
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound.\n
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                            ^^^^^^ definition local 22
+//                                                   display_name holder
 //                                                   documentation ```java\nEpoxyViewHolder holder\n```
 //                                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^ definition local 23
+//                                                                        display_name model
 //                                                                        documentation ```java\nEpoxyModel<?> model\n```
 //                                                                             ^^^^^^^^ definition local 24
+//                                                                                      display_name position
 //                                                                                      documentation ```java\nint position\n```
 
   }
@@ -430,6 +476,7 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int pos
   protected BoundViewHolders getBoundViewHolders() {
 //          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                           ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
+//                                               display_name getBoundViewHolders
 //                                               documentation ```java\nprotected BoundViewHolders getBoundViewHolders()\n```
 //                                               documentation  Returns an object that manages the view holders currently bound to the RecyclerView. This\n object is mainly used by the base Epoxy adapter to save view states, but you may find it useful\n to help access views or models currently shown in the RecyclerView.\n
 //                                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getBoundViewHolders().
@@ -441,9 +488,11 @@ protected BoundViewHolders getBoundViewHolders() {
   EpoxyModel<?> getModelForPosition(int position) {
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
+//                                  display_name getModelForPosition
 //                                  documentation ```java\nEpoxyModel<?> getModelForPosition(int position)\n```
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
 //                                      ^^^^^^^^ definition local 25
+//                                               display_name position
 //                                               documentation ```java\nint position\n```
     return getCurrentModels().get(position);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
@@ -455,9 +504,11 @@ EpoxyModel<?> getModelForPosition(int position) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewRecycled(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewRecycled().
+//                           display_name onViewRecycled
 //                           documentation ```java\n@Override\npublic void onViewRecycled(EpoxyViewHolder holder)\n```
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                           ^^^^^^ definition local 26
+//                                                  display_name holder
 //                                                  documentation ```java\nEpoxyViewHolder holder\n```
     viewHolderState.save(holder);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
@@ -471,6 +522,7 @@ public void onViewRecycled(EpoxyViewHolder holder) {
     EpoxyModel<?> model = holder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 27
+//                      display_name model
 //                      documentation ```java\nEpoxyModel<?> model\n```
 //                        ^^^^^^ reference local 26
 //                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -489,11 +541,13 @@ public void onViewRecycled(EpoxyViewHolder holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
+//                                       display_name onDetachedFromRecyclerView
 //                                       documentation ```java\n@CallSuper\n@Override\npublic void onDetachedFromRecyclerView(unresolved_type recyclerView)\n```
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView().
 //                                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                             ^^^^^^^^^^^^ definition local 28
+//                                                                          display_name recyclerView
 //                                                                          documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
     // The last model is saved for optimization, but holding onto it can leak anything saved inside
     // the model (like a click listener that references a Fragment). This is only needed during
@@ -509,14 +563,17 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
    */
   protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelUnbound().
+//                              display_name onModelUnbound
 //                              documentation ```java\nprotected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
 //                              documentation  Called immediately after a model is unbound from a view holder. Subclasses can override this if\n they want alerts on when a model is unbound.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound().
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                              ^^^^^^ definition local 29
+//                                                     display_name holder
 //                                                     documentation ```java\nEpoxyViewHolder holder\n```
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                    ^^^^^ definition local 30
+//                                                                          display_name model
 //                                                                          documentation ```java\nEpoxyModel<?> model\n```
 
   }
@@ -527,9 +584,11 @@ protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean onFailedToRecycleView(EpoxyViewHolder holder) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onFailedToRecycleView().
+//                                     display_name onFailedToRecycleView
 //                                     documentation ```java\n@CallSuper\n@Override\npublic boolean onFailedToRecycleView(EpoxyViewHolder holder)\n```
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 31
+//                                                            display_name holder
 //                                                            documentation ```java\nEpoxyViewHolder holder\n```
     //noinspection unchecked,rawtypes
     return ((EpoxyModel) holder.getModel()).onFailedToRecycleView(holder.objectToBind());
@@ -547,10 +606,12 @@ public boolean onFailedToRecycleView(EpoxyViewHolder holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewAttachedToWindow(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
+//                                   display_name onViewAttachedToWindow
 //                                   documentation ```java\n@CallSuper\n@Override\npublic void onViewAttachedToWindow(EpoxyViewHolder holder)\n```
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow().
 //                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                   ^^^^^^ definition local 32
+//                                                          display_name holder
 //                                                          documentation ```java\nEpoxyViewHolder holder\n```
     //noinspection unchecked,rawtypes
     ((EpoxyModel) holder.getModel()).onViewAttachedToWindow(holder.objectToBind());
@@ -568,10 +629,12 @@ public void onViewAttachedToWindow(EpoxyViewHolder holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewDetachedFromWindow(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
+//                                     display_name onViewDetachedFromWindow
 //                                     documentation ```java\n@CallSuper\n@Override\npublic void onViewDetachedFromWindow(EpoxyViewHolder holder)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow().
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 33
+//                                                            display_name holder
 //                                                            documentation ```java\nEpoxyViewHolder holder\n```
     //noinspection unchecked,rawtypes
     ((EpoxyModel) holder.getModel()).onViewDetachedFromWindow(holder.objectToBind());
@@ -585,9 +648,11 @@ public void onViewDetachedFromWindow(EpoxyViewHolder holder) {
 
   public void onSaveInstanceState(Bundle outState) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState().
+//                                display_name onSaveInstanceState
 //                                documentation ```java\npublic void onSaveInstanceState(unresolved_type outState)\n```
 //                                ^^^^^^ reference semanticdb maven . . Bundle#
 //                                       ^^^^^^^^ definition local 34
+//                                                display_name outState
 //                                                documentation ```java\nunresolved_type outState\n```
     // Save the state of currently bound views first so they are included. Views that were
     // scrolled off and unbound will already have had
@@ -595,6 +660,7 @@ public void onSaveInstanceState(Bundle outState) {
     for (EpoxyViewHolder holder : boundViewHolders) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^ definition local 35
+//                              display_name holder
 //                              documentation ```java\nEpoxyViewHolder holder\n```
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders.
       viewHolderState.save(holder);
@@ -620,10 +686,12 @@ public void onSaveInstanceState(Bundle outState) {
 
   public void onRestoreInstanceState(@Nullable Bundle inState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onRestoreInstanceState().
+//                                   display_name onRestoreInstanceState
 //                                   documentation ```java\npublic void onRestoreInstanceState(unresolved_type inState)\n```
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                    ^^^^^^^ definition local 36
+//                                                            display_name inState
 //                                                            documentation ```java\n@Nullable\nunresolved_type inState\n```
     // To simplify things we enforce that state is restored before views are bound, otherwise it
     // is more difficult to update view state once they are bound
@@ -661,20 +729,24 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
    */
   protected int getModelPosition(EpoxyModel<?> model) {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
+//                               display_name getModelPosition
 //                               documentation ```java\nprotected int getModelPosition(EpoxyModel<?> model)\n```
 //                               documentation  Finds the position of the given model in the list. Doesn't use indexOf to avoid unnecessary\n equals() calls since we're looking for the same object instance.\n\n @return The position of the given model in the current models list, or -1 if the model can't be\n found.\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition().
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^ definition local 37
+//                                                   display_name model
 //                                                   documentation ```java\nEpoxyModel<?> model\n```
     int size = getCurrentModels().size();
 //      ^^^^ definition local 38
+//           display_name size
 //           documentation ```java\nint size\n```
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 39
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 39
 //                      ^^^^ reference local 38
@@ -701,6 +773,7 @@ protected int getModelPosition(EpoxyModel<?> model) {
   public SpanSizeLookup getSpanSizeLookup() {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getSpanSizeLookup().
+//                                        display_name getSpanSizeLookup
 //                                        documentation ```java\npublic unresolved_type getSpanSizeLookup()\n```
 //                                        documentation  For use with a grid layout manager - use this to get the {@link SpanSizeLookup} for models in\n this adapter. This will delegate span look up calls to each model's {@link\n EpoxyModel#getSpanSize(int, int, int)}. Make sure to also call {@link #setSpanCount(int)} so\n the span count is correct.\n
     return spanSizeLookup;
@@ -716,9 +789,11 @@ public SpanSizeLookup getSpanSizeLookup() {
    */
   public void setSpanCount(int spanCount) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount().
+//                         display_name setSpanCount
 //                         documentation ```java\npublic void setSpanCount(int spanCount)\n```
 //                         documentation  If you are using a grid layout manager you must call this to set the span count of the grid.\n This span count will be passed on to the models so models can choose what span count to be.\n\n @see #getSpanSizeLookup()\n @see EpoxyModel#getSpanSize(int, int, int)\n
 //                             ^^^^^^^^^ definition local 40
+//                                       display_name spanCount
 //                                       documentation ```java\nint spanCount\n```
     this.spanCount = spanCount;
 //       ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
@@ -727,6 +802,7 @@ public void setSpanCount(int spanCount) {
 
   public int getSpanCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getSpanCount().
+//                        display_name getSpanCount
 //                        documentation ```java\npublic int getSpanCount()\n```
     return spanCount;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
@@ -734,6 +810,7 @@ public int getSpanCount() {
 
   public boolean isMultiSpan() {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isMultiSpan().
+//                           display_name isMultiSpan
 //                           documentation ```java\npublic boolean isMultiSpan()\n```
     return spanCount > 1;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
@@ -752,12 +829,14 @@ public boolean isMultiSpan() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView().
+//                                  display_name setupStickyHeaderView
 //                                  documentation ```java\n@Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)\n```
 //                                  documentation  Optional callback to setup the sticky view,\n by default it doesn't do anything.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView().
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^^ definition local 41
+//                                                             display_name stickyHeader
 //                                                             documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
     // no-op
   }
@@ -773,12 +852,14 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView().
+//                                     display_name teardownStickyHeaderView
 //                                     documentation ```java\n@Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)\n```
 //                                     documentation  Optional callback to perform tear down operation on the\n sticky view, by default it doesn't do anything.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView().
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^^^^^ definition local 42
+//                                                                display_name stickyHeader
 //                                                                documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
     // no-op
   }
@@ -794,10 +875,12 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader().
+//                              display_name isStickyHeader
 //                              documentation ```java\n@Override\npublic boolean isStickyHeader(int position)\n```
 //                              documentation  Called to check if the item at the position is a sticky item,\n by default returns false.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader().
 //                                  ^^^^^^^^ definition local 43
+//                                           display_name position
 //                                           documentation ```java\nint position\n```
     return false;
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
index 9d77d1b6b..a93cc4738 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
@@ -7,8 +7,10 @@
 
 interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
+//                               display_name BaseEpoxyTouchCallback
 //                               documentation ```java\ninterface BaseEpoxyTouchCallback<T extends EpoxyModel>\n```
 //                               ^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#[T]
+//                                 display_name T
 //                                 documentation ```java\nT extends EpoxyModel\n```
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
@@ -24,14 +26,17 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
    */
   int getMovementFlagsForModel(T model, int adapterPosition);
 //    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
+//                             display_name getMovementFlagsForModel
 //                             documentation ```java\npublic abstract int getMovementFlagsForModel(T model, int adapterPosition)\n```
 //                             documentation  Should return a composite flag which defines the enabled move directions in each state\n (idle, swiping, dragging) for the given model.\n <p>\n Return 0 to disable movement for the model.\n\n @param model           The model being targeted for movement.\n @param adapterPosition The current adapter position of the targeted model\n @see androidx.recyclerview.widget.ItemTouchHelper.Callback#getMovementFlags\n
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel().
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#[T]
 //                               ^^^^^ definition local 0
+//                                     display_name model
 //                                     documentation ```java\nT model\n```
 //                                          ^^^^^^^^^^^^^^^ definition local 1
+//                                                          display_name adapterPosition
 //                                                          documentation ```java\nint adapterPosition\n```
 
   /**
@@ -46,6 +51,7 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
    */
   void clearView(T model, View itemView);
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
+//               display_name clearView
 //               documentation ```java\npublic abstract void clearView(T model, unresolved_type itemView)\n```
 //               documentation  Called when the user interaction with a view is over and the view has\n completed its animation. This is a good place to clear all changes on the view that were done\n in other previous touch callbacks (such as on touch start, change, release, etc).\n <p>\n This is the last callback in the lifecycle of a touch event.\n\n @param model    The model whose view is being cleared.\n @param itemView The view being cleared.\n
 //               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
@@ -54,8 +60,10 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView().
 //               ^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#[T]
 //                 ^^^^^ definition local 2
+//                       display_name model
 //                       documentation ```java\nT model\n```
 //                        ^^^^ reference semanticdb maven . . View#
 //                             ^^^^^^^^ definition local 3
+//                                      display_name itemView
 //                                      documentation ```java\nunresolved_type itemView\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
index a99517879..51f956697 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
@@ -24,10 +24,12 @@
 //^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
+//                            display_name BoundViewHolders
 //                            documentation ```java\n@SuppressWarnings("WeakerAccess")\npublic class BoundViewHolders\n```
 //                            documentation Helper class for keeping track of {@link EpoxyViewHolder}s that are currently bound. 
 //                            relationship is_implementation semanticdb maven jdk 11 java/lang/Iterable#
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#`<init>`().
+//                            display_name <init>
 //                            documentation ```java\npublic BoundViewHolders()\n```
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -35,6 +37,7 @@ public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
+//                                                       display_name holders
 //                                                       documentation ```java\nprivate final LongSparseArray<EpoxyViewHolder> holders\n```
 //                                                             ^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#`<init>`().
 
@@ -43,9 +46,11 @@ public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
   public EpoxyViewHolder get(EpoxyViewHolder holder) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#get().
+//                           display_name get
 //                           documentation ```java\n@Nullable\npublic EpoxyViewHolder get(EpoxyViewHolder holder)\n```
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                           ^^^^^^ definition local 0
+//                                                  display_name holder
 //                                                  documentation ```java\nEpoxyViewHolder holder\n```
     return holders.get(holder.getItemId());
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
@@ -56,9 +61,11 @@ public EpoxyViewHolder get(EpoxyViewHolder holder) {
 
   public void put(EpoxyViewHolder holder) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#put().
+//                display_name put
 //                documentation ```java\npublic void put(EpoxyViewHolder holder)\n```
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                ^^^^^^ definition local 1
+//                                       display_name holder
 //                                       documentation ```java\nEpoxyViewHolder holder\n```
     holders.put(holder.getItemId(), holder);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
@@ -70,9 +77,11 @@ public void put(EpoxyViewHolder holder) {
 
   public void remove(EpoxyViewHolder holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#remove().
+//                   display_name remove
 //                   documentation ```java\npublic void remove(EpoxyViewHolder holder)\n```
 //                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                   ^^^^^^ definition local 2
+//                                          display_name holder
 //                                          documentation ```java\nEpoxyViewHolder holder\n```
     holders.remove(holder.getItemId());
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
@@ -83,6 +92,7 @@ public void remove(EpoxyViewHolder holder) {
 
   public int size() {
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#size().
+//                display_name size
 //                documentation ```java\npublic int size()\n```
     return holders.size();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
@@ -95,6 +105,7 @@ public Iterator<EpoxyViewHolder> iterator() {
 //       ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#iterator().
+//                                          display_name iterator
 //                                          documentation ```java\n@Override\npublic Iterator<EpoxyViewHolder> iterator()\n```
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
     return new HolderIterator();
@@ -106,9 +117,11 @@ public Iterator<EpoxyViewHolder> iterator() {
   public EpoxyViewHolder getHolderForModel(EpoxyModel<?> model) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#getHolderForModel().
+//                                         display_name getHolderForModel
 //                                         documentation ```java\n@Nullable\npublic EpoxyViewHolder getHolderForModel(EpoxyModel<?> model)\n```
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                       ^^^^^ definition local 3
+//                                                             display_name model
 //                                                             documentation ```java\nEpoxyModel<?> model\n```
     return holders.get(model.id());
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
@@ -119,20 +132,24 @@ public EpoxyViewHolder getHolderForModel(EpoxyModel<?> model) {
 
   private class HolderIterator implements Iterator<EpoxyViewHolder> {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#
+//                             display_name HolderIterator
 //                             documentation ```java\nprivate class HolderIterator\n```
 //                             relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#`<init>`().
+//                             display_name <init>
 //                             documentation ```java\nprivate HolderIterator()\n```
 //                                        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
     private int position = 0;
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#position.
+//                       display_name position
 //                       documentation ```java\nprivate int position\n```
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public boolean hasNext() {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext().
+//                         display_name hasNext
 //                         documentation ```java\n@Override\npublic boolean hasNext()\n```
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
       return position < holders.size();
@@ -146,6 +163,7 @@ public boolean hasNext() {
     public EpoxyViewHolder next() {
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                         ^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#next().
+//                              display_name next
 //                              documentation ```java\n@Override\npublic EpoxyViewHolder next()\n```
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
       if (!hasNext()) {
@@ -163,6 +181,7 @@ public EpoxyViewHolder next() {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void remove() {
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#remove().
+//                     display_name remove
 //                     documentation ```java\n@Override\npublic void remove()\n```
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
       throw new UnsupportedOperationException();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
index ccb277688..de9070e18 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
@@ -111,17 +111,20 @@
 //                                                 ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/ModelView#Size#MATCH_WIDTH_WRAP_HEIGHT.
 public class Carousel extends EpoxyRecyclerView {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#
+//                    display_name Carousel
 //                    documentation ```java\n@ModelView(saveViewState = true, autoLayout = Size.MATCH_WIDTH_WRAP_HEIGHT)\npublic class Carousel\n```
 //                    documentation  <i>This feature is in Beta - please report bugs, feature requests, or other feedback at\n https://github.com/airbnb/epoxy by creating a new issue. Thanks!</i>\n\n <p>This is intended as a plug and play "Carousel" view - a Recyclerview with horizontal\n scrolling. It comes with common defaults and performance optimizations and can be either used as\n a top level RecyclerView, or nested within a vertical recyclerview.\n\n <p>This class provides:\n\n <p>1. Automatic integration with Epoxy. A {@link CarouselModel_} is generated from this class,\n which you can use in your EpoxyController. Just call {@link #setModels(List)} to provide the list\n of models to show in the carousel.\n\n <p>2. Default padding for carousel peeking, and an easy way to change this padding - {@link\n #setPaddingDp(int)}\n\n <p>3. Easily control how many items are shown on screen in the carousel at a time - {@link\n #setNumViewsToShowOnScreen(float)}\n\n <p>4. Easy snap support. By default a {@link LinearSnapHelper} is used, but you can set a global\n default for all Carousels with {@link #setDefaultGlobalSnapHelperFactory(SnapHelperFactory)}\n\n <p>5. All of the benefits of {@link EpoxyRecyclerView}\n\n <p>If you need further flexibility you can subclass this view to change its width, height,\n scrolling direction, etc. You can annotate a subclass with {@link ModelView} to generate a new\n EpoxyModel.\n
 //                    relationship is_implementation semanticdb maven . . EpoxyRecyclerView#
 //                            ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . EpoxyRecyclerView#
   public static final int NO_VALUE_SET = -1;
 //                        ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#NO_VALUE_SET.
+//                                     display_name NO_VALUE_SET
 //                                     documentation ```java\npublic static final int NO_VALUE_SET\n```
 
   private static SnapHelperFactory defaultGlobalSnapHelperFactory =
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory.
+//                                                                display_name defaultGlobalSnapHelperFactory
 //                                                                documentation ```java\nprivate static SnapHelperFactory defaultGlobalSnapHelperFactory\n```
       new SnapHelperFactory() {
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
@@ -133,10 +136,12 @@ public class Carousel extends EpoxyRecyclerView {
         public SnapHelper buildSnapHelper(Context context) {
 //             ^^^^^^^^^^ reference semanticdb maven . . SnapHelper#
 //                        ^^^^^^^^^^^^^^^ definition local 1
+//                                        display_name buildSnapHelper
 //                                        documentation ```java\n@Override\n@NonNull\npublic unresolved_type buildSnapHelper(unresolved_type context)\n```
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
 //                                        ^^^^^^^ reference semanticdb maven . . Context#
 //                                                ^^^^^^^ definition local 2
+//                                                        display_name context
 //                                                        documentation ```java\nunresolved_type context\n```
           return new LinearSnapHelper();
         }
@@ -149,17 +154,21 @@ public SnapHelper buildSnapHelper(Context context) {
 //                            ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
   private static int defaultSpacingBetweenItemsDp = 8;
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp.
+//                                                display_name defaultSpacingBetweenItemsDp
 //                                                documentation ```java\n@Dimension(unit = Dimension.DP)\nprivate static int defaultSpacingBetweenItemsDp\n```
 
   private float numViewsToShowOnScreen;
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
+//                                     display_name numViewsToShowOnScreen
 //                                     documentation ```java\nprivate float numViewsToShowOnScreen\n```
 
   public Carousel(Context context) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`().
+//                display_name <init>
 //                documentation ```java\npublic Carousel(unresolved_type context)\n```
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 3
+//                                display_name context
 //                                documentation ```java\nunresolved_type context\n```
     super(context);
 //        ^^^^^^^ reference local 3
@@ -167,13 +176,16 @@ public Carousel(Context context) {
 
   public Carousel(Context context, @Nullable AttributeSet attrs) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+1).
+//                display_name <init>
 //                documentation ```java\npublic Carousel(unresolved_type context, unresolved_type attrs)\n```
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 4
+//                                display_name context
 //                                documentation ```java\nunresolved_type context\n```
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . AttributeSet#
 //                                                        ^^^^^ definition local 5
+//                                                              display_name attrs
 //                                                              documentation ```java\n@Nullable\nunresolved_type attrs\n```
     super(context, attrs);
 //        ^^^^^^^ reference local 4
@@ -182,15 +194,19 @@ public Carousel(Context context, @Nullable AttributeSet attrs) {
 
   public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+2).
+//                display_name <init>
 //                documentation ```java\npublic Carousel(unresolved_type context, unresolved_type attrs, int defStyle)\n```
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 6
+//                                display_name context
 //                                documentation ```java\nunresolved_type context\n```
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . AttributeSet#
 //                                                        ^^^^^ definition local 7
+//                                                              display_name attrs
 //                                                              documentation ```java\n@Nullable\nunresolved_type attrs\n```
 //                                                                   ^^^^^^^^ definition local 8
+//                                                                            display_name defStyle
 //                                                                            documentation ```java\nint defStyle\n```
     super(context, attrs, defStyle);
 //        ^^^^^^^ reference local 6
@@ -202,6 +218,7 @@ public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void init() {
 //               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#init().
+//                    display_name init
 //                    documentation ```java\n@Override\nprotected void init()\n```
     super.init();
 //  ^^^^^ reference semanticdb maven . . super#
@@ -209,6 +226,7 @@ protected void init() {
     // When used as a model the padding can't be set via xml so we set it programmatically
     int defaultSpacingDp = getDefaultSpacingBetweenItemsDp();
 //      ^^^^^^^^^^^^^^^^ definition local 9
+//                       display_name defaultSpacingDp
 //                       documentation ```java\nint defaultSpacingDp\n```
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp().
 
@@ -236,6 +254,7 @@ && getPaddingBottom() == 0) {
     SnapHelperFactory snapHelperFactory = getSnapHelperFactory();
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                    ^^^^^^^^^^^^^^^^^ definition local 10
+//                                      display_name snapHelperFactory
 //                                      documentation ```java\nSnapHelperFactory snapHelperFactory\n```
 //                                        ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSnapHelperFactory().
     if (snapHelperFactory != null) {
@@ -262,6 +281,7 @@ && getPaddingBottom() == 0) {
   protected SnapHelperFactory getSnapHelperFactory() {
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getSnapHelperFactory().
+//                                                 display_name getSnapHelperFactory
 //                                                 documentation ```java\n@Nullable\nprotected SnapHelperFactory getSnapHelperFactory()\n```
 //                                                 documentation  Return a {@link SnapHelperFactory} instance to use with this Carousel. The {@link SnapHelper}\n created by the factory will be attached to this Carousel on view creation. Return null for no\n snap helper to be attached automatically.\n
     return defaultGlobalSnapHelperFactory;
@@ -278,11 +298,13 @@ protected SnapHelperFactory getSnapHelperFactory() {
    */
   public static void setDefaultGlobalSnapHelperFactory(@Nullable SnapHelperFactory factory) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setDefaultGlobalSnapHelperFactory().
+//                                                     display_name setDefaultGlobalSnapHelperFactory
 //                                                     documentation ```java\npublic static void setDefaultGlobalSnapHelperFactory(SnapHelperFactory factory)\n```
 //                                                     documentation  Set a {@link SnapHelperFactory} instance to use with all Carousels by default. The {@link\n SnapHelper} created by the factory will be attached to each Carousel on view creation. Set null\n for no snap helper to be attached automatically.\n\n <p>A Carousel subclass can implement {@link #getSnapHelperFactory()} to override the global\n default.\n
 //                                                      ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                                                                                 ^^^^^^^ definition local 11
+//                                                                                         display_name factory
 //                                                                                         documentation ```java\n@Nullable\nSnapHelperFactory factory\n```
     defaultGlobalSnapHelperFactory = factory;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory.
@@ -295,8 +317,10 @@ public static void setDefaultGlobalSnapHelperFactory(@Nullable SnapHelperFactory
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void setHasFixedSize(boolean hasFixedSize) {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setHasFixedSize().
+//                            display_name setHasFixedSize
 //                            documentation ```java\n@ModelProp\n@Override\npublic void setHasFixedSize(boolean hasFixedSize)\n```
 //                                    ^^^^^^^^^^^^ definition local 12
+//                                                 display_name hasFixedSize
 //                                                 documentation ```java\nboolean hasFixedSize\n```
     super.setHasFixedSize(hasFixedSize);
 //  ^^^^^ reference semanticdb maven . . super#
@@ -327,9 +351,11 @@ public void setHasFixedSize(boolean hasFixedSize) {
 //           ^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/ModelProp#group().
   public void setNumViewsToShowOnScreen(float viewCount) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setNumViewsToShowOnScreen().
+//                                      display_name setNumViewsToShowOnScreen
 //                                      documentation ```java\n@ModelProp(group = "prefetch")\npublic void setNumViewsToShowOnScreen(float viewCount)\n```
 //                                      documentation  Set the number of views to show on screen in this carousel at a time, partial numbers are\n allowed.\n\n <p>This is useful where you want to easily control for the number of items on screen,\n regardless of screen size. For example, you could set this to 1.2f so that one view is shown in\n full and 20% of the next view "peeks" from the edge to indicate that there is more content to\n scroll to.\n\n <p>Another pattern is setting a different view count depending on whether the device is phone\n or tablet.\n\n <p>Additionally, if a LinearLayoutManager is used this value will be forwarded to {@link\n LinearLayoutManager#setInitialPrefetchItemCount(int)} as a performance optimization.\n\n <p>If you want to only change the prefetch count without changing the view size you can simply\n use {@link #setInitialPrefetchItemCount(int)}\n
 //                                            ^^^^^^^^^ definition local 13
+//                                                      display_name viewCount
 //                                                      documentation ```java\nfloat viewCount\n```
     numViewsToShowOnScreen = viewCount;
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
@@ -346,6 +372,7 @@ public void setNumViewsToShowOnScreen(float viewCount) {
    */
   public float getNumViewsToShowOnScreen() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getNumViewsToShowOnScreen().
+//                                       display_name getNumViewsToShowOnScreen
 //                                       documentation ```java\npublic float getNumViewsToShowOnScreen()\n```
 //                                       documentation  @return The number of views to show on screen in this carousel at a time.\n
       return numViewsToShowOnScreen;
@@ -364,9 +391,11 @@ public float getNumViewsToShowOnScreen() {
 //           ^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/ModelProp#group().
   public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount().
+//                                        display_name setInitialPrefetchItemCount
 //                                        documentation ```java\n@ModelProp(group = "prefetch")\npublic void setInitialPrefetchItemCount(int numItemsToPrefetch)\n```
 //                                        documentation  If you are using a Linear or Grid layout manager you can use this to set the item prefetch\n count. Only use this if you are not using {@link #setNumViewsToShowOnScreen(float)}\n\n @see #setNumViewsToShowOnScreen(float)\n @see LinearLayoutManager#setInitialPrefetchItemCount(int)\n
 //                                            ^^^^^^^^^^^^^^^^^^ definition local 14
+//                                                               display_name numItemsToPrefetch
 //                                                               documentation ```java\nint numItemsToPrefetch\n```
     if (numItemsToPrefetch < 0) {
 //      ^^^^^^^^^^^^^^^^^^ reference local 14
@@ -377,6 +406,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
     // Use the linearlayoutmanager default of 2 if the user did not specify one
     int prefetchCount = numItemsToPrefetch == 0 ? 2 : numItemsToPrefetch;
 //      ^^^^^^^^^^^^^ definition local 15
+//                    display_name prefetchCount
 //                    documentation ```java\nint prefetchCount\n```
 //                      ^^^^^^^^^^^^^^^^^^ reference local 14
 //                                                    ^^^^^^^^^^^^^^^^^^ reference local 14
@@ -384,6 +414,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
     LayoutManager layoutManager = getLayoutManager();
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#
 //                ^^^^^^^^^^^^^ definition local 16
+//                              display_name layoutManager
 //                              documentation ```java\nunresolved_type layoutManager\n```
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#
     if (layoutManager instanceof LinearLayoutManager) {
@@ -401,9 +432,11 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onChildAttachedToWindow(View child) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
+//                                    display_name onChildAttachedToWindow
 //                                    documentation ```java\n@Override\npublic void onChildAttachedToWindow(unresolved_type child)\n```
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^ definition local 17
+//                                               display_name child
 //                                               documentation ```java\nunresolved_type child\n```
     if (numViewsToShowOnScreen > 0) {
 //      ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
@@ -411,6 +444,7 @@ public void onChildAttachedToWindow(View child) {
 //    ^^^^^^^^^ reference semanticdb maven . . ViewGroup/
 //              ^^^^^^^^^^^^ reference semanticdb maven . . ViewGroup/LayoutParams#
 //                           ^^^^^^^^^^^^^^^^^ definition local 18
+//                                             display_name childLayoutParams
 //                                             documentation ```java\nunresolved_type childLayoutParams\n```
 //                                               ^^^^^ reference local 17
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . View#getLayoutParams#
@@ -425,11 +459,13 @@ public void onChildAttachedToWindow(View child) {
 
       int itemSpacingPx = getSpacingDecorator().getPxBetweenItems();
 //        ^^^^^^^^^^^^^ definition local 19
+//                      display_name itemSpacingPx
 //                      documentation ```java\nint itemSpacingPx\n```
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpacingDecorator#
 //                                              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpacingDecorator#getPxBetweenItems#
       int spaceBetweenItems = 0;
 //        ^^^^^^^^^^^^^^^^^ definition local 20
+//                          display_name spaceBetweenItems
 //                          documentation ```java\nint spaceBetweenItems\n```
       if (itemSpacingPx > 0) {
 //        ^^^^^^^^^^^^^ reference local 19
@@ -442,11 +478,13 @@ public void onChildAttachedToWindow(View child) {
 
       boolean isScrollingHorizontally = getLayoutManager().canScrollHorizontally();
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition local 21
+//                                    display_name isScrollingHorizontally
 //                                    documentation ```java\nboolean isScrollingHorizontally\n```
 //                                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#
 //                                                         ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#canScrollHorizontally#
       int itemSizeInScrollingDirection =
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 22
+//                                     display_name itemSizeInScrollingDirection
 //                                     documentation ```java\nint itemSizeInScrollingDirection\n```
           (int)
               ((getSpaceForChildren(isScrollingHorizontally) - spaceBetweenItems)
@@ -475,8 +513,10 @@ public void onChildAttachedToWindow(View child) {
 
   private int getSpaceForChildren(boolean horizontal) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getSpaceForChildren().
+//                                display_name getSpaceForChildren
 //                                documentation ```java\nprivate int getSpaceForChildren(boolean horizontal)\n```
 //                                        ^^^^^^^^^^ definition local 23
+//                                                   display_name horizontal
 //                                                   documentation ```java\nboolean horizontal\n```
     if (horizontal) {
 //      ^^^^^^^^^^ reference local 23
@@ -505,9 +545,11 @@ private int getSpaceForChildren(boolean horizontal) {
 // ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
   private static int getTotalWidthPx(View view) {
 //                   ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalWidthPx().
+//                                   display_name getTotalWidthPx
 //                                   documentation ```java\n@Px\nprivate static int getTotalWidthPx(unresolved_type view)\n```
 //                                   ^^^^ reference semanticdb maven . . View#
 //                                        ^^^^ definition local 24
+//                                             display_name view
 //                                             documentation ```java\nunresolved_type view\n```
     if (view.getWidth() > 0) {
 //      ^^^^ reference local 24
@@ -530,6 +572,7 @@ private static int getTotalWidthPx(View view) {
     DisplayMetrics metrics = view.getContext().getResources().getDisplayMetrics();
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . DisplayMetrics#
 //                 ^^^^^^^ definition local 25
+//                         display_name metrics
 //                         documentation ```java\nunresolved_type metrics\n```
 //                           ^^^^ reference local 24
 //                                ^^^^^^^^^^ reference semanticdb maven . . View#getContext#
@@ -544,9 +587,11 @@ private static int getTotalWidthPx(View view) {
 // ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
   private static int getTotalHeightPx(View view) {
 //                   ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalHeightPx().
+//                                    display_name getTotalHeightPx
 //                                    documentation ```java\n@Px\nprivate static int getTotalHeightPx(unresolved_type view)\n```
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^ definition local 26
+//                                              display_name view
 //                                              documentation ```java\nunresolved_type view\n```
     if (view.getHeight() > 0) {
 //      ^^^^ reference local 26
@@ -568,6 +613,7 @@ private static int getTotalHeightPx(View view) {
     DisplayMetrics metrics = view.getContext().getResources().getDisplayMetrics();
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . DisplayMetrics#
 //                 ^^^^^^^ definition local 27
+//                         display_name metrics
 //                         documentation ```java\nunresolved_type metrics\n```
 //                           ^^^^ reference local 26
 //                                ^^^^^^^^^^ reference semanticdb maven . . View#getContext#
@@ -582,14 +628,17 @@ private static int getTotalHeightPx(View view) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onChildDetachedFromWindow(View child) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#onChildDetachedFromWindow().
+//                                      display_name onChildDetachedFromWindow
 //                                      documentation ```java\n@Override\npublic void onChildDetachedFromWindow(unresolved_type child)\n```
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^ definition local 28
+//                                                 display_name child
 //                                                 documentation ```java\nunresolved_type child\n```
     // Restore the view width that existed before we modified it
     Object initialWidth = child.getTag(R.id.epoxy_recycler_view_child_initial_size_id);
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //         ^^^^^^^^^^^^ definition local 29
+//                      display_name initialWidth
 //                      documentation ```java\nObject initialWidth\n```
 //                        ^^^^^ reference local 28
 //                              ^^^^^^ reference semanticdb maven . . View#getTag#
@@ -604,6 +653,7 @@ public void onChildDetachedFromWindow(View child) {
 //    ^^^^^^^^^ reference semanticdb maven . . ViewGroup/
 //              ^^^^^^^^^^^^ reference semanticdb maven . . ViewGroup/LayoutParams#
 //                           ^^^^^^ definition local 30
+//                                  display_name params
 //                                  documentation ```java\nunresolved_type params\n```
 //                                    ^^^^^ reference local 28
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . View#getLayoutParams#
@@ -627,6 +677,7 @@ public void onChildDetachedFromWindow(View child) {
    */
   public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int dp) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setDefaultItemSpacingDp().
+//                                           display_name setDefaultItemSpacingDp
 //                                           documentation ```java\npublic static void setDefaultItemSpacingDp(int dp)\n```
 //                                           documentation  Set a global default to use as the item spacing for all Carousels. Set to 0 for no item\n spacing.\n
 //                                            ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -634,6 +685,7 @@ public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int d
 //                                                             ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                                                       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                                                               ^^ definition local 31
+//                                                                                  display_name dp
 //                                                                                  documentation ```java\n@Dimension(unit = Dimension.DP)\nint dp\n```
     defaultSpacingBetweenItemsDp = dp;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp.
@@ -653,6 +705,7 @@ public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int d
 //                            ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
   protected int getDefaultSpacingBetweenItemsDp() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp().
+//                                              display_name getDefaultSpacingBetweenItemsDp
 //                                              documentation ```java\n@Dimension(unit = Dimension.DP)\nprotected int getDefaultSpacingBetweenItemsDp()\n```
 //                                              documentation  Return the item spacing to use in this carousel, or 0 for no spacing.\n\n <p>By default this uses the global default set in {@link #setDefaultItemSpacingDp(int)}, but\n subclasses can override this to specify their own value.\n
     return defaultSpacingBetweenItemsDp;
@@ -668,13 +721,16 @@ protected int getDefaultSpacingBetweenItemsDp() {
 //           ^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/ModelProp#group().
   public void setPaddingRes(@DimenRes int paddingRes) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingRes().
+//                          display_name setPaddingRes
 //                          documentation ```java\n@ModelProp(group = "padding")\npublic void setPaddingRes(int paddingRes)\n```
 //                          documentation  Set a dimension resource to specify the padding value to use on each side of the carousel and\n in between carousel items.\n
 //                           ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                        ^^^^^^^^^^ definition local 32
+//                                                   display_name paddingRes
 //                                                   documentation ```java\n@DimenRes\nint paddingRes\n```
     int px = resToPx(paddingRes);
 //      ^^ definition local 33
+//         display_name px
 //         documentation ```java\nint px\n```
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#resToPx#
 //                   ^^^^^^^^^^ reference local 32
@@ -701,6 +757,7 @@ public void setPaddingRes(@DimenRes int paddingRes) {
 //                                          ^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/ModelProp#group().
   public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingDp().
+//                         display_name setPaddingDp
 //                         documentation ```java\n@ModelProp(defaultValue = "NO_VALUE_SET", group = "padding")\npublic void setPaddingDp(int paddingDp)\n```
 //                         documentation  Set a DP value to use as the padding on each side of the carousel and in between carousel\n items.\n\n <p>The default as the value returned by {@link #getDefaultSpacingBetweenItemsDp()}\n
 //                          ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -708,9 +765,11 @@ public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
 //                                           ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                                     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                                             ^^^^^^^^^ definition local 34
+//                                                                       display_name paddingDp
 //                                                                       documentation ```java\n@Dimension(unit = Dimension.DP)\nint paddingDp\n```
     int px = dpToPx(paddingDp != NO_VALUE_SET ? paddingDp : getDefaultSpacingBetweenItemsDp());
 //      ^^ definition local 35
+//         display_name px
 //         documentation ```java\nint px\n```
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#dpToPx#
 //                  ^^^^^^^^^ reference local 34
@@ -739,11 +798,13 @@ public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
 //           ^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/ModelProp#group().
   public void setPadding(@Nullable Padding padding) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPadding().
+//                       display_name setPadding
 //                       documentation ```java\n@ModelProp(group = "padding")\npublic void setPadding(Padding padding)\n```
 //                       documentation  Use the {@link Padding} class to specify individual padding values for each side of the\n carousel, as well as item spacing.\n\n <p>A value of null will set all padding and item spacing to 0.\n
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                 ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                                         ^^^^^^^ definition local 36
+//                                                 display_name padding
 //                                                 documentation ```java\n@Nullable\nPadding padding\n```
     if (padding == null) {
 //      ^^^^^^^ reference local 36
@@ -834,46 +895,58 @@ public void setPadding(@Nullable Padding padding) {
    */
   public static class Padding {
 //                    ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
+//                            display_name Padding
 //                            documentation ```java\npublic static class Padding\n```
 //                            documentation  Used to specify individual padding values programmatically.\n\n @see #setPadding(Padding)\n
     public final int left;
 //                   ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
+//                        display_name left
 //                        documentation ```java\npublic final int left\n```
     public final int top;
 //                   ^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#top.
+//                       display_name top
 //                       documentation ```java\npublic final int top\n```
     public final int right;
 //                   ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#right.
+//                         display_name right
 //                         documentation ```java\npublic final int right\n```
     public final int bottom;
 //                   ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#bottom.
+//                          display_name bottom
 //                          documentation ```java\npublic final int bottom\n```
     public final int itemSpacing;
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#itemSpacing.
+//                               display_name itemSpacing
 //                               documentation ```java\npublic final int itemSpacing\n```
     public final PaddingType paddingType;
 //               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#paddingType.
+//                                       display_name paddingType
 //                                       documentation ```java\npublic final PaddingType paddingType\n```
 
     enum PaddingType {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
+//                   display_name PaddingType
 //                   documentation ```java\nenum PaddingType\n```
 //                   relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                   relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //                   relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
+//                   display_name <init>
 //                   documentation ```java\nprivate PaddingType()\n```
       PX,
 //    ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#PX.
+//       display_name PX
 //       documentation ```java\nPaddingType.PX /* ordinal 0 */\n```
 //    ^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
       DP,
 //    ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#DP.
+//       display_name DP
 //       documentation ```java\nPaddingType.DP /* ordinal 1 */\n```
 //    ^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
       RESOURCE
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#RESOURCE.
+//             display_name RESOURCE
 //             documentation ```java\nPaddingType.RESOURCE /* ordinal 2 */\n```
 //    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
     }
@@ -886,13 +959,16 @@ enum PaddingType {
     public static Padding resource(@DimenRes int paddingRes, @DimenRes int itemSpacingRes) {
 //                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource().
+//                                 display_name resource
 //                                 documentation ```java\npublic static Padding resource(int paddingRes, int itemSpacingRes)\n```
 //                                 documentation  @param paddingRes Padding as dimension resource.\n @param itemSpacingRes Space as dimension resource to add between each carousel item. Will be\n     implemented via an item decoration.\n
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                               ^^^^^^^^^^ definition local 37
+//                                                          display_name paddingRes
 //                                                          documentation ```java\n@DimenRes\nint paddingRes\n```
 //                                                            ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                                                         ^^^^^^^^^^^^^^ definition local 38
+//                                                                                        display_name itemSpacingRes
 //                                                                                        documentation ```java\n@DimenRes\nint itemSpacingRes\n```
       return new Padding(
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
@@ -917,27 +993,33 @@ public static Padding resource(@DimenRes int paddingRes, @DimenRes int itemSpaci
     public static Padding resource(
 //                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource(+1).
+//                                 display_name resource
 //                                 documentation ```java\npublic static Padding resource(int leftRes, int topRes, int rightRes, int bottomRes, int itemSpacingRes)\n```
 //                                 documentation  @param leftRes Left padding as dimension resource.\n @param topRes Top padding as dimension resource.\n @param rightRes Right padding as dimension resource.\n @param bottomRes Bottom padding as dimension resource.\n @param itemSpacingRes Space as dimension resource to add between each carousel item. Will be\n     implemented via an item decoration.\n
         @DimenRes int leftRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^ definition local 39
+//                            display_name leftRes
 //                            documentation ```java\n@DimenRes\nint leftRes\n```
         @DimenRes int topRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^ definition local 40
+//                           display_name topRes
 //                           documentation ```java\n@DimenRes\nint topRes\n```
         @DimenRes int rightRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^ definition local 41
+//                             display_name rightRes
 //                             documentation ```java\n@DimenRes\nint rightRes\n```
         @DimenRes int bottomRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^^ definition local 42
+//                              display_name bottomRes
 //                              documentation ```java\n@DimenRes\nint bottomRes\n```
         @DimenRes int itemSpacingRes) {
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^^^^^^^ definition local 43
+//                                   display_name itemSpacingRes
 //                                   documentation ```java\n@DimenRes\nint itemSpacingRes\n```
       return new Padding(
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
@@ -959,6 +1041,7 @@ public static Padding resource(
     public static Padding dp(
 //                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                        ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp().
+//                           display_name dp
 //                           documentation ```java\npublic static Padding dp(int paddingDp, int itemSpacingDp)\n```
 //                           documentation  @param paddingDp Padding in dp.\n @param itemSpacingDp Space in dp to add between each carousel item. Will be implemented via\n     an item decoration.\n
         @Dimension(unit = Dimension.DP) int paddingDp,
@@ -967,6 +1050,7 @@ public static Padding dp(
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^^^ definition local 44
+//                                                    display_name paddingDp
 //                                                    documentation ```java\n@Dimension(unit = Dimension.DP)\nint paddingDp\n```
         @Dimension(unit = Dimension.DP) int itemSpacingDp) {
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -974,6 +1058,7 @@ public static Padding dp(
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^^^^^^^ definition local 45
+//                                                        display_name itemSpacingDp
 //                                                        documentation ```java\n@Dimension(unit = Dimension.DP)\nint itemSpacingDp\n```
       return new Padding(paddingDp, paddingDp, paddingDp, paddingDp, itemSpacingDp, PaddingType.DP);
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
@@ -997,6 +1082,7 @@ public static Padding dp(
     public static Padding dp(
 //                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                        ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp(+1).
+//                           display_name dp
 //                           documentation ```java\npublic static Padding dp(int leftDp, int topDp, int rightDp, int bottomDp, int itemSpacingDp)\n```
 //                           documentation  @param leftDp Left padding in dp.\n @param topDp Top padding in dp.\n @param rightDp Right padding in dp.\n @param bottomDp Bottom padding in dp.\n @param itemSpacingDp Space in dp to add between each carousel item. Will be implemented via\n     an item decoration.\n
         @Dimension(unit = Dimension.DP) int leftDp,
@@ -1005,6 +1091,7 @@ public static Padding dp(
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^ definition local 46
+//                                                 display_name leftDp
 //                                                 documentation ```java\n@Dimension(unit = Dimension.DP)\nint leftDp\n```
         @Dimension(unit = Dimension.DP) int topDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -1012,6 +1099,7 @@ public static Padding dp(
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^ definition local 47
+//                                                display_name topDp
 //                                                documentation ```java\n@Dimension(unit = Dimension.DP)\nint topDp\n```
         @Dimension(unit = Dimension.DP) int rightDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -1019,6 +1107,7 @@ public static Padding dp(
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^ definition local 48
+//                                                  display_name rightDp
 //                                                  documentation ```java\n@Dimension(unit = Dimension.DP)\nint rightDp\n```
         @Dimension(unit = Dimension.DP) int bottomDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -1026,6 +1115,7 @@ public static Padding dp(
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^^ definition local 49
+//                                                   display_name bottomDp
 //                                                   documentation ```java\n@Dimension(unit = Dimension.DP)\nint bottomDp\n```
         @Dimension(unit = Dimension.DP) int itemSpacingDp) {
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -1033,6 +1123,7 @@ public static Padding dp(
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^^^^^^^ definition local 50
+//                                                        display_name itemSpacingDp
 //                                                        documentation ```java\n@Dimension(unit = Dimension.DP)\nint itemSpacingDp\n```
       return new Padding(leftDp, topDp, rightDp, bottomDp, itemSpacingDp, PaddingType.DP);
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
@@ -1052,13 +1143,16 @@ public static Padding dp(
      */
     public Padding(@Px int paddingPx, @Px int itemSpacingPx) {
 //         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`().
+//                 display_name <init>
 //                 documentation ```java\npublic Padding(int paddingPx, int itemSpacingPx)\n```
 //                 documentation  @param paddingPx Padding in pixels to add on all sides of the carousel\n @param itemSpacingPx Space in pixels to add between each carousel item. Will be implemented\n     via an item decoration.\n
 //                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                         ^^^^^^^^^ definition local 51
+//                                   display_name paddingPx
 //                                   documentation ```java\n@Px\nint paddingPx\n```
 //                                     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                            ^^^^^^^^^^^^^ definition local 52
+//                                                          display_name itemSpacingPx
 //                                                          documentation ```java\n@Px\nint itemSpacingPx\n```
       this(paddingPx, paddingPx, paddingPx, paddingPx, itemSpacingPx, PaddingType.PX);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
@@ -1081,23 +1175,29 @@ public Padding(@Px int paddingPx, @Px int itemSpacingPx) {
      */
     public Padding(
 //         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+1).
+//                 display_name <init>
 //                 documentation ```java\npublic Padding(int leftPx, int topPx, int rightPx, int bottomPx, int itemSpacingPx)\n```
 //                 documentation  @param leftPx Left padding in pixels.\n @param topPx Top padding in pixels.\n @param rightPx Right padding in pixels.\n @param bottomPx Bottom padding in pixels.\n @param itemSpacingPx Space in pixels to add between each carousel item. Will be implemented\n     via an item decoration.\n
         @Px int leftPx, @Px int topPx, @Px int rightPx, @Px int bottomPx, @Px int itemSpacingPx) {
 //       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //              ^^^^^^ definition local 53
+//                     display_name leftPx
 //                     documentation ```java\n@Px\nint leftPx\n```
 //                       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                              ^^^^^ definition local 54
+//                                    display_name topPx
 //                                    documentation ```java\n@Px\nint topPx\n```
 //                                      ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                             ^^^^^^^ definition local 55
+//                                                     display_name rightPx
 //                                                     documentation ```java\n@Px\nint rightPx\n```
 //                                                       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                                              ^^^^^^^^ definition local 56
+//                                                                       display_name bottomPx
 //                                                                       documentation ```java\n@Px\nint bottomPx\n```
 //                                                                         ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                                                                ^^^^^^^^^^^^^ definition local 57
+//                                                                                              display_name itemSpacingPx
 //                                                                                              documentation ```java\n@Px\nint itemSpacingPx\n```
       this(leftPx, topPx, rightPx, bottomPx, itemSpacingPx, PaddingType.PX);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
@@ -1121,21 +1221,28 @@ public Padding(
      */
     private Padding(
 //          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
+//                  display_name <init>
 //                  documentation ```java\nprivate Padding(int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType)\n```
 //                  documentation  @param left Left padding.\n @param top Top padding.\n @param right Right padding.\n @param bottom Bottom padding.\n @param itemSpacing Space to add between each carousel item. Will be implemented via an item\n     decoration.\n @param paddingType Unit / Type of the given paddings/ itemspacing.\n
         int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType) {
 //          ^^^^ definition local 58
+//               display_name left
 //               documentation ```java\nint left\n```
 //                    ^^^ definition local 59
+//                        display_name top
 //                        documentation ```java\nint top\n```
 //                             ^^^^^ definition local 60
+//                                   display_name right
 //                                   documentation ```java\nint right\n```
 //                                        ^^^^^^ definition local 61
+//                                               display_name bottom
 //                                               documentation ```java\nint bottom\n```
 //                                                    ^^^^^^^^^^^ definition local 62
+//                                                                display_name itemSpacing
 //                                                                documentation ```java\nint itemSpacing\n```
 //                                                                 ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
 //                                                                             ^^^^^^^^^^^ definition local 63
+//                                                                                         display_name paddingType
 //                                                                                         documentation ```java\nPaddingType paddingType\n```
 
       this.left = left;
@@ -1162,10 +1269,12 @@ private Padding(
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public boolean equals(Object o) {
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#equals().
+//                        display_name equals
 //                        documentation ```java\n@Override\npublic boolean equals(Object o)\n```
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                               ^ definition local 64
+//                                 display_name o
 //                                 documentation ```java\nObject o\n```
       if (this == o) {
 //                ^ reference local 64
@@ -1182,6 +1291,7 @@ public boolean equals(Object o) {
       Padding padding = (Padding) o;
 //    ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //            ^^^^^^^ definition local 65
+//                    display_name padding
 //                    documentation ```java\nPadding padding\n```
 //                       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                                ^ reference local 64
@@ -1220,10 +1330,12 @@ public boolean equals(Object o) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public int hashCode() {
 //             ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#hashCode().
+//                      display_name hashCode
 //                      documentation ```java\n@Override\npublic int hashCode()\n```
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
       int result = left;
 //        ^^^^^^ definition local 66
+//               display_name result
 //               documentation ```java\nint result\n```
 //                 ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
       result = 31 * result + top;
@@ -1251,11 +1363,13 @@ public int hashCode() {
 // ^^^^^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/ModelProp#
   public void setModels(@NonNull List<? extends EpoxyModel<?>> models) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setModels().
+//                      display_name setModels
 //                      documentation ```java\n@ModelProp\npublic void setModels(List<? extends EpoxyModel<?>> models)\n```
 //                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^^^^^^ definition local 67
+//                                                                    display_name models
 //                                                                    documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> models\n```
     super.setModels(models);
 //  ^^^^^ reference semanticdb maven . . super#
@@ -1267,6 +1381,7 @@ public void setModels(@NonNull List<? extends EpoxyModel<?>> models) {
 // ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/OnViewRecycled#
   public void clear() {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#clear().
+//                  display_name clear
 //                  documentation ```java\n@OnViewRecycled\npublic void clear()\n```
     super.clear();
 //  ^^^^^ reference semanticdb maven . . super#
@@ -1276,9 +1391,11 @@ public void clear() {
   /** Provide a SnapHelper implementation you want to use with a Carousel. */
   public abstract static class SnapHelperFactory {
 //                             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
+//                                               display_name SnapHelperFactory
 //                                               documentation ```java\npublic abstract static class SnapHelperFactory\n```
 //                                               documentation Provide a SnapHelper implementation you want to use with a Carousel. 
 //                             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#`<init>`().
+//                                               display_name <init>
 //                                               documentation ```java\npublic SnapHelperFactory()\n```
     /**
      * Create and return a new instance of a {@link androidx.recyclerview.widget.SnapHelper} for use
@@ -1289,10 +1406,12 @@ public abstract static class SnapHelperFactory {
     public abstract SnapHelper buildSnapHelper(Context context);
 //                  ^^^^^^^^^^ reference semanticdb maven . . SnapHelper#
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
+//                                             display_name buildSnapHelper
 //                                             documentation ```java\n@NonNull\npublic abstract unresolved_type buildSnapHelper(unresolved_type context)\n```
 //                                             documentation  Create and return a new instance of a {@link androidx.recyclerview.widget.SnapHelper} for use\n with a Carousel.\n
 //                                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                                     ^^^^^^^ definition local 68
+//                                                             display_name context
 //                                                             documentation ```java\nunresolved_type context\n```
   }
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
index 8feb8824b..ee5f1e8f8 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
@@ -12,28 +12,35 @@
  */
 public abstract class ControllerHelper<T extends EpoxyController> {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
+//                                     display_name ControllerHelper
 //                                     documentation ```java\npublic abstract class ControllerHelper<T extends EpoxyController>\n```
 //                                     documentation  A helper class for {@link EpoxyController} to handle {@link\n com.airbnb.epoxy.AutoModel} models. This is only implemented by the generated classes created the\n annotation processor.\n
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#`<init>`().
+//                                     display_name <init>
 //                                     documentation ```java\npublic ControllerHelper()\n```
 //                                     ^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
+//                                       display_name T
 //                                       documentation ```java\nT extends EpoxyController\n```
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   public abstract void resetAutoModels();
 //                     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#resetAutoModels().
+//                                     display_name resetAutoModels
 //                                     documentation ```java\npublic abstract void resetAutoModels()\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#resetAutoModels().
 
   protected void validateModelHashCodesHaveNotChanged(T controller) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
+//                                                    display_name validateModelHashCodesHaveNotChanged
 //                                                    documentation ```java\nprotected void validateModelHashCodesHaveNotChanged(T controller)\n```
 //                                                    ^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
 //                                                      ^^^^^^^^^^ definition local 0
+//                                                                 display_name controller
 //                                                                 documentation ```java\nT controller\n```
     List<EpoxyModel<?>> currentModels = controller.getAdapter().getCopyOfModels();
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^^^ definition local 1
+//                                    display_name currentModels
 //                                    documentation ```java\nList<EpoxyModel<?>> currentModels\n```
 //                                      ^^^^^^^^^^ reference local 0
 //                                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#getAdapter().
@@ -41,6 +48,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 
     for (int i = 0; i < currentModels.size(); i++) {
 //           ^ definition local 2
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 2
 //                      ^^^^^^^^^^^^^ reference local 1
@@ -49,6 +57,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
       EpoxyModel model = currentModels.get(i);
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //               ^^^^^ definition local 3
+//                     display_name model
 //                     documentation ```java\nEpoxyModel model\n```
 //                       ^^^^^^^^^^^^^ reference local 1
 //                                     ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -63,12 +72,15 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 
   protected void setControllerToStageTo(EpoxyModel<?> model, T controller) {
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#setControllerToStageTo().
+//                                      display_name setControllerToStageTo
 //                                      documentation ```java\nprotected void setControllerToStageTo(EpoxyModel<?> model, T controller)\n```
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                    ^^^^^ definition local 4
+//                                                          display_name model
 //                                                          documentation ```java\nEpoxyModel<?> model\n```
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
 //                                                             ^^^^^^^^^^ definition local 5
+//                                                                        display_name controller
 //                                                                        documentation ```java\nT controller\n```
     model.controllerToStageTo = controller;
 //  ^^^^^ reference local 4
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
index 4dbcad820..354e171b7 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
@@ -31,37 +31,45 @@
  */
 class ControllerHelperLookup {
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#
+//                           display_name ControllerHelperLookup
 //                           documentation ```java\nclass ControllerHelperLookup\n```
 //                           documentation  Looks up a generated {@link ControllerHelper} implementation for a given adapter.\n If the adapter has no {@link com.airbnb.epoxy.AutoModel} models then a No-Op implementation will\n be returned.\n
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#`<init>`().
+//                           display_name <init>
 //                           documentation ```java\nControllerHelperLookup()\n```
   private static final String GENERATED_HELPER_CLASS_SUFFIX = "_EpoxyHelper";
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#GENERATED_HELPER_CLASS_SUFFIX.
+//                                                          display_name GENERATED_HELPER_CLASS_SUFFIX
 //                                                          documentation ```java\nprivate static final String GENERATED_HELPER_CLASS_SUFFIX\n```
   private static final Map<Class<?>, Constructor<?>> BINDINGS = new LinkedHashMap<>();
 //                     ^^^ reference semanticdb maven jdk 11 java/util/Map#
 //                         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                   ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                                                   ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#BINDINGS.
+//                                                            display_name BINDINGS
 //                                                            documentation ```java\nprivate static final Map<Class<?>, Constructor<?>> BINDINGS\n```
 //                                                                  ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/LinkedHashMap#`<init>`(+2).
   private static final NoOpControllerHelper NO_OP_CONTROLLER_HELPER = new NoOpControllerHelper();
 //                     ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#
 //                                          ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#NO_OP_CONTROLLER_HELPER.
+//                                                                  display_name NO_OP_CONTROLLER_HELPER
 //                                                                  documentation ```java\nprivate static final NoOpControllerHelper NO_OP_CONTROLLER_HELPER\n```
 //                                                                        ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#`<init>`().
 
   static ControllerHelper getHelperForController(EpoxyController controller) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
+//                                               display_name getHelperForController
 //                                               documentation ```java\nstatic ControllerHelper getHelperForController(EpoxyController controller)\n```
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                               ^^^^^^^^^^ definition local 0
+//                                                                          display_name controller
 //                                                                          documentation ```java\nEpoxyController controller\n```
     Constructor<?> constructor = findConstructorForClass(controller.getClass());
 //  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                 ^^^^^^^^^^^ definition local 1
+//                             display_name constructor
 //                             documentation ```java\nConstructor<?> constructor\n```
 //                               ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                                                       ^^^^^^^^^^ reference local 0
@@ -81,6 +89,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
     } catch (IllegalAccessException e) {
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IllegalAccessException#
 //                                  ^ definition local 2
+//                                    display_name e
 //                                    documentation ```java\nIllegalAccessException e\n```
       throw new RuntimeException("Unable to invoke " + constructor, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
@@ -89,6 +98,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
     } catch (InstantiationException e) {
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/InstantiationException#
 //                                  ^ definition local 3
+//                                    display_name e
 //                                    documentation ```java\nInstantiationException e\n```
       throw new RuntimeException("Unable to invoke " + constructor, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
@@ -97,10 +107,12 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
     } catch (InvocationTargetException e) {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationTargetException#
 //                                     ^ definition local 4
+//                                       display_name e
 //                                       documentation ```java\nInvocationTargetException e\n```
       Throwable cause = e.getCause();
 //    ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Throwable#
 //              ^^^^^ definition local 5
+//                    display_name cause
 //                    documentation ```java\nThrowable cause\n```
 //                      ^ reference local 4
 //                        ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationTargetException#getCause().
@@ -129,13 +141,16 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
   private static Constructor<?> findConstructorForClass(Class<?> controllerClass) {
 //               ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
+//                                                      display_name findConstructorForClass
 //                                                      documentation ```java\n@Nullable\nprivate static Constructor<?> findConstructorForClass(Class<?> controllerClass)\n```
 //                                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                               ^^^^^^^^^^^^^^^ definition local 6
+//                                                                               display_name controllerClass
 //                                                                               documentation ```java\nClass<?> controllerClass\n```
     Constructor<?> helperCtor = BINDINGS.get(controllerClass);
 //  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                 ^^^^^^^^^^ definition local 7
+//                            display_name helperCtor
 //                            documentation ```java\nConstructor<?> helperCtor\n```
 //                              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#BINDINGS.
 //                                       ^^^ reference semanticdb maven jdk 11 java/util/Map#get().
@@ -152,6 +167,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
     String clsName = controllerClass.getName();
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^^^^^^^ definition local 8
+//                 display_name clsName
 //                 documentation ```java\nString clsName\n```
 //                   ^^^^^^^^^^^^^^^ reference local 6
 //                                   ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#getName().
@@ -167,6 +183,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
       Class<?> bindingClass = Class.forName(clsName + GENERATED_HELPER_CLASS_SUFFIX);
 //    ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //             ^^^^^^^^^^^^ definition local 9
+//                          display_name bindingClass
 //                          documentation ```java\nClass<?> bindingClass\n```
 //                            ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                  ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#forName().
@@ -181,6 +198,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
     } catch (ClassNotFoundException e) {
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/ClassNotFoundException#
 //                                  ^ definition local 10
+//                                    display_name e
 //                                    documentation ```java\nClassNotFoundException e\n```
       helperCtor = findConstructorForClass(controllerClass.getSuperclass());
 //    ^^^^^^^^^^ reference local 7
@@ -190,6 +208,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
     } catch (NoSuchMethodException e) {
 //           ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/NoSuchMethodException#
 //                                 ^ definition local 11
+//                                   display_name e
 //                                   documentation ```java\nNoSuchMethodException e\n```
       throw new RuntimeException("Unable to find Epoxy Helper constructor for " + clsName, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
index 17a25d6ee..06edad547 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
@@ -9,6 +9,7 @@
  */
 class ControllerModelList extends ModelList {
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
+//                        display_name ControllerModelList
 //                        documentation ```java\nclass ControllerModelList\n```
 //                        documentation  This ArrayList subclass enforces that no changes are made to the list after {@link #freeze()} is\n called. This prevents model interceptors from storing the list and trying to change it later. We\n could copy the list before diffing, but that would waste memory to make the copy for every\n buildModels cycle, plus the interceptors could still try to modify the list and be confused about\n why it doesn't do anything.\n
 //                        relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#
@@ -26,17 +27,21 @@ class ControllerModelList extends ModelList {
   private static final ModelListObserver OBSERVER = new ModelListObserver() {
 //                     ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#OBSERVER.
+//                                                display_name OBSERVER
 //                                                documentation ```java\nprivate static final ModelListObserver OBSERVER\n```
 //                                                      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onItemRangeInserted(int positionStart, int itemCount) {
 //              ^^^^^^^^^^^^^^^^^^^ definition local 1
+//                                  display_name onItemRangeInserted
 //                                  documentation ```java\n@Override\npublic void onItemRangeInserted(int positionStart, int itemCount)\n```
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
 //                                      ^^^^^^^^^^^^^ definition local 2
+//                                                    display_name positionStart
 //                                                    documentation ```java\nint positionStart\n```
 //                                                         ^^^^^^^^^ definition local 3
+//                                                                   display_name itemCount
 //                                                                   documentation ```java\nint itemCount\n```
       throw new IllegalStateException(
 //              ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IllegalStateException#`<init>`(+1).
@@ -47,11 +52,14 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onItemRangeRemoved(int positionStart, int itemCount) {
 //              ^^^^^^^^^^^^^^^^^^ definition local 4
+//                                 display_name onItemRangeRemoved
 //                                 documentation ```java\n@Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)\n```
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
 //                                     ^^^^^^^^^^^^^ definition local 5
+//                                                   display_name positionStart
 //                                                   documentation ```java\nint positionStart\n```
 //                                                        ^^^^^^^^^ definition local 6
+//                                                                  display_name itemCount
 //                                                                  documentation ```java\nint itemCount\n```
       throw new IllegalStateException(
 //              ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IllegalStateException#`<init>`(+1).
@@ -61,8 +69,10 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 
   ControllerModelList(int expectedModelCount) {
 //^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#`<init>`().
+//                    display_name <init>
 //                    documentation ```java\nControllerModelList(int expectedModelCount)\n```
 //                        ^^^^^^^^^^^^^^^^^^ definition local 7
+//                                           display_name expectedModelCount
 //                                           documentation ```java\nint expectedModelCount\n```
     super(expectedModelCount);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`().
@@ -73,6 +83,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 
   void freeze() {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#freeze().
+//            display_name freeze
 //            documentation ```java\nvoid freeze()\n```
     setObserver(OBSERVER);
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#setObserver().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
index bea3f61e7..7fd63fe8d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
@@ -7,6 +7,7 @@
 
 class DebugTimer implements Timer {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#
+//               display_name DebugTimer
 //               documentation ```java\nclass DebugTimer\n```
 //               relationship is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#
 //                          ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
@@ -14,20 +15,25 @@ class DebugTimer implements Timer {
   private final String tag;
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#tag.
+//                         display_name tag
 //                         documentation ```java\nprivate final String tag\n```
   private long startTime;
 //             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
+//                       display_name startTime
 //                       documentation ```java\nprivate long startTime\n```
   private String sectionName;
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#sectionName.
+//                           display_name sectionName
 //                           documentation ```java\nprivate String sectionName\n```
 
   DebugTimer(String tag) {
 //^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#`<init>`().
+//           display_name <init>
 //           documentation ```java\nDebugTimer(String tag)\n```
 //           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                  ^^^ definition local 0
+//                      display_name tag
 //                      documentation ```java\nString tag\n```
     this.tag = tag;
 //       ^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#tag.
@@ -38,6 +44,7 @@ class DebugTimer implements Timer {
 
   private void reset() {
 //             ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#reset().
+//                   display_name reset
 //                   documentation ```java\nprivate void reset()\n```
     startTime = -1;
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
@@ -49,10 +56,12 @@ private void reset() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void start(String sectionName) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#start().
+//                  display_name start
 //                  documentation ```java\n@Override\npublic void start(String sectionName)\n```
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#start().
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                         ^^^^^^^^^^^ definition local 1
+//                                     display_name sectionName
 //                                     documentation ```java\nString sectionName\n```
     if (startTime != -1) {
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
@@ -73,6 +82,7 @@ public void start(String sectionName) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void stop() {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#stop().
+//                 display_name stop
 //                 documentation ```java\n@Override\npublic void stop()\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#stop().
     if (startTime == -1) {
@@ -83,6 +93,7 @@ public void stop() {
 
     float durationMs = (System.nanoTime() - startTime) / 1000000f;
 //        ^^^^^^^^^^ definition local 2
+//                   display_name durationMs
 //                   documentation ```java\nfloat durationMs\n```
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#nanoTime().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
index 5d4383016..bf0cffd9b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
@@ -37,12 +37,14 @@
  */
 class DiffHelper {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#
+//               display_name DiffHelper
 //               documentation ```java\nclass DiffHelper\n```
 //               documentation  Helper to track changes in the models list.\n
   private ArrayList<ModelState> oldStateList = new ArrayList<>();
 //        ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
+//                                           display_name oldStateList
 //                                           documentation ```java\nprivate ArrayList<ModelState> oldStateList\n```
 //                                                 ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   // Using a HashMap instead of a LongSparseArray to
@@ -52,12 +54,14 @@ class DiffHelper {
 //            ^^^^ reference semanticdb maven jdk 11 java/lang/Long#
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
+//                                          display_name oldStateMap
 //                                          documentation ```java\nprivate Map<Long, ModelState> oldStateMap\n```
 //                                                ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   private ArrayList<ModelState> currentStateList = new ArrayList<>();
 //        ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
+//                                               display_name currentStateList
 //                                               documentation ```java\nprivate ArrayList<ModelState> currentStateList\n```
 //                                                     ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   private Map<Long, ModelState> currentStateMap = new HashMap<>();
@@ -65,24 +69,30 @@ class DiffHelper {
 //            ^^^^ reference semanticdb maven jdk 11 java/lang/Long#
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateMap.
+//                                              display_name currentStateMap
 //                                              documentation ```java\nprivate Map<Long, ModelState> currentStateMap\n```
 //                                                    ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   private final BaseEpoxyAdapter adapter;
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
+//                                       display_name adapter
 //                                       documentation ```java\nprivate final BaseEpoxyAdapter adapter\n```
   private final boolean immutableModels;
 //                      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#immutableModels.
+//                                      display_name immutableModels
 //                                      documentation ```java\nprivate final boolean immutableModels\n```
 
 
   DiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels) {
 //^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#`<init>`().
+//           display_name <init>
 //           documentation ```java\nDiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels)\n```
 //           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                            ^^^^^^^ definition local 0
+//                                    display_name adapter
 //                                    documentation ```java\nBaseEpoxyAdapter adapter\n```
 //                                             ^^^^^^^^^^^^^^^ definition local 1
+//                                                             display_name immutableModels
 //                                                             documentation ```java\nboolean immutableModels\n```
     this.adapter = adapter;
 //       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
@@ -100,6 +110,7 @@ class DiffHelper {
 //              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
 //                           ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/AdapterDataObserver#
 //                                               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#observer.
+//                                                        display_name observer
 //                                                        documentation ```java\nprivate final unresolved_type observer\n```
 //                                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
 //                                                                           ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/AdapterDataObserver#
@@ -201,11 +212,13 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
    */
   void notifyModelChanges() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyModelChanges().
+//                        display_name notifyModelChanges
 //                        documentation ```java\nvoid notifyModelChanges()\n```
 //                        documentation  Set the current list of models. The diff callbacks will be notified of the changes between the\n current list and the last list that was set.\n
     UpdateOpHelper updateOpHelper = new UpdateOpHelper();
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                 ^^^^^^^^^^^^^^ definition local 2
+//                                display_name updateOpHelper
 //                                documentation ```java\nUpdateOpHelper updateOpHelper\n```
 //                                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#`<init>`().
 
@@ -230,13 +243,16 @@ void notifyModelChanges() {
 
   private void notifyChanges(UpdateOpHelper opHelper) {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyChanges().
+//                           display_name notifyChanges
 //                           documentation ```java\nprivate void notifyChanges(UpdateOpHelper opHelper)\n```
 //                           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                          ^^^^^^^^ definition local 3
+//                                                   display_name opHelper
 //                                                   documentation ```java\nUpdateOpHelper opHelper\n```
     for (UpdateOp op : opHelper.opList) {
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                ^^ definition local 4
+//                   display_name op
 //                   documentation ```java\nUpdateOp op\n```
 //                     ^^^^^^^^ reference local 3
 //                              ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
@@ -320,10 +336,12 @@ private void notifyChanges(UpdateOpHelper opHelper) {
   private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
 //        ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#buildDiff().
+//                                 display_name buildDiff
 //                                 documentation ```java\nprivate UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper)\n```
 //                                 documentation  Create a list of operations that define the difference between {@link #oldStateList} and {@link\n #currentStateList}.\n
 //                                 ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                                ^^^^^^^^^^^^^^ definition local 5
+//                                                               display_name updateOpHelper
 //                                                               documentation ```java\nUpdateOpHelper updateOpHelper\n```
     prepareStateForDiff();
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
@@ -340,6 +358,7 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
     // Only need to check for insertions if new list is bigger
     boolean hasInsertions =
 //          ^^^^^^^^^^^^^ definition local 6
+//                        display_name hasInsertions
 //                        documentation ```java\nboolean hasInsertions\n```
         oldStateList.size() - updateOpHelper.getNumRemovals() != currentStateList.size();
 //      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
@@ -371,6 +390,7 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
 
   private void resetOldState() {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#resetOldState().
+//                           display_name resetOldState
 //                           documentation ```java\nprivate void resetOldState()\n```
     oldStateList.clear();
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
@@ -382,6 +402,7 @@ private void resetOldState() {
 
   private void prepareStateForDiff() {
 //             ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
+//                                 display_name prepareStateForDiff
 //                                 documentation ```java\nprivate void prepareStateForDiff()\n```
     // We use a list of the models as well as a map by their id,
     // so we can easily find them by both position and id
@@ -398,6 +419,7 @@ private void prepareStateForDiff() {
 //  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                        ^^^^^^^^ definition local 7
+//                                 display_name tempList
 //                                 documentation ```java\nArrayList<ModelState> tempList\n```
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
     oldStateList = currentStateList;
@@ -412,6 +434,7 @@ private void prepareStateForDiff() {
 //      ^^^^ reference semanticdb maven jdk 11 java/lang/Long#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                        ^^^^^^^ definition local 8
+//                                display_name tempMap
 //                                documentation ```java\nMap<Long, ModelState> tempMap\n```
 //                                  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
     oldStateMap = currentStateMap;
@@ -426,6 +449,7 @@ private void prepareStateForDiff() {
     for (ModelState modelState : oldStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^^^^ definition local 9
+//                             display_name modelState
 //                             documentation ```java\nModelState modelState\n```
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
       modelState.pair = null;
@@ -435,6 +459,7 @@ private void prepareStateForDiff() {
 
     int modelCount = adapter.getCurrentModels().size();
 //      ^^^^^^^^^^ definition local 10
+//                 display_name modelCount
 //                 documentation ```java\nint modelCount\n```
 //                   ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
@@ -446,6 +471,7 @@ private void prepareStateForDiff() {
 
     for (int i = 0; i < modelCount; i++) {
 //           ^ definition local 11
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 11
 //                      ^^^^^^^^^^ reference local 10
@@ -461,12 +487,15 @@ private void prepareStateForDiff() {
   private ModelState createStateForPosition(int position) {
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                   ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
+//                                          display_name createStateForPosition
 //                                          documentation ```java\nprivate ModelState createStateForPosition(int position)\n```
 //                                              ^^^^^^^^ definition local 12
+//                                                       display_name position
 //                                                       documentation ```java\nint position\n```
     EpoxyModel<?> model = adapter.getCurrentModels().get(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 13
+//                      display_name model
 //                      documentation ```java\nEpoxyModel<?> model\n```
 //                        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
@@ -478,6 +507,7 @@ private ModelState createStateForPosition(int position) {
     ModelState state = ModelState.build(model, position, immutableModels);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^ definition local 14
+//                   display_name state
 //                   documentation ```java\nModelState state\n```
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#build().
@@ -488,6 +518,7 @@ private ModelState createStateForPosition(int position) {
     ModelState previousValue = currentStateMap.put(state.id, state);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^^^^^^^^^ definition local 15
+//                           display_name previousValue
 //                           documentation ```java\nModelState previousValue\n```
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateMap.
 //                                             ^^^ reference semanticdb maven jdk 11 java/util/Map#put().
@@ -498,12 +529,14 @@ private ModelState createStateForPosition(int position) {
 //      ^^^^^^^^^^^^^ reference local 15
       int previousPosition = previousValue.position;
 //        ^^^^^^^^^^^^^^^^ definition local 16
+//                         display_name previousPosition
 //                         documentation ```java\nint previousPosition\n```
 //                           ^^^^^^^^^^^^^ reference local 15
 //                                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
       EpoxyModel<?> previousModel = adapter.getCurrentModels().get(previousPosition);
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^^^^^^^^^ definition local 17
+//                                display_name previousModel
 //                                documentation ```java\nEpoxyModel<?> previousModel\n```
 //                                  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
@@ -530,14 +563,17 @@ private ModelState createStateForPosition(int position) {
    */
   private void collectRemovals(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectRemovals().
+//                             display_name collectRemovals
 //                             documentation ```java\nprivate void collectRemovals(UpdateOpHelper helper)\n```
 //                             documentation  Find all removal operations and add them to the result list. The general strategy here is to\n walk through the {@link #oldStateList} and check for items that don't exist in the new list.\n Walking through it in order makes it easy to batch adjacent removals.\n
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                            ^^^^^^ definition local 18
+//                                                   display_name helper
 //                                                   documentation ```java\nUpdateOpHelper helper\n```
     for (ModelState state : oldStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^ definition local 19
+//                        display_name state
 //                        documentation ```java\nModelState state\n```
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
       // Update the position of the item to take into account previous removals,
@@ -584,15 +620,18 @@ private void collectRemovals(UpdateOpHelper helper) {
    */
   private void collectInsertions(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
+//                               display_name collectInsertions
 //                               documentation ```java\nprivate void collectInsertions(UpdateOpHelper helper)\n```
 //                               documentation  Find all insertion operations and add them to the result list. The general strategy here is to\n walk through the {@link #currentStateList} and check for items that don't exist in the old\n list. Walking through it in order makes it easy to batch adjacent insertions.\n
 //                               ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                              ^^^^^^ definition local 20
+//                                                     display_name helper
 //                                                     documentation ```java\nUpdateOpHelper helper\n```
     Iterator<ModelState> oldItemIterator = oldStateList.iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                       ^^^^^^^^^^^^^^^ definition local 21
+//                                       display_name oldItemIterator
 //                                       documentation ```java\nIterator<ModelState> oldItemIterator\n```
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
@@ -600,6 +639,7 @@ private void collectInsertions(UpdateOpHelper helper) {
     for (ModelState itemToInsert : currentStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^^^^^^ definition local 22
+//                               display_name itemToInsert
 //                               documentation ```java\nModelState itemToInsert\n```
 //                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       if (itemToInsert.pair != null) {
@@ -609,6 +649,7 @@ private void collectInsertions(UpdateOpHelper helper) {
         ModelState nextOldItem = getNextItemWithPair(oldItemIterator);
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                 ^^^^^^^^^^^ definition local 23
+//                             display_name nextOldItem
 //                             documentation ```java\nModelState nextOldItem\n```
 //                               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
 //                                                   ^^^^^^^^^^^^^^^ reference local 21
@@ -636,19 +677,23 @@ private void collectInsertions(UpdateOpHelper helper) {
    */
   private void collectChanges(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
+//                            display_name collectChanges
 //                            documentation ```java\nprivate void collectChanges(UpdateOpHelper helper)\n```
 //                            documentation  Check if any items have had their values changed, batching if possible.\n
 //                            ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                           ^^^^^^ definition local 24
+//                                                  display_name helper
 //                                                  documentation ```java\nUpdateOpHelper helper\n```
     for (ModelState newItem : currentStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^ definition local 25
+//                          display_name newItem
 //                          documentation ```java\nModelState newItem\n```
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       ModelState previousItem = newItem.pair;
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //               ^^^^^^^^^^^^ definition local 26
+//                            display_name previousItem
 //                            documentation ```java\nModelState previousItem\n```
 //                              ^^^^^^^ reference local 25
 //                                      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
@@ -661,6 +706,7 @@ private void collectChanges(UpdateOpHelper helper) {
       // rely on the stored hashCode
       boolean modelChanged;
 //            ^^^^^^^^^^^^ definition local 27
+//                         display_name modelChanged
 //                         documentation ```java\nboolean modelChanged\n```
       if (immutableModels) {
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#immutableModels.
@@ -714,27 +760,32 @@ private void collectChanges(UpdateOpHelper helper) {
    */
   private void collectMoves(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
+//                          display_name collectMoves
 //                          documentation ```java\nprivate void collectMoves(UpdateOpHelper helper)\n```
 //                          documentation  Check which items have had a position changed. Recyclerview does not support batching these.\n
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                         ^^^^^^ definition local 28
+//                                                display_name helper
 //                                                documentation ```java\nUpdateOpHelper helper\n```
     // This walks through both the new and old list simultaneous and checks for position changes.
     Iterator<ModelState> oldItemIterator = oldStateList.iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                       ^^^^^^^^^^^^^^^ definition local 29
+//                                       display_name oldItemIterator
 //                                       documentation ```java\nIterator<ModelState> oldItemIterator\n```
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
     ModelState nextOldItem = null;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^^^^^^^ definition local 30
+//                         display_name nextOldItem
 //                         documentation ```java\nModelState nextOldItem\n```
 
     for (ModelState newItem : currentStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^ definition local 31
+//                          display_name newItem
 //                          documentation ```java\nModelState newItem\n```
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       if (newItem.pair == null) {
@@ -824,6 +875,7 @@ private void collectMoves(UpdateOpHelper helper) {
 
         int newItemDistance = newItem.pair.position - newItem.position;
 //          ^^^^^^^^^^^^^^^ definition local 32
+//                          display_name newItemDistance
 //                          documentation ```java\nint newItemDistance\n```
 //                            ^^^^^^^ reference local 31
 //                                    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
@@ -832,6 +884,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //                                                            ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
         int oldItemDistance = nextOldItem.pair.position - nextOldItem.position;
 //          ^^^^^^^^^^^^^^^ definition local 33
+//                          display_name oldItemDistance
 //                          documentation ```java\nint oldItemDistance\n```
 //                            ^^^^^^^^^^^ reference local 30
 //                                        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
@@ -911,23 +964,28 @@ private void collectMoves(UpdateOpHelper helper) {
    */
   private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //             ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
+//                                display_name updateItemPosition
 //                                documentation ```java\nprivate void updateItemPosition(ModelState item, List<UpdateOp> moveOps)\n```
 //                                documentation  Apply the movement operations to the given item to update its position. Only applies the\n operations that have not been applied yet, and stores how many operations have been applied so\n we know which ones to apply next time.\n
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                           ^^^^ definition local 34
+//                                                display_name item
 //                                                documentation ```java\nModelState item\n```
 //                                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                                                                ^^^^^^^ definition local 35
+//                                                                        display_name moveOps
 //                                                                        documentation ```java\nList<UpdateOp> moveOps\n```
     int size = moveOps.size();
 //      ^^^^ definition local 36
+//           display_name size
 //           documentation ```java\nint size\n```
 //             ^^^^^^^ reference local 35
 //                     ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
     for (int i = item.lastMoveOp; i < size; i++) {
 //           ^ definition local 37
+//             display_name i
 //             documentation ```java\nint i\n```
 //               ^^^^ reference local 34
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#lastMoveOp.
@@ -937,17 +995,20 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
       UpdateOp moveOp = moveOps.get(i);
 //    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //             ^^^^^^ definition local 38
+//                    display_name moveOp
 //                    documentation ```java\nUpdateOp moveOp\n```
 //                      ^^^^^^^ reference local 35
 //                              ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                  ^ reference local 37
       int fromPosition = moveOp.positionStart;
 //        ^^^^^^^^^^^^ definition local 39
+//                     display_name fromPosition
 //                     documentation ```java\nint fromPosition\n```
 //                       ^^^^^^ reference local 38
 //                              ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
       int toPosition = moveOp.itemCount;
 //        ^^^^^^^^^^ definition local 40
+//                   display_name toPosition
 //                   documentation ```java\nint toPosition\n```
 //                     ^^^^^^ reference local 38
 //                            ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
@@ -989,15 +1050,18 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
   private ModelState getNextItemWithPair(Iterator<ModelState> iterator) {
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                   ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
+//                                       display_name getNextItemWithPair
 //                                       documentation ```java\n@Nullable\nprivate ModelState getNextItemWithPair(Iterator<ModelState> iterator)\n```
 //                                       documentation  Gets the next item in the list that has a pair, meaning it wasn't inserted or removed.\n
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                                            ^^^^^^^^ definition local 41
+//                                                                     display_name iterator
 //                                                                     documentation ```java\nIterator<ModelState> iterator\n```
     ModelState nextItem = null;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^^^^ definition local 42
+//                      display_name nextItem
 //                      documentation ```java\nModelState nextItem\n```
     while (nextItem == null && iterator.hasNext()) {
 //         ^^^^^^^^ reference local 42
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
index ce0325282..a1739f359 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
@@ -30,24 +30,29 @@
  */
 public class DiffPayload {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#
+//                       display_name DiffPayload
 //                       documentation ```java\npublic class DiffPayload\n```
 //                       documentation  A helper class for tracking changed models found by the {@link com.airbnb.epoxy.DiffHelper} to\n be included as a payload in the\n {@link androidx.recyclerview.widget.RecyclerView.Adapter#notifyItemChanged(int, Object)}\n call.\n
   private final EpoxyModel<?> singleModel;
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#singleModel.
+//                                        display_name singleModel
 //                                        documentation ```java\nprivate final EpoxyModel<?> singleModel\n```
   private final LongSparseArray<EpoxyModel<?>> modelsById;
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
+//                                                        display_name modelsById
 //                                                        documentation ```java\nprivate final LongSparseArray<EpoxyModel<?>> modelsById\n```
 
   DiffPayload(List<? extends EpoxyModel<?>> models) {
 //^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
+//            display_name <init>
 //            documentation ```java\nDiffPayload(List<? extends EpoxyModel<?>> models)\n```
 //            ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^ definition local 0
+//                                                 display_name models
 //                                                 documentation ```java\nList<? extends EpoxyModel<?>> models\n```
     if (models.isEmpty()) {
 //      ^^^^^^ reference local 0
@@ -58,6 +63,7 @@ public class DiffPayload {
 
     int modelCount = models.size();
 //      ^^^^^^^^^^ definition local 1
+//                 display_name modelCount
 //                 documentation ```java\nint modelCount\n```
 //                   ^^^^^^ reference local 0
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -81,6 +87,7 @@ public class DiffPayload {
       for (EpoxyModel<?> model : models) {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^^^ definition local 2
+//                             display_name model
 //                             documentation ```java\nEpoxyModel<?> model\n```
 //                               ^^^^^^ reference local 0
         modelsById.put(model.id(), model);
@@ -95,9 +102,11 @@ public class DiffPayload {
 
   public DiffPayload(EpoxyModel<?> changedItem) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`(+1).
+//                   display_name <init>
 //                   documentation ```java\npublic DiffPayload(EpoxyModel<?> changedItem)\n```
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                 ^^^^^^^^^^^ definition local 3
+//                                             display_name changedItem
 //                                             documentation ```java\nEpoxyModel<?> changedItem\n```
     this(Collections.singletonList(changedItem));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
@@ -116,13 +125,16 @@ public DiffPayload(EpoxyModel<?> changedItem) {
   public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long modelId) {
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
+//                                                display_name getModelFromPayload
 //                                                documentation ```java\n@Nullable\npublic static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long modelId)\n```
 //                                                documentation  Looks through the payloads list and returns the first model found with the given model id. This\n assumes that the payloads list will only contain objects of type {@link DiffPayload}, and will\n throw if an unexpected type is found.\n
 //                                                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                             ^^^^^^^^ definition local 4
+//                                                                      display_name payloads
 //                                                                      documentation ```java\nList<Object> payloads\n```
 //                                                                            ^^^^^^^ definition local 5
+//                                                                                    display_name modelId
 //                                                                                    documentation ```java\nlong modelId\n```
     if (payloads.isEmpty()) {
 //      ^^^^^^^^ reference local 4
@@ -133,11 +145,13 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
     for (Object payload : payloads) {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //              ^^^^^^^ definition local 6
+//                      display_name payload
 //                      documentation ```java\nObject payload\n```
 //                        ^^^^^^^^ reference local 4
       DiffPayload diffPayload = (DiffPayload) payload;
 //    ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                ^^^^^^^^^^^ definition local 7
+//                            display_name diffPayload
 //                            documentation ```java\nDiffPayload diffPayload\n```
 //                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                                            ^^^^^^^ reference local 6
@@ -158,6 +172,7 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
         EpoxyModel<?> modelForId = diffPayload.modelsById.get(modelId);
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^ definition local 8
+//                               display_name modelForId
 //                               documentation ```java\nEpoxyModel<?> modelForId\n```
 //                                 ^^^^^^^^^^^ reference local 7
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
@@ -178,9 +193,11 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 // ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/VisibleForTesting#
   boolean equalsForTesting(DiffPayload that) {
 //        ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
+//                         display_name equalsForTesting
 //                         documentation ```java\n@VisibleForTesting\nboolean equalsForTesting(DiffPayload that)\n```
 //                         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                                     ^^^^ definition local 9
+//                                          display_name that
 //                                          documentation ```java\nDiffPayload that\n```
     if (singleModel != null) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#singleModel.
@@ -192,11 +209,13 @@ boolean equalsForTesting(DiffPayload that) {
 
     int thisSize = modelsById.size();
 //      ^^^^^^^^ definition local 10
+//               display_name thisSize
 //               documentation ```java\nint thisSize\n```
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                            ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
     int thatSize = that.modelsById.size();
 //      ^^^^^^^^ definition local 11
+//               display_name thatSize
 //               documentation ```java\nint thatSize\n```
 //                 ^^^^ reference local 9
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
@@ -210,18 +229,21 @@ boolean equalsForTesting(DiffPayload that) {
 
     for (int i = 0; i < thisSize; i++) {
 //           ^ definition local 12
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 12
 //                      ^^^^^^^^ reference local 10
 //                                ^ reference local 12
       long thisKey = modelsById.keyAt(i);
 //         ^^^^^^^ definition local 13
+//                 display_name thisKey
 //                 documentation ```java\nlong thisKey\n```
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                              ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#keyAt().
 //                                    ^ reference local 12
       long thatKey = that.modelsById.keyAt(i);
 //         ^^^^^^^ definition local 14
+//                 display_name thatKey
 //                 documentation ```java\nlong thatKey\n```
 //                   ^^^^ reference local 9
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
@@ -237,6 +259,7 @@ boolean equalsForTesting(DiffPayload that) {
       EpoxyModel<?> thisModel = modelsById.valueAt(i);
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^^^^^ definition local 15
+//                            display_name thisModel
 //                            documentation ```java\nEpoxyModel<?> thisModel\n```
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#valueAt().
@@ -244,6 +267,7 @@ boolean equalsForTesting(DiffPayload that) {
       EpoxyModel<?> thatModel = that.modelsById.valueAt(i);
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^^^^^ definition local 16
+//                            display_name thatModel
 //                            documentation ```java\nEpoxyModel<?> thatModel\n```
 //                              ^^^^ reference local 9
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
index 194830618..533adfa8e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
@@ -44,6 +44,7 @@
  */
 public class DiffResult {
 //           ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#
+//                      display_name DiffResult
 //                      documentation ```java\npublic class DiffResult\n```
 //                      documentation  Wraps the result of {@link AsyncEpoxyDiffer#submitList(List)}.\n
   @NonNull final List<? extends EpoxyModel<?>> previousModels;
@@ -51,12 +52,14 @@ public class DiffResult {
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#previousModels.
+//                                                            display_name previousModels
 //                                                            documentation ```java\n@NonNull\nfinal List<? extends EpoxyModel<?>> previousModels\n```
   @NonNull final List<? extends EpoxyModel<?>> newModels;
 // ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#newModels.
+//                                                       display_name newModels
 //                                                       documentation ```java\n@NonNull\nfinal List<? extends EpoxyModel<?>> newModels\n```
 
   /**
@@ -69,6 +72,7 @@ public class DiffResult {
 //                ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //                         ^^^^^^^^^^ reference semanticdb maven . . DiffUtil/DiffResult#
 //                                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#differResult.
+//                                                 display_name differResult
 //                                                 documentation ```java\n@Nullable\nfinal unresolved_type differResult\n```
 //                                                 documentation  If this is non null it means the full differ ran and the result is contained\n in this object. If it is null, it means that either the old list or the new list was empty, so\n we can simply add all or clear all items and skipped running the full diffing.\n
 
@@ -76,12 +80,14 @@ public class DiffResult {
   static DiffResult noOp(@Nullable List<? extends EpoxyModel<?>> models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                  ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#noOp().
+//                       display_name noOp
 //                       documentation ```java\nstatic DiffResult noOp(List<? extends EpoxyModel<?>> models)\n```
 //                       documentation No changes were made to the models. 
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^^^^^^ definition local 0
+//                                                                      display_name models
 //                                                                      documentation ```java\n@Nullable\nList<? extends EpoxyModel<?>> models\n```
     if (models == null) {
 //      ^^^^^^ reference local 0
@@ -100,12 +106,14 @@ static DiffResult noOp(@Nullable List<? extends EpoxyModel<?>> models) {
   static DiffResult inserted(@NonNull List<? extends EpoxyModel<?>> newModels) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#inserted().
+//                           display_name inserted
 //                           documentation ```java\nstatic DiffResult inserted(List<? extends EpoxyModel<?>> newModels)\n```
 //                           documentation The previous list was empty and the given non empty list was inserted. 
 //                            ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^^^^^ definition local 1
+//                                                                            display_name newModels
 //                                                                            documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> newModels\n```
     //noinspection unchecked
     return new DiffResult(Collections.EMPTY_LIST, newModels, null);
@@ -119,12 +127,14 @@ static DiffResult inserted(@NonNull List<? extends EpoxyModel<?>> newModels) {
   static DiffResult clear(@NonNull List<? extends EpoxyModel<?>> previousModels) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                  ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#clear().
+//                        display_name clear
 //                        documentation ```java\nstatic DiffResult clear(List<? extends EpoxyModel<?>> previousModels)\n```
 //                        documentation The previous list was non empty and the new list is empty. 
 //                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^^^^^^^^^^^^^^ definition local 2
+//                                                                              display_name previousModels
 //                                                                              documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> previousModels\n```
     //noinspection unchecked
     return new DiffResult(previousModels, Collections.EMPTY_LIST, null);
@@ -141,6 +151,7 @@ static DiffResult clear(@NonNull List<? extends EpoxyModel<?>> previousModels) {
   static DiffResult diff(
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                  ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#diff().
+//                       display_name diff
 //                       documentation ```java\nstatic DiffResult diff(List<? extends EpoxyModel<?>> previousModels, List<? extends EpoxyModel<?>> newModels, unresolved_type differResult)\n```
 //                       documentation  The previous and new models are both non empty and a full differ pass was run on them.\n There may be no changes, however.\n
       @NonNull List<? extends EpoxyModel<?>> previousModels,
@@ -148,18 +159,21 @@ static DiffResult diff(
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^^^^^^ definition local 3
+//                                                          display_name previousModels
 //                                                          documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> previousModels\n```
       @NonNull List<? extends EpoxyModel<?>> newModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^ definition local 4
+//                                                     display_name newModels
 //                                                     documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> newModels\n```
       @NonNull DiffUtil.DiffResult differResult
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //                      ^^^^^^^^^^ reference semanticdb maven . . DiffUtil/DiffResult#
 //                                 ^^^^^^^^^^^^ definition local 5
+//                                              display_name differResult
 //                                              documentation ```java\n@NonNull\nunresolved_type differResult\n```
   ) {
     return new DiffResult(previousModels, newModels, differResult);
@@ -171,24 +185,28 @@ static DiffResult diff(
 
   private DiffResult(
 //        ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
+//                   display_name <init>
 //                   documentation ```java\nprivate DiffResult(List<? extends EpoxyModel<?>> previousModels, List<? extends EpoxyModel<?>> newModels, unresolved_type differResult)\n```
       @NonNull List<? extends EpoxyModel<?>> previousModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^^^^^^ definition local 6
+//                                                          display_name previousModels
 //                                                          documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> previousModels\n```
       @NonNull List<? extends EpoxyModel<?>> newModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^ definition local 7
+//                                                     display_name newModels
 //                                                     documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> newModels\n```
       @Nullable DiffUtil.DiffResult differResult
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //                       ^^^^^^^^^^ reference semanticdb maven . . DiffUtil/DiffResult#
 //                                  ^^^^^^^^^^^^ definition local 8
+//                                               display_name differResult
 //                                               documentation ```java\n@Nullable\nunresolved_type differResult\n```
   ) {
     this.previousModels = previousModels;
@@ -204,9 +222,11 @@ private DiffResult(
 
   public void dispatchTo(Adapter adapter) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo().
+//                       display_name dispatchTo
 //                       documentation ```java\npublic void dispatchTo(unresolved_type adapter)\n```
 //                       ^^^^^^^ reference semanticdb maven . . Adapter#
 //                               ^^^^^^^ definition local 9
+//                                       display_name adapter
 //                                       documentation ```java\nunresolved_type adapter\n```
     dispatchTo(new AdapterListUpdateCallback(adapter));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo().
@@ -215,9 +235,11 @@ public void dispatchTo(Adapter adapter) {
 
   public void dispatchTo(ListUpdateCallback callback) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo(+1).
+//                       display_name dispatchTo
 //                       documentation ```java\npublic void dispatchTo(unresolved_type callback)\n```
 //                       ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . ListUpdateCallback#
 //                                          ^^^^^^^^ definition local 10
+//                                                   display_name callback
 //                                                   documentation ```java\nunresolved_type callback\n```
     if (differResult != null) {
 //      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#differResult.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
index cbbf7cec5..9d1be6aec 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
@@ -36,17 +36,20 @@
 //^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 public abstract class EpoxyAdapter extends BaseEpoxyAdapter {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#
+//                                 display_name EpoxyAdapter
 //                                 documentation ```java\n@SuppressWarnings("WeakerAccess")\npublic abstract class EpoxyAdapter\n```
 //                                 documentation  Allows you to easily combine different view types in the same adapter, and handles view holder\n creation, binding, and ids for you. Subclasses just need to add their desired {@link EpoxyModel}\n objects and the rest is done automatically.\n <p/>\n {@link androidx.recyclerview.widget.RecyclerView.Adapter#setHasStableIds(boolean)} is set to true\n by default, since {@link EpoxyModel} makes it easy to support unique ids. If you don't want to\n support this then disable it in your base class (not recommended).\n
 //                                 relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                 relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                 relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#`<init>`().
+//                                 display_name <init>
 //                                 documentation ```java\npublic EpoxyAdapter()\n```
 //                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
   private final HiddenEpoxyModel hiddenModel = new HiddenEpoxyModel();
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#
 //                               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hiddenModel.
+//                                           display_name hiddenModel
 //                                           documentation ```java\nprivate final HiddenEpoxyModel hiddenModel\n```
 //                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
 
@@ -58,12 +61,14 @@ public abstract class EpoxyAdapter extends BaseEpoxyAdapter {
 //                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
+//                                           display_name models
 //                                           documentation ```java\nprotected final List<EpoxyModel<?>> models\n```
 //                                           documentation  Subclasses should modify this list as necessary with the models they want to show. Subclasses\n are responsible for notifying data changes whenever this list is changed.\n
 //                                                 ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`(+1).
   private DiffHelper diffHelper;
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#
 //                   ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#diffHelper.
+//                              display_name diffHelper
 //                              documentation ```java\nprivate DiffHelper diffHelper\n```
 
   @Override
@@ -72,6 +77,7 @@ List<EpoxyModel<?>> getCurrentModels() {
 //^^^^ reference semanticdb maven jdk 11 java/util/List#
 //     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getCurrentModels().
+//                                     display_name getCurrentModels
 //                                     documentation ```java\n@Override\nList<EpoxyModel<?>> getCurrentModels()\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
     return models;
@@ -86,6 +92,7 @@ List<EpoxyModel<?>> getCurrentModels() {
    */
   protected void enableDiffing() {
 //               ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#enableDiffing().
+//                             display_name enableDiffing
 //                             documentation ```java\nprotected void enableDiffing()\n```
 //                             documentation  Enables support for automatically notifying model changes via {@link #notifyModelsChanged()}.\n If used, this should be called in the constructor, before any models are changed.\n\n @see #notifyModelsChanged()\n
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#enableDiffing().
@@ -118,13 +125,16 @@ protected void enableDiffing() {
   EpoxyModel<?> getModelForPosition(int position) {
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
+//                                  display_name getModelForPosition
 //                                  documentation ```java\n@Override\nEpoxyModel<?> getModelForPosition(int position)\n```
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                      ^^^^^^^^ definition local 0
+//                                               display_name position
 //                                               documentation ```java\nint position\n```
     EpoxyModel<?> model = models.get(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 1
+//                      display_name model
 //                      documentation ```java\nEpoxyModel<?> model\n```
 //                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                               ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -151,6 +161,7 @@ EpoxyModel<?> getModelForPosition(int position) {
 
   protected void notifyModelsChanged() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelsChanged().
+//                                   display_name notifyModelsChanged
 //                                   documentation ```java\nprotected void notifyModelsChanged()\n```
 //                                   documentation  Intelligently notify item changes by comparing the current {@link #models} list against the\n previous so you don't have to micromanage notification calls yourself. This may be\n prohibitively slow for large model lists (in the hundreds), in which case consider doing\n notification calls yourself. If you use this, all your view models must implement {@link\n EpoxyModel#hashCode()} and {@link EpoxyModel#equals(Object)} to completely identify their\n state, so that changes to a model's content can be detected. Before using this you must enable\n it with {@link #enableDiffing()}, since keeping track of the model state adds extra computation\n time to all other data change notifications.\n\n @see #enableDiffing()\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelsChanged().
@@ -171,11 +182,13 @@ protected void notifyModelsChanged() {
    */
   protected void notifyModelChanged(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
+//                                  display_name notifyModelChanged
 //                                  documentation ```java\nprotected void notifyModelChanged(EpoxyModel<?> model)\n```
 //                                  documentation  Notify that the given model has had its data changed. It should only be called if the model\n retained the same position.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged().
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^ definition local 2
+//                                                      display_name model
 //                                                      documentation ```java\nEpoxyModel<?> model\n```
     notifyModelChanged(model, null);
 //  ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
@@ -188,17 +201,21 @@ protected void notifyModelChanged(EpoxyModel<?> model) {
    */
   protected void notifyModelChanged(EpoxyModel<?> model, @Nullable Object payload) {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
+//                                  display_name notifyModelChanged
 //                                  documentation ```java\nprotected void notifyModelChanged(EpoxyModel<?> model, Object payload)\n```
 //                                  documentation  Notify that the given model has had its data changed. It should only be called if the model\n retained the same position.\n
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^ definition local 3
+//                                                      display_name model
 //                                                      documentation ```java\nEpoxyModel<?> model\n```
 //                                                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                        ^^^^^^^ definition local 4
+//                                                                                display_name payload
 //                                                                                documentation ```java\n@Nullable\nObject payload\n```
     int index = getModelPosition(model);
 //      ^^^^^ definition local 5
+//            display_name index
 //            documentation ```java\nint index\n```
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 3
@@ -216,13 +233,16 @@ protected void notifyModelChanged(EpoxyModel<?> model, @Nullable Object payload)
    */
   protected void addModel(EpoxyModel<?> modelToAdd) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModel().
+//                        display_name addModel
 //                        documentation ```java\nprotected void addModel(EpoxyModel<?> modelToAdd)\n```
 //                        documentation  Adds the model to the end of the {@link #models} list and notifies that the item was inserted.\n
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^ definition local 6
+//                                                 display_name modelToAdd
 //                                                 documentation ```java\nEpoxyModel<?> modelToAdd\n```
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 7
+//                  display_name initialSize
 //                  documentation ```java\nint initialSize\n```
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -247,19 +267,23 @@ protected void addModel(EpoxyModel<?> modelToAdd) {
    */
   protected void addModels(EpoxyModel<?>... modelsToAdd) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
+//                         display_name addModels
 //                         documentation ```java\nprotected void addModels(EpoxyModel<?>[] modelsToAdd)\n```
 //                         documentation  Adds the models to the end of the {@link #models} list and notifies that the items were\n inserted.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^^^^^^ definition local 8
+//                                                      display_name modelsToAdd
 //                                                      documentation ```java\nEpoxyModel<?>[] modelsToAdd\n```
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 9
+//                  display_name initialSize
 //                  documentation ```java\nint initialSize\n```
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     int numModelsToAdd = modelsToAdd.length;
 //      ^^^^^^^^^^^^^^ definition local 10
+//                     display_name numModelsToAdd
 //                     documentation ```java\nint numModelsToAdd\n```
 //                       ^^^^^^^^^^^ reference local 8
 //                                   ^^^^^^ reference semanticdb maven . . Array#length.
@@ -293,15 +317,18 @@ protected void addModels(EpoxyModel<?>... modelsToAdd) {
    */
   protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
+//                         display_name addModels
 //                         documentation ```java\nprotected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd)\n```
 //                         documentation  Adds the models to the end of the {@link #models} list and notifies that the items were\n inserted.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1).
 //                         ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^^^^^^^^^^^ definition local 11
+//                                                                         display_name modelsToAdd
 //                                                                         documentation ```java\nCollection<? extends EpoxyModel<?>> modelsToAdd\n```
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 12
+//                  display_name initialSize
 //                  documentation ```java\nint initialSize\n```
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -328,17 +355,21 @@ protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
    */
   protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
+//                                 display_name insertModelBefore
 //                                 documentation ```java\nprotected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore)\n```
 //                                 documentation  Inserts the given model before the other in the {@link #models} list, and notifies that the\n item was inserted.\n
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore().
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^^^ definition local 13
+//                                                             display_name modelToInsert
 //                                                             documentation ```java\nEpoxyModel<?> modelToInsert\n```
 //                                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                            ^^^^^^^^^^^^^^^^^^^ definition local 14
+//                                                                                                display_name modelToInsertBefore
 //                                                                                                documentation ```java\nEpoxyModel<?> modelToInsertBefore\n```
     int targetIndex = getModelPosition(modelToInsertBefore);
 //      ^^^^^^^^^^^ definition local 15
+//                  display_name targetIndex
 //                  documentation ```java\nint targetIndex\n```
 //                    ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                                     ^^^^^^^^^^^^^^^^^^^ reference local 14
@@ -370,17 +401,21 @@ protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> mode
    */
   protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter) {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
+//                                display_name insertModelAfter
 //                                documentation ```java\nprotected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter)\n```
 //                                documentation  Inserts the given model after the other in the {@link #models} list, and notifies that the item\n was inserted.\n
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter().
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^^^^^^^^ definition local 16
+//                                                            display_name modelToInsert
 //                                                            documentation ```java\nEpoxyModel<?> modelToInsert\n```
 //                                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                           ^^^^^^^^^^^^^^^^^^ definition local 17
+//                                                                                              display_name modelToInsertAfter
 //                                                                                              documentation ```java\nEpoxyModel<?> modelToInsertAfter\n```
     int modelIndex = getModelPosition(modelToInsertAfter);
 //      ^^^^^^^^^^ definition local 18
+//                 display_name modelIndex
 //                 documentation ```java\nint modelIndex\n```
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                                    ^^^^^^^^^^^^^^^^^^ reference local 17
@@ -393,6 +428,7 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
 
     int targetIndex = modelIndex + 1;
 //      ^^^^^^^^^^^ definition local 19
+//                  display_name targetIndex
 //                  documentation ```java\nint targetIndex\n```
 //                    ^^^^^^^^^^ reference local 18
     pauseModelListNotifications();
@@ -416,14 +452,17 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
    */
   protected void removeModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
+//                           display_name removeModel
 //                           documentation ```java\nprotected void removeModel(EpoxyModel<?> model)\n```
 //                           documentation  If the given model exists it is removed and an item removal is notified. Otherwise this does\n nothing.\n
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel().
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^ definition local 20
+//                                               display_name model
 //                                               documentation ```java\nEpoxyModel<?> model\n```
     int index = getModelPosition(model);
 //      ^^^^^ definition local 21
+//            display_name index
 //            documentation ```java\nint index\n```
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 20
@@ -449,11 +488,13 @@ protected void removeModel(EpoxyModel<?> model) {
    */
   protected void removeAllModels() {
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllModels().
+//                               display_name removeAllModels
 //                               documentation ```java\nprotected void removeAllModels()\n```
 //                               documentation  Removes all models\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllModels().
     int numModelsRemoved = models.size();
 //      ^^^^^^^^^^^^^^^^ definition local 22
+//                       display_name numModelsRemoved
 //                       documentation ```java\nint numModelsRemoved\n```
 //                         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -478,26 +519,31 @@ protected void removeAllModels() {
    */
   protected void removeAllAfterModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
+//                                   display_name removeAllAfterModel
 //                                   documentation ```java\nprotected void removeAllAfterModel(EpoxyModel<?> model)\n```
 //                                   documentation  Removes all models after the given model, which must have already been added. An example use\n case is you want to keep a header but clear everything else, like in the case of refreshing\n data.\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel().
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^ definition local 23
+//                                                       display_name model
 //                                                       documentation ```java\nEpoxyModel<?> model\n```
     List<EpoxyModel<?>> modelsToRemove = getAllModelsAfter(model);
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^^^^ definition local 24
+//                                     display_name modelsToRemove
 //                                     documentation ```java\nList<EpoxyModel<?>> modelsToRemove\n```
 //                                       ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                                         ^^^^^ reference local 23
     int numModelsRemoved = modelsToRemove.size();
 //      ^^^^^^^^^^^^^^^^ definition local 25
+//                       display_name numModelsRemoved
 //                       documentation ```java\nint numModelsRemoved\n```
 //                         ^^^^^^^^^^^^^^ reference local 24
 //                                        ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     int initialModelCount = models.size();
 //      ^^^^^^^^^^^^^^^^^ definition local 26
+//                        display_name initialModelCount
 //                        documentation ```java\nint initialModelCount\n```
 //                          ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -527,13 +573,16 @@ protected void removeAllAfterModel(EpoxyModel<?> model) {
    */
   protected void showModel(EpoxyModel<?> model, boolean show) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
+//                         display_name showModel
 //                         documentation ```java\nprotected void showModel(EpoxyModel<?> model, boolean show)\n```
 //                         documentation  Sets the visibility of the given model, and notifies that the item changed if the new\n visibility is different from the previous.\n\n @param model The model to show. It should already be added to the {@link #models} list.\n @param show  True to show the model, false to hide it.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^ definition local 27
+//                                             display_name model
 //                                             documentation ```java\nEpoxyModel<?> model\n```
 //                                                      ^^^^ definition local 28
+//                                                           display_name show
 //                                                           documentation ```java\nboolean show\n```
     if (model.isShown() == show) {
 //      ^^^^^ reference local 27
@@ -558,11 +607,13 @@ protected void showModel(EpoxyModel<?> model, boolean show) {
    */
   protected void showModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
+//                         display_name showModel
 //                         documentation ```java\nprotected void showModel(EpoxyModel<?> model)\n```
 //                         documentation  Shows the given model, and notifies that the item changed if the item wasn't already shown.\n\n @param model The model to show. It should already be added to the {@link #models} list.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1).
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^ definition local 29
+//                                             display_name model
 //                                             documentation ```java\nEpoxyModel<?> model\n```
     showModel(model, true);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
@@ -576,11 +627,13 @@ protected void showModel(EpoxyModel<?> model) {
    */
   protected void showModels(EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
+//                          display_name showModels
 //                          documentation ```java\nprotected void showModels(EpoxyModel<?>[] models)\n```
 //                          documentation  Shows the given models, and notifies that each item changed if the item wasn't already shown.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels().
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^ definition local 30
+//                                                  display_name models
 //                                                  documentation ```java\nEpoxyModel<?>[] models\n```
     showModels(Arrays.asList(models));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
@@ -598,13 +651,16 @@ protected void showModels(EpoxyModel<?>... models) {
    */
   protected void showModels(boolean show, EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
+//                          display_name showModels
 //                          documentation ```java\nprotected void showModels(boolean show, EpoxyModel<?>[] models)\n```
 //                          documentation  Sets the visibility of the given models, and notifies that the items changed if the new\n visibility is different from the previous.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n @param show   True to show the models, false to hide them.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1).
 //                                  ^^^^ definition local 31
+//                                       display_name show
 //                                       documentation ```java\nboolean show\n```
 //                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                         ^^^^^^ definition local 32
+//                                                                display_name models
 //                                                                documentation ```java\nEpoxyModel<?>[] models\n```
     showModels(Arrays.asList(models), show);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
@@ -621,12 +677,14 @@ protected void showModels(boolean show, EpoxyModel<?>... models) {
    */
   protected void showModels(Iterable<EpoxyModel<?>> models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
+//                          display_name showModels
 //                          documentation ```java\nprotected void showModels(Iterable<EpoxyModel<?>> models)\n```
 //                          documentation  Shows the given models, and notifies that each item changed if the item wasn't already shown.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2).
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^ definition local 33
+//                                                         display_name models
 //                                                         documentation ```java\nIterable<EpoxyModel<?>> models\n```
     showModels(models, true);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
@@ -642,18 +700,22 @@ protected void showModels(Iterable<EpoxyModel<?>> models) {
    */
   protected void showModels(Iterable<EpoxyModel<?>> models, boolean show) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
+//                          display_name showModels
 //                          documentation ```java\nprotected void showModels(Iterable<EpoxyModel<?>> models, boolean show)\n```
 //                          documentation  Sets the visibility of the given models, and notifies that the items changed if the new\n visibility is different from the previous.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n @param show   True to show the models, false to hide them.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3).
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^ definition local 34
+//                                                         display_name models
 //                                                         documentation ```java\nIterable<EpoxyModel<?>> models\n```
 //                                                                  ^^^^ definition local 35
+//                                                                       display_name show
 //                                                                       documentation ```java\nboolean show\n```
     for (EpoxyModel<?> model : models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 36
+//                           display_name model
 //                           documentation ```java\nEpoxyModel<?> model\n```
 //                             ^^^^^^ reference local 34
       showModel(model, show);
@@ -670,11 +732,13 @@ protected void showModels(Iterable<EpoxyModel<?>> models, boolean show) {
    */
   protected void hideModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
+//                         display_name hideModel
 //                         documentation ```java\nprotected void hideModel(EpoxyModel<?> model)\n```
 //                         documentation  Hides the given model, and notifies that the item changed if the item wasn't already hidden.\n\n @param model The model to hide. This should already be added to the {@link #models} list.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^ definition local 37
+//                                             display_name model
 //                                             documentation ```java\nEpoxyModel<?> model\n```
     showModel(model, false);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
@@ -688,12 +752,14 @@ protected void hideModel(EpoxyModel<?> model) {
    */
   protected void hideModels(Iterable<EpoxyModel<?>> models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
+//                          display_name hideModels
 //                          documentation ```java\nprotected void hideModels(Iterable<EpoxyModel<?>> models)\n```
 //                          documentation  Hides the given models, and notifies that each item changed if the item wasn't already hidden.\n\n @param models The models to hide. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels().
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^ definition local 38
+//                                                         display_name models
 //                                                         documentation ```java\nIterable<EpoxyModel<?>> models\n```
     showModels(models, false);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
@@ -707,11 +773,13 @@ protected void hideModels(Iterable<EpoxyModel<?>> models) {
    */
   protected void hideModels(EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
+//                          display_name hideModels
 //                          documentation ```java\nprotected void hideModels(EpoxyModel<?>[] models)\n```
 //                          documentation  Hides the given models, and notifies that each item changed if the item wasn't already hidden.\n\n @param models The models to hide. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1).
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^ definition local 39
+//                                                  display_name models
 //                                                  documentation ```java\nEpoxyModel<?>[] models\n```
     hideModels(Arrays.asList(models));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
@@ -727,11 +795,13 @@ protected void hideModels(EpoxyModel<?>... models) {
    */
   protected void hideAllAfterModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
+//                                 display_name hideAllAfterModel
 //                                 documentation ```java\nprotected void hideAllAfterModel(EpoxyModel<?> model)\n```
 //                                 documentation  Hides all models currently located after the given model in the {@link #models} list.\n\n @param model The model after which to hide. It must exist in the {@link #models} list.\n
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel().
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^ definition local 40
+//                                                     display_name model
 //                                                     documentation ```java\nEpoxyModel<?> model\n```
     hideModels(getAllModelsAfter(model));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
@@ -750,14 +820,17 @@ protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //          ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
+//                                                display_name getAllModelsAfter
 //                                                documentation ```java\nprotected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model)\n```
 //                                                documentation  Returns a sub list of all items in {@link #models} that occur after the given model. This list\n is backed by the original models list, any changes to the returned list will be reflected in\n the original {@link #models} list.\n\n @param model Must exist in {@link #models}.\n
 //                                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter().
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                              ^^^^^ definition local 41
+//                                                                    display_name model
 //                                                                    documentation ```java\nEpoxyModel<?> model\n```
     int index = getModelPosition(model);
 //      ^^^^^ definition local 42
+//            display_name index
 //            documentation ```java\nint index\n```
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 41
@@ -782,6 +855,7 @@ protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
    */
   private void pauseModelListNotifications() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#pauseModelListNotifications().
+//                                         display_name pauseModelListNotifications
 //                                         documentation ```java\nprivate void pauseModelListNotifications()\n```
 //                                         documentation  We pause the list's notifications when we modify models internally, since we already do the\n proper adapter notifications for those modifications. By pausing these list notifications we\n prevent the differ having to do work to track them.\n
     ((ModelList) models).pauseNotifications();
@@ -792,6 +866,7 @@ private void pauseModelListNotifications() {
 
   private void resumeModelListNotifications() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#resumeModelListNotifications().
+//                                          display_name resumeModelListNotifications
 //                                          documentation ```java\nprivate void resumeModelListNotifications()\n```
     ((ModelList) models).resumeNotifications();
 //    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
index 7699b8fb5..5fd5931af 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
@@ -36,10 +36,12 @@
  */
 public final class EpoxyAsyncUtil {
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#
+//                                display_name EpoxyAsyncUtil
 //                                documentation ```java\npublic final class EpoxyAsyncUtil\n```
 //                                documentation  Various helpers for running Epoxy operations off the main thread.\n
   private EpoxyAsyncUtil() {
 //        ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\nprivate EpoxyAsyncUtil()\n```
   }
 
@@ -49,6 +51,7 @@ private EpoxyAsyncUtil() {
   public static final Handler MAIN_THREAD_HANDLER =
 //                    ^^^^^^^ reference semanticdb maven . . Handler#
 //                            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#MAIN_THREAD_HANDLER.
+//                                                display_name MAIN_THREAD_HANDLER
 //                                                documentation ```java\npublic static final unresolved_type MAIN_THREAD_HANDLER\n```
 //                                                documentation  A Handler class that uses the main thread's Looper.\n
       createHandler(Looper.getMainLooper(), false);
@@ -64,6 +67,7 @@ private EpoxyAsyncUtil() {
   public static final Handler AYSNC_MAIN_THREAD_HANDLER =
 //                    ^^^^^^^ reference semanticdb maven . . Handler#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#AYSNC_MAIN_THREAD_HANDLER.
+//                                                      display_name AYSNC_MAIN_THREAD_HANDLER
 //                                                      documentation ```java\npublic static final unresolved_type AYSNC_MAIN_THREAD_HANDLER\n```
 //                                                      documentation  A Handler class that uses the main thread's Looper. Additionally, this handler calls\n {@link Message#setAsynchronous(boolean)} for\n each {@link Message} that is sent to it or {@link Runnable} that is posted to it\n
       createHandler(Looper.getMainLooper(), true);
@@ -74,6 +78,7 @@ private EpoxyAsyncUtil() {
   private static Handler asyncBackgroundHandler;
 //               ^^^^^^^ reference semanticdb maven . . Handler#
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#asyncBackgroundHandler.
+//                                              display_name asyncBackgroundHandler
 //                                              documentation ```java\nprivate static unresolved_type asyncBackgroundHandler\n```
 
   /**
@@ -86,6 +91,7 @@ private EpoxyAsyncUtil() {
   public static Handler getAsyncBackgroundHandler() {
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#getAsyncBackgroundHandler().
+//                                                display_name getAsyncBackgroundHandler
 //                                                documentation ```java\n@MainThread\npublic static unresolved_type getAsyncBackgroundHandler()\n```
 //                                                documentation  A Handler class that uses a separate background thread dedicated to Epoxy. Additionally,\n this handler calls {@link Message#setAsynchronous(boolean)} for\n each {@link Message} that is sent to it or {@link Runnable} that is posted to it\n
     // This is initialized lazily so we don't create the thread unless it will be used.
@@ -111,12 +117,15 @@ public static Handler getAsyncBackgroundHandler() {
   public static Handler createHandler(Looper looper, boolean async) {
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
+//                                    display_name createHandler
 //                                    documentation ```java\npublic static unresolved_type createHandler(unresolved_type looper, boolean async)\n```
 //                                    documentation  Create a Handler with the given Looper\n\n @param async If true the Handler will calls {@link Message#setAsynchronous(boolean)} for\n              each {@link Message} that is sent to it or {@link Runnable} that is posted to it.\n
 //                                    ^^^^^^ reference semanticdb maven . . Looper#
 //                                           ^^^^^^ definition local 0
+//                                                  display_name looper
 //                                                  documentation ```java\nunresolved_type looper\n```
 //                                                           ^^^^^ definition local 1
+//                                                                 display_name async
 //                                                                 documentation ```java\nboolean async\n```
     if (!async) {
 //       ^^^^^ reference local 1
@@ -157,6 +166,7 @@ public static Handler createHandler(Looper looper, boolean async) {
       } catch (Throwable ignored) {
 //             ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Throwable#
 //                       ^^^^^^^ definition local 2
+//                               display_name ignored
 //                               documentation ```java\nThrowable ignored\n```
       }
     }
@@ -171,14 +181,17 @@ public static Handler createHandler(Looper looper, boolean async) {
   public static Looper buildBackgroundLooper(String threadName) {
 //              ^^^^^^ reference semanticdb maven . . Looper#
 //                     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#buildBackgroundLooper().
+//                                           display_name buildBackgroundLooper
 //                                           documentation ```java\npublic static unresolved_type buildBackgroundLooper(String threadName)\n```
 //                                           documentation  Create a new looper that runs on a new background thread.\n
 //                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                                  ^^^^^^^^^^ definition local 3
+//                                                             display_name threadName
 //                                                             documentation ```java\nString threadName\n```
     HandlerThread handlerThread = new HandlerThread(threadName);
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . HandlerThread#
 //                ^^^^^^^^^^^^^ definition local 4
+//                              display_name handlerThread
 //                              documentation ```java\nunresolved_type handlerThread\n```
 //                                                  ^^^^^^^^^^ reference local 3
     handlerThread.start();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
index 00b2ae544..6b254ae7a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
@@ -113,6 +113,7 @@
  */
 public abstract class EpoxyController implements ModelCollector, StickyHeaderCallbacks {
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#
+//                                    display_name EpoxyController
 //                                    documentation ```java\npublic abstract class EpoxyController\n```
 //                                    documentation  A controller for easily combining {@link EpoxyModel} instances in a {@link RecyclerView.Adapter}.\n Simply implement {@link #buildModels()} to declare which models should be used, and in which\n order. Call {@link #requestModelBuild()} whenever your data changes, and the controller will call\n {@link #buildModels()}, update the adapter with the new models, and notify any changes between\n the new and old models.\n <p>\n The controller maintains a {@link androidx.recyclerview.widget.RecyclerView.Adapter} with the\n latest models, which you can get via {@link #getAdapter()} to set on your RecyclerView.\n <p>\n All data change notifications are applied automatically via Epoxy's diffing algorithm. All of\n your models must have a unique id set on them for diffing to work. You may choose to use {@link\n AutoModel} annotations to have the controller create models with unique ids for you\n automatically.\n <p>\n Once a model is created and added to the controller in {@link #buildModels()} it should be\n treated as immutable and never modified again. This is necessary for adapter updates to be\n accurate.\n
 //                                    relationship is_implementation semanticdb maven . . ModelCollector#
@@ -129,17 +130,20 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
    */
   private static final int DELAY_TO_CHECK_ADAPTER_COUNT_MS = 3000;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#DELAY_TO_CHECK_ADAPTER_COUNT_MS.
+//                                                         display_name DELAY_TO_CHECK_ADAPTER_COUNT_MS
 //                                                         documentation ```java\nprivate static final int DELAY_TO_CHECK_ADAPTER_COUNT_MS\n```
 //                                                         documentation  We check that the adapter is not connected to multiple recyclerviews, but when a fragment has\n its view quickly destroyed and recreated it may temporarily attach the same adapter to the\n previous view and the new view (eg because of fragment transitions) if the controller is reused\n across views. We want to allow this case since it is a brief transient state. This should be\n enough time for screen transitions to happen.\n
   private static final Timer NO_OP_TIMER = new NoOpTimer();
 //                     ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#NO_OP_TIMER.
+//                                       display_name NO_OP_TIMER
 //                                       documentation ```java\nprivate static final Timer NO_OP_TIMER\n```
 //                                             ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpTimer#`<init>`().
 
   public static Handler defaultModelBuildingHandler = MainThreadExecutor.INSTANCE.handler;
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#defaultModelBuildingHandler.
+//                                                  display_name defaultModelBuildingHandler
 //                                                  documentation ```java\npublic static unresolved_type defaultModelBuildingHandler\n```
 //                                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                                                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
@@ -147,31 +151,38 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
   public static Handler defaultDiffingHandler = MainThreadExecutor.INSTANCE.handler;
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#defaultDiffingHandler.
+//                                            display_name defaultDiffingHandler
 //                                            documentation ```java\npublic static unresolved_type defaultDiffingHandler\n```
 //                                              ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                                                 ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
 //                                                                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
   private static boolean filterDuplicatesDefault = false;
 //                       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesDefault.
+//                                               display_name filterDuplicatesDefault
 //                                               documentation ```java\nprivate static boolean filterDuplicatesDefault\n```
   private static boolean globalDebugLoggingEnabled = false;
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalDebugLoggingEnabled.
+//                                                 display_name globalDebugLoggingEnabled
 //                                                 documentation ```java\nprivate static boolean globalDebugLoggingEnabled\n```
 
   private final EpoxyControllerAdapter adapter;
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#
 //                                     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
+//                                             display_name adapter
 //                                             documentation ```java\nprivate final EpoxyControllerAdapter adapter\n```
   private EpoxyDiffLogger debugObserver;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#
 //                        ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#debugObserver.
+//                                      display_name debugObserver
 //                                      documentation ```java\nprivate EpoxyDiffLogger debugObserver\n```
   private int recyclerViewAttachCount = 0;
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
+//                                    display_name recyclerViewAttachCount
 //                                    documentation ```java\nprivate int recyclerViewAttachCount\n```
   private final Handler modelBuildHandler;
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelBuildHandler.
+//                                        display_name modelBuildHandler
 //                                        documentation ```java\nprivate final unresolved_type modelBuildHandler\n```
 
   /**
@@ -182,6 +193,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                   ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
+//                                             display_name interceptors
 //                                             documentation ```java\nprivate final List<Interceptor> interceptors\n```
 //                                             documentation  This is iterated over in the build models thread, but items can be inserted or removed from\n other threads at any time.\n
 //                                                   ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/CopyOnWriteArrayList#`<init>`().
@@ -189,6 +201,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
   // Volatile because -> write only on main thread, read from builder thread
   private volatile boolean filterDuplicates = filterDuplicatesDefault;
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
+//                                          display_name filterDuplicates
 //                                          documentation ```java\nprivate boolean filterDuplicates\n```
 //                                            ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesDefault.
   /**
@@ -201,6 +214,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
   private volatile Thread threadBuildingModels = null;
 //                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/Thread#
 //                        ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#threadBuildingModels.
+//                                             display_name threadBuildingModels
 //                                             documentation ```java\nprivate Thread threadBuildingModels\n```
 //                                             documentation  This is used to track whether we are currently building models. If it is non null it means\n a thread is in the building models method. We store the thread so we can know which one\n is building models.\n <p>\n Volatile because -> write only on handler, read from any thread\n
   /**
@@ -210,6 +224,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
    */
   private volatile boolean hasBuiltModelsEver;
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#hasBuiltModelsEver.
+//                                            display_name hasBuiltModelsEver
 //                                            documentation ```java\nprivate boolean hasBuiltModelsEver\n```
 //                                            documentation  Used to know that we should build models synchronously the first time.\n <p>\n Volatile because -> written from the build models thread, read from the main thread.\n
 
@@ -224,32 +239,38 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
   private Timer timer = NO_OP_TIMER;
 //        ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
+//                    display_name timer
 //                    documentation ```java\nprivate Timer timer\n```
 //                    documentation Used to time operations and log their duration when in debug mode. 
 //                      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#NO_OP_TIMER.
   private final ControllerHelper helper = getHelperForController(this);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#helper.
+//                                      display_name helper
 //                                      documentation ```java\nprivate final ControllerHelper helper\n```
 //                                        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
   private ControllerModelList modelsBeingBuilt;
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
 //                            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
+//                                             display_name modelsBeingBuilt
 //                                             documentation ```java\nprivate ControllerModelList modelsBeingBuilt\n```
   private List<ModelInterceptorCallback> modelInterceptorCallbacks;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
+//                                                                 display_name modelInterceptorCallbacks
 //                                                                 documentation ```java\nprivate List<ModelInterceptorCallback> modelInterceptorCallbacks\n```
   private EpoxyModel<?> stagedModel;
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
+//                                  display_name stagedModel
 //                                  documentation ```java\nprivate EpoxyModel<?> stagedModel\n```
 
   //////////////////////////////////////////////////////////////////////////////////////////
 
   public EpoxyController() {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\npublic EpoxyController()\n```
     this(defaultModelBuildingHandler, defaultDiffingHandler);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
@@ -259,12 +280,15 @@ public EpoxyController() {
 
   public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
+//                       display_name <init>
 //                       documentation ```java\npublic EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
 //                       ^^^^^^^ reference semanticdb maven . . Handler#
 //                               ^^^^^^^^^^^^^^^^^^^^ definition local 0
+//                                                    display_name modelBuildingHandler
 //                                                    documentation ```java\nunresolved_type modelBuildingHandler\n```
 //                                                     ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                             ^^^^^^^^^^^^^^ definition local 1
+//                                                                            display_name diffingHandler
 //                                                                            documentation ```java\nunresolved_type diffingHandler\n```
     adapter = new EpoxyControllerAdapter(this, diffingHandler);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -288,6 +312,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
   @RequestedModelBuildType private volatile int requestedModelBuildType =
 // ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
 //                                              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestedModelBuildType.
+//                                                                      display_name requestedModelBuildType
 //                                                                      documentation ```java\n@RequestedModelBuildType\nprivate int requestedModelBuildType\n```
 //                                                                      documentation  Posting and canceling runnables is a bit expensive - it is synchronizes and iterates the\n list of runnables. We want clients to be able to request model builds as often as they want and\n have it act as a no-op if one is already requested, without being a performance hit. To do that\n we track whether we have a call to build models posted already so we can avoid canceling a\n current call and posting it again.\n
       RequestedModelBuildType.NONE;
@@ -301,6 +326,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
   @IntDef({RequestedModelBuildType.NONE,
 // ^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IntDef#
 //         ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
+//                                 display_name RequestedModelBuildType
 //                                 documentation ```java\n@Retention(RetentionPolicy.SOURCE)\n@IntDef({RequestedModelBuildType.NONE, RequestedModelBuildType.NEXT_FRAME, RequestedModelBuildType.DELAYED})\nprivate @interface RequestedModelBuildType\n```
 //                                 relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
@@ -314,15 +340,18 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
   private @interface RequestedModelBuildType {
     int NONE = 0;
 //      ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE.
+//           display_name NONE
 //           documentation ```java\npublic static final int NONE\n```
     /** A request has been made to build models immediately. It is posted. */
     int NEXT_FRAME = 1;
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NEXT_FRAME.
+//                 display_name NEXT_FRAME
 //                 documentation ```java\npublic static final int NEXT_FRAME\n```
 //                 documentation A request has been made to build models immediately. It is posted. 
     /** A request has been made to build models after a delay. It is post delayed. */
     int DELAYED = 2;
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#DELAYED.
+//              display_name DELAYED
 //              documentation ```java\npublic static final int DELAYED\n```
 //              documentation A request has been made to build models after a delay. It is post delayed. 
   }
@@ -342,6 +371,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
    */
   public void requestModelBuild() {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
+//                              display_name requestModelBuild
 //                              documentation ```java\npublic void requestModelBuild()\n```
 //                              documentation  Call this to request a model update. The controller will schedule a call to {@link\n #buildModels()} so that models can be rebuilt for the current data. Once a build is requested\n all subsequent requests are ignored until the model build runs. Therefore, the calling code\n need not worry about calling this multiple times in a row.\n <p>\n The exception is that the first time this is called on a new instance of {@link\n EpoxyController} it is run synchronously. This allows state to be restored and the initial view\n to be draw quicker.\n <p>\n If you would like to be alerted when models have finished building use\n {@link #addModelBuildListener(OnModelBuildFinishedListener)}\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#requestModelBuild().
@@ -378,6 +408,7 @@ public void requestModelBuild() {
    */
   public boolean hasPendingModelBuild() {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#hasPendingModelBuild().
+//                                    display_name hasPendingModelBuild
 //                                    documentation ```java\npublic boolean hasPendingModelBuild()\n```
 //                                    documentation  Whether an update to models is currently pending. This can either be because\n {@link #requestModelBuild()} was called, or because models are currently being built or diff\n on a background thread.\n
     return requestedModelBuildType != RequestedModelBuildType.NONE // model build is posted
@@ -403,10 +434,12 @@ public boolean hasPendingModelBuild() {
    */
   public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addModelBuildListener().
+//                                  display_name addModelBuildListener
 //                                  documentation ```java\npublic void addModelBuildListener(OnModelBuildFinishedListener listener)\n```
 //                                  documentation  Add a listener that will be called every time {@link #buildModels()} has finished running\n and changes have been dispatched to the RecyclerView.\n <p>\n Since buildModels can be called once for many calls to {@link #requestModelBuild()}, this is\n called just once for each buildModels execution, not for every request.\n <p>\n Use this to react to changes in your models that need to happen after the RecyclerView has\n been notified, such as scrolling.\n
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                               ^^^^^^^^ definition local 2
+//                                                                        display_name listener
 //                                                                        documentation ```java\nOnModelBuildFinishedListener listener\n```
     adapter.addModelBuildListener(listener);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -421,10 +454,12 @@ public void addModelBuildListener(OnModelBuildFinishedListener listener) {
    */
   public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#removeModelBuildListener().
+//                                     display_name removeModelBuildListener
 //                                     documentation ```java\npublic void removeModelBuildListener(OnModelBuildFinishedListener listener)\n```
 //                                     documentation  Remove a listener added with {@link #addModelBuildListener(OnModelBuildFinishedListener)}.\n This is safe to call from inside the callback\n {@link OnModelBuildFinishedListener#onModelBuildFinished(DiffResult)}\n
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                                  ^^^^^^^^ definition local 3
+//                                                                           display_name listener
 //                                                                           documentation ```java\nOnModelBuildFinishedListener listener\n```
     adapter.removeModelBuildListener(listener);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -453,6 +488,7 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
    */
   public synchronized void requestDelayedModelBuild(int delayMs) {
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
+//                                                  display_name requestDelayedModelBuild
 //                                                  documentation ```java\npublic void requestDelayedModelBuild(int delayMs)\n```
 //                                                  documentation  Call this to request a delayed model update. The controller will schedule a call to {@link\n #buildModels()} so that models can be rebuilt for the current data.\n <p>\n Using this to delay a model update may be helpful in cases where user input is causing many\n rapid changes in the models, such as typing. In that case, the view is already updated on\n screen and constantly rebuilding models is potentially slow and unnecessary. The downside to\n delaying the model build too long is that models will not be in sync with the data or view, and\n scrolling the view offscreen and back onscreen will cause the model to bind old data.\n <p>\n If a previous request is still pending it will be removed in favor of this new delay\n <p>\n Any call to {@link #requestModelBuild()} will override a delayed request.\n <p>\n In most cases you should use {@link #requestModelBuild()} instead of this.\n\n @param delayMs The time in milliseconds to delay the model build by. Should be greater than or\n                equal to 0. A value of 0 is equivalent to calling {@link #requestModelBuild()}\n
 //                                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild().
@@ -460,6 +496,7 @@ public synchronized void requestDelayedModelBuild(int delayMs) {
 //                                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#requestDelayedModelBuild().
 //                                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestDelayedModelBuild().
 //                                                      ^^^^^^^ definition local 4
+//                                                              display_name delayMs
 //                                                              documentation ```java\nint delayMs\n```
     if (isBuildingModels()) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -503,6 +540,7 @@ public synchronized void requestDelayedModelBuild(int delayMs) {
    */
   public synchronized void cancelPendingModelBuild() {
 //                         ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#cancelPendingModelBuild().
+//                                                 display_name cancelPendingModelBuild
 //                                                 documentation ```java\npublic void cancelPendingModelBuild()\n```
 //                                                 documentation  Cancels a pending call to {@link #buildModels()} if one has been queued by {@link\n #requestModelBuild()}.\n
     // Access to requestedModelBuildType is synchronized because the model building thread clears
@@ -529,12 +567,14 @@ public synchronized void cancelPendingModelBuild() {
   private final Runnable buildModelsRunnable = new Runnable() {
 //              ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModelsRunnable.
+//                                           display_name buildModelsRunnable
 //                                           documentation ```java\nprivate final Runnable buildModelsRunnable\n```
 //                                                 ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void run() {
 //              ^^^ definition local 6
+//                  display_name run
 //                  documentation ```java\n@Override\npublic void run()\n```
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
       // Do this first to mark the controller as being in the model building process.
@@ -573,6 +613,7 @@ public void run() {
       } catch (Throwable throwable) {
 //             ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Throwable#
 //                       ^^^^^^^^^ definition local 7
+//                                 display_name throwable
 //                                 documentation ```java\nThrowable throwable\n```
         timer.stop();
 //      ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
@@ -628,10 +669,12 @@ public void run() {
   /** An estimate for how many models will be built in the next {@link #buildModels()} phase. */
   private int getExpectedModelCount() {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getExpectedModelCount().
+//                                  display_name getExpectedModelCount
 //                                  documentation ```java\nprivate int getExpectedModelCount()\n```
 //                                  documentation An estimate for how many models will be built in the next {@link #buildModels()} phase. 
     int currentModelCount = adapter.getItemCount();
 //      ^^^^^^^^^^^^^^^^^ definition local 8
+//                        display_name currentModelCount
 //                        documentation ```java\nint currentModelCount\n```
 //                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
@@ -655,6 +698,7 @@ private int getExpectedModelCount() {
    */
   protected abstract void buildModels();
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
+//                                    display_name buildModels
 //                                    documentation ```java\nprotected abstract void buildModels()\n```
 //                                    documentation  Subclasses should implement this to describe what models should be shown for the current state.\n Implementations should call either {@link #add(EpoxyModel)}, {@link\n EpoxyModel#addTo(EpoxyController)}, or {@link EpoxyModel#addIf(boolean, EpoxyController)} with\n the models that should be shown, in the order that is desired.\n <p>\n Once a model is added to the controller it should be treated as immutable and never modified\n again. This is necessary for adapter updates to be accurate. If "validateEpoxyModelUsage" is\n enabled then runtime validations will be done to make sure models are not changed.\n <p>\n You CANNOT call this method directly. Instead, call {@link #requestModelBuild()} to have the\n controller schedule an update.\n
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#buildModels().
@@ -665,20 +709,24 @@ private int getExpectedModelCount() {
 
   int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList().
+//                                       display_name getFirstIndexOfModelInBuildingList
 //                                       documentation ```java\nint getFirstIndexOfModelInBuildingList(EpoxyModel<?> model)\n```
 //                                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                     ^^^^^ definition local 9
+//                                                           display_name model
 //                                                           documentation ```java\nEpoxyModel<?> model\n```
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
     int size = modelsBeingBuilt.size();
 //      ^^^^ definition local 10
+//           display_name size
 //           documentation ```java\nint size\n```
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                              ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 11
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 11
 //                      ^^^^ reference local 10
@@ -698,23 +746,28 @@ int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
 
   boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
+//                                  display_name isModelAddedMultipleTimes
 //                                  documentation ```java\nboolean isModelAddedMultipleTimes(EpoxyModel<?> model)\n```
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^ definition local 12
+//                                                      display_name model
 //                                                      documentation ```java\nEpoxyModel<?> model\n```
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
     int modelCount = 0;
 //      ^^^^^^^^^^ definition local 13
+//                 display_name modelCount
 //                 documentation ```java\nint modelCount\n```
     int size = modelsBeingBuilt.size();
 //      ^^^^ definition local 14
+//           display_name size
 //           documentation ```java\nint size\n```
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                              ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 15
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 15
 //                      ^^^^ reference local 14
@@ -735,9 +788,11 @@ boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
 
   void addAfterInterceptorCallback(ModelInterceptorCallback callback) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addAfterInterceptorCallback().
+//                                 display_name addAfterInterceptorCallback
 //                                 documentation ```java\nvoid addAfterInterceptorCallback(ModelInterceptorCallback callback)\n```
 //                                 ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                                          ^^^^^^^^ definition local 16
+//                                                                   display_name callback
 //                                                                   documentation ```java\nModelInterceptorCallback callback\n```
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
@@ -761,24 +816,30 @@ void addAfterInterceptorCallback(ModelInterceptorCallback callback) {
    */
   interface ModelInterceptorCallback {
 //          ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
+//                                   display_name ModelInterceptorCallback
 //                                   documentation ```java\ninterface ModelInterceptorCallback\n```
 //                                   documentation  Callbacks to each model for when interceptors are started and stopped, so the models know when\n to allow changes.\n
     void onInterceptorsStarted(EpoxyController controller);
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
+//                             display_name onInterceptorsStarted
 //                             documentation ```java\npublic abstract void onInterceptorsStarted(EpoxyController controller)\n```
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                             ^^^^^^^^^^ definition local 17
+//                                                        display_name controller
 //                                                        documentation ```java\nEpoxyController controller\n```
     void onInterceptorsFinished(EpoxyController controller);
 //       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
+//                              display_name onInterceptorsFinished
 //                              documentation ```java\npublic abstract void onInterceptorsFinished(EpoxyController controller)\n```
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                              ^^^^^^^^^^ definition local 18
+//                                                         display_name controller
 //                                                         documentation ```java\nEpoxyController controller\n```
   }
 
   private void runInterceptors() {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
+//                             display_name runInterceptors
 //                             documentation ```java\nprivate void runInterceptors()\n```
     if (!interceptors.isEmpty()) {
 //       ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
@@ -788,6 +849,7 @@ private void runInterceptors() {
         for (ModelInterceptorCallback callback : modelInterceptorCallbacks) {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                    ^^^^^^^^ definition local 19
+//                                             display_name callback
 //                                             documentation ```java\nModelInterceptorCallback callback\n```
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
           callback.onInterceptorsStarted(this);
@@ -803,6 +865,7 @@ private void runInterceptors() {
       for (Interceptor interceptor : interceptors) {
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                     ^^^^^^^^^^^ definition local 20
+//                                 display_name interceptor
 //                                 documentation ```java\nInterceptor interceptor\n```
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
         interceptor.intercept(modelsBeingBuilt);
@@ -820,6 +883,7 @@ private void runInterceptors() {
         for (ModelInterceptorCallback callback : modelInterceptorCallbacks) {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                    ^^^^^^^^ definition local 21
+//                                             display_name callback
 //                                             documentation ```java\nModelInterceptorCallback callback\n```
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
           callback.onInterceptorsFinished(this);
@@ -839,6 +903,7 @@ private void runInterceptors() {
   /** A callback that is run after {@link #buildModels()} completes and before diffing is run. */
   public interface Interceptor {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
+//                             display_name Interceptor
 //                             documentation ```java\npublic interface Interceptor\n```
 //                             documentation A callback that is run after {@link #buildModels()} completes and before diffing is run. 
     /**
@@ -853,12 +918,14 @@ public interface Interceptor {
      */
     void intercept(@NonNull List<EpoxyModel<?>> models);
 //       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#intercept().
+//                 display_name intercept
 //                 documentation ```java\npublic abstract void intercept(List<EpoxyModel<?>> models)\n```
 //                 documentation  This is called immediately after {@link #buildModels()} and before diffing is run and the\n models are set on the adapter. This is a final chance to make any changes to the the models\n added in {@link #buildModels()}. This may be useful for actions that act on all models in\n aggregate, such as toggling divider settings, or for cases such as rearranging models for an\n experiment.\n <p>\n The models list must not be changed after this method returns. Doing so will throw an\n exception.\n
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^ definition local 22
+//                                                     display_name models
 //                                                     documentation ```java\n@NonNull\nList<EpoxyModel<?>> models\n```
   }
 
@@ -872,11 +939,13 @@ public interface Interceptor {
    */
   public void addInterceptor(@NonNull Interceptor interceptor) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInterceptor().
+//                           display_name addInterceptor
 //                           documentation ```java\npublic void addInterceptor(Interceptor interceptor)\n```
 //                           documentation  Add an interceptor callback to be run after models are built, to make any last changes before\n they are set on the adapter. Interceptors are run in the order they are added.\n <p>\n Interceptors are run on the same thread that models are built on.\n\n @see Interceptor#intercept(List)\n
 //                            ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                    ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                                                ^^^^^^^^^^^ definition local 23
+//                                                            display_name interceptor
 //                                                            documentation ```java\n@NonNull\nInterceptor interceptor\n```
     interceptors.add(interceptor);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
@@ -887,11 +956,13 @@ public void addInterceptor(@NonNull Interceptor interceptor) {
   /** Remove an interceptor that was added with {@link #addInterceptor(Interceptor)}. */
   public void removeInterceptor(@NonNull Interceptor interceptor) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#removeInterceptor().
+//                              display_name removeInterceptor
 //                              documentation ```java\npublic void removeInterceptor(Interceptor interceptor)\n```
 //                              documentation Remove an interceptor that was added with {@link #addInterceptor(Interceptor)}. 
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                                                   ^^^^^^^^^^^ definition local 24
+//                                                               display_name interceptor
 //                                                               documentation ```java\n@NonNull\nInterceptor interceptor\n```
     interceptors.remove(interceptor);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
@@ -909,6 +980,7 @@ public void removeInterceptor(@NonNull Interceptor interceptor) {
    */
   protected int getModelCountBuiltSoFar() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getModelCountBuiltSoFar().
+//                                      display_name getModelCountBuiltSoFar
 //                                      documentation ```java\nprotected int getModelCountBuiltSoFar()\n```
 //                                      documentation  Get the number of models added so far during the {@link #buildModels()} phase. It is only valid\n to call this from within that method.\n <p>\n This is different from the number of models currently on the adapter, since models on the\n adapter are not updated until after models are finished being built. To access current adapter\n count call {@link #getAdapter()} and {@link EpoxyControllerAdapter#getItemCount()}\n
     assertIsBuildingModels();
@@ -920,6 +992,7 @@ protected int getModelCountBuiltSoFar() {
 
   private void assertIsBuildingModels() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
+//                                    display_name assertIsBuildingModels
 //                                    documentation ```java\nprivate void assertIsBuildingModels()\n```
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -930,6 +1003,7 @@ private void assertIsBuildingModels() {
 
   private void assertNotBuildingModels() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
+//                                     display_name assertNotBuildingModels
 //                                     documentation ```java\nprivate void assertNotBuildingModels()\n```
     if (isBuildingModels()) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -944,11 +1018,13 @@ private void assertNotBuildingModels() {
    */
   public void add(@NonNull EpoxyModel<?> model) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
+//                display_name add
 //                documentation ```java\npublic void add(EpoxyModel<?> model)\n```
 //                documentation  Add the model to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^ definition local 25
+//                                             display_name model
 //                                             documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
     model.addTo(this);
 //  ^^^^^ reference local 25
@@ -961,11 +1037,13 @@ public void add(@NonNull EpoxyModel<?> model) {
    */
   protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+1).
+//                   display_name add
 //                   documentation ```java\nprotected void add(EpoxyModel<?>[] modelsToAdd)\n```
 //                   documentation  Add the models to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^^^ definition local 26
+//                                                         display_name modelsToAdd
 //                                                         documentation ```java\n@NonNull\nEpoxyModel<?>[] modelsToAdd\n```
     modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.length);
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
@@ -978,6 +1056,7 @@ protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
     for (EpoxyModel<?> model : modelsToAdd) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 27
+//                           display_name model
 //                           documentation ```java\nEpoxyModel<?> model\n```
 //                             ^^^^^^^^^^^ reference local 26
       add(model);
@@ -992,12 +1071,14 @@ protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
    */
   protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+2).
+//                   display_name add
 //                   documentation ```java\nprotected void add(List<? extends EpoxyModel<?>> modelsToAdd)\n```
 //                   documentation  Add the models to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^^^^^^^ definition local 28
+//                                                                      display_name modelsToAdd
 //                                                                      documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> modelsToAdd\n```
     modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.size());
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
@@ -1010,6 +1091,7 @@ protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
     for (EpoxyModel<?> model : modelsToAdd) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 29
+//                           display_name model
 //                           documentation ```java\nEpoxyModel<?> model\n```
 //                             ^^^^^^^^^^^ reference local 28
       add(model);
@@ -1024,10 +1106,12 @@ protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
    */
   void addInternal(EpoxyModel<?> modelToAdd) {
 //     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInternal().
+//                 display_name addInternal
 //                 documentation ```java\nvoid addInternal(EpoxyModel<?> modelToAdd)\n```
 //                 documentation  Method to actually add the model to the list being built. Should be called after all\n validations are done.\n
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                               ^^^^^^^^^^ definition local 30
+//                                          display_name modelToAdd
 //                                          documentation ```java\nEpoxyModel<?> modelToAdd\n```
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
@@ -1076,10 +1160,12 @@ void addInternal(EpoxyModel<?> modelToAdd) {
    */
   void setStagedModel(EpoxyModel<?> model) {
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setStagedModel().
+//                    display_name setStagedModel
 //                    documentation ```java\nvoid setStagedModel(EpoxyModel<?> model)\n```
 //                    documentation  Staging models allows them to be implicitly added after the user finishes modifying them. This\n means that if a user has modified a model, and then moves on to modifying a different model,\n the first model is automatically added as soon as the second model is modified.\n <p>\n There are some edge cases for handling models that are added without modification, or models\n that are modified but then fail an `addIf` check.\n <p>\n This only works for AutoModels, and only if implicitly adding is enabled in configuration.\n
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^ definition local 31
+//                                        display_name model
 //                                        documentation ```java\nEpoxyModel<?> model\n```
     if (model != stagedModel) {
 //      ^^^^^ reference local 31
@@ -1095,6 +1181,7 @@ void setStagedModel(EpoxyModel<?> model) {
 
   void addCurrentlyStagedModelIfExists() {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addCurrentlyStagedModelIfExists().
+//                                     display_name addCurrentlyStagedModelIfExists
 //                                     documentation ```java\nvoid addCurrentlyStagedModelIfExists()\n```
     if (stagedModel != null) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
@@ -1108,9 +1195,11 @@ void addCurrentlyStagedModelIfExists() {
 
   void clearModelFromStaging(EpoxyModel<?> model) {
 //     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#clearModelFromStaging().
+//                           display_name clearModelFromStaging
 //                           documentation ```java\nvoid clearModelFromStaging(EpoxyModel<?> model)\n```
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^ definition local 32
+//                                               display_name model
 //                                               documentation ```java\nEpoxyModel<?> model\n```
     if (stagedModel != model) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
@@ -1125,6 +1214,7 @@ void clearModelFromStaging(EpoxyModel<?> model) {
   /** True if the current callstack originated from the buildModels call, on the same thread. */
   protected boolean isBuildingModels() {
 //                  ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
+//                                   display_name isBuildingModels
 //                                   documentation ```java\nprotected boolean isBuildingModels()\n```
 //                                   documentation True if the current callstack originated from the buildModels call, on the same thread. 
     return threadBuildingModels == Thread.currentThread();
@@ -1135,10 +1225,12 @@ protected boolean isBuildingModels() {
 
   private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
+//                                      display_name filterDuplicatesIfNeeded
 //                                      documentation ```java\nprivate void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models)\n```
 //                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^^ definition local 33
+//                                                                 display_name models
 //                                                                 documentation ```java\nList<EpoxyModel<?>> models\n```
     if (!filterDuplicates) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
@@ -1152,6 +1244,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //  ^^^ reference semanticdb maven jdk 11 java/util/Set#
 //      ^^^^ reference semanticdb maven jdk 11 java/lang/Long#
 //            ^^^^^^^^ definition local 34
+//                     display_name modelIds
 //                     documentation ```java\nSet<Long> modelIds\n```
 //                           ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashSet#`<init>`(+3).
 //                                     ^^^^^^ reference local 33
@@ -1161,6 +1254,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                              ^^^^^^^^^^^^^ definition local 35
+//                                            display_name modelIterator
 //                                            documentation ```java\nListIterator<EpoxyModel<?>> modelIterator\n```
 //                                              ^^^^^^ reference local 33
 //                                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/List#listIterator().
@@ -1170,6 +1264,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
       EpoxyModel<?> model = modelIterator.next();
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^ definition local 36
+//                        display_name model
 //                        documentation ```java\nEpoxyModel<?> model\n```
 //                          ^^^^^^^^^^^^^ reference local 35
 //                                        ^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#next().
@@ -1180,6 +1275,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                            ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id().
         int indexOfDuplicate = modelIterator.previousIndex();
 //          ^^^^^^^^^^^^^^^^ definition local 37
+//                           display_name indexOfDuplicate
 //                           documentation ```java\nint indexOfDuplicate\n```
 //                             ^^^^^^^^^^^^^ reference local 35
 //                                           ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
@@ -1189,6 +1285,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 
         int indexOfOriginal = findPositionOfDuplicate(models, model);
 //          ^^^^^^^^^^^^^^^ definition local 38
+//                          display_name indexOfOriginal
 //                          documentation ```java\nint indexOfOriginal\n```
 //                            ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                                                    ^^^^^^ reference local 33
@@ -1196,6 +1293,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
         EpoxyModel<?> originalModel = models.get(indexOfOriginal);
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^^^^ definition local 39
+//                                  display_name originalModel
 //                                  documentation ```java\nEpoxyModel<?> originalModel\n```
 //                                    ^^^^^^ reference local 33
 //                                           ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -1229,21 +1327,26 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 
   private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> duplicateModel) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
+//                                    display_name findPositionOfDuplicate
 //                                    documentation ```java\nprivate int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> duplicateModel)\n```
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^^ definition local 40
+//                                                               display_name models
 //                                                               documentation ```java\nList<EpoxyModel<?>> models\n```
 //                                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                              ^^^^^^^^^^^^^^ definition local 41
+//                                                                                             display_name duplicateModel
 //                                                                                             documentation ```java\nEpoxyModel<?> duplicateModel\n```
     int size = models.size();
 //      ^^^^ definition local 42
+//           display_name size
 //           documentation ```java\nint size\n```
 //             ^^^^^^ reference local 40
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 43
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 43
 //                      ^^^^ reference local 42
@@ -1251,6 +1354,7 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
       EpoxyModel<?> model = models.get(i);
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^ definition local 44
+//                        display_name model
 //                        documentation ```java\nEpoxyModel<?> model\n```
 //                          ^^^^^^ reference local 40
 //                                 ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -1281,9 +1385,11 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
    */
   public void setFilterDuplicates(boolean filterDuplicates) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setFilterDuplicates().
+//                                display_name setFilterDuplicates
 //                                documentation ```java\npublic void setFilterDuplicates(boolean filterDuplicates)\n```
 //                                documentation  If set to true, Epoxy will search for models with duplicate ids added during {@link\n #buildModels()} and remove any duplicates found. If models with the same id are found, the\n first one is left in the adapter and any subsequent models are removed. {@link\n #onExceptionSwallowed(RuntimeException)} will be called for each duplicate removed.\n <p>\n This may be useful if your models are created via server supplied data, in which case the\n server may erroneously send duplicate items. Duplicate items are otherwise left in and can\n result in undefined behavior.\n
 //                                        ^^^^^^^^^^^^^^^^ definition local 45
+//                                                         display_name filterDuplicates
 //                                                         documentation ```java\nboolean filterDuplicates\n```
     this.filterDuplicates = filterDuplicates;
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
@@ -1292,6 +1398,7 @@ public void setFilterDuplicates(boolean filterDuplicates) {
 
   public boolean isDuplicateFilteringEnabled() {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isDuplicateFilteringEnabled().
+//                                           display_name isDuplicateFilteringEnabled
 //                                           documentation ```java\npublic boolean isDuplicateFilteringEnabled()\n```
     return filterDuplicates;
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
@@ -1304,9 +1411,11 @@ public boolean isDuplicateFilteringEnabled() {
    */
   public static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesByDefault) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalDuplicateFilteringDefault().
+//                                                      display_name setGlobalDuplicateFilteringDefault
 //                                                      documentation ```java\npublic static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesByDefault)\n```
 //                                                      documentation  {@link #setFilterDuplicates(boolean)} is disabled in each EpoxyController by default. It can be\n toggled individually in each controller, or alternatively you can use this to change the\n default value for all EpoxyControllers.\n
 //                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 46
+//                                                                                        display_name filterDuplicatesByDefault
 //                                                                                        documentation ```java\nboolean filterDuplicatesByDefault\n```
     EpoxyController.filterDuplicatesDefault = filterDuplicatesByDefault;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
@@ -1327,9 +1436,11 @@ public static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesBy
    */
   public void setDebugLoggingEnabled(boolean enabled) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setDebugLoggingEnabled().
+//                                   display_name setDebugLoggingEnabled
 //                                   documentation ```java\npublic void setDebugLoggingEnabled(boolean enabled)\n```
 //                                   documentation  If enabled, DEBUG logcat messages will be printed to show when models are rebuilt, the time\n taken to build them, the time taken to diff them, and the item change outcomes from the\n differ. The tag of the logcat message is the class name of your EpoxyController.\n <p>\n This is useful to verify that models are being diffed as expected, as well as to watch for\n slowdowns in model building or diffing to indicate when you should optimize model building or\n model hashCode/equals implementations (which can often slow down diffing).\n <p>\n This should only be used in debug builds to avoid a performance hit in prod.\n
 //                                           ^^^^^^^ definition local 47
+//                                                   display_name enabled
 //                                                   documentation ```java\nboolean enabled\n```
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
@@ -1369,6 +1480,7 @@ public void setDebugLoggingEnabled(boolean enabled) {
 
   public boolean isDebugLoggingEnabled() {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isDebugLoggingEnabled().
+//                                     display_name isDebugLoggingEnabled
 //                                     documentation ```java\npublic boolean isDebugLoggingEnabled()\n```
     return timer != NO_OP_TIMER;
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
@@ -1383,9 +1495,11 @@ public boolean isDebugLoggingEnabled() {
    */
   public static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnabled) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalDebugLoggingEnabled().
+//                                                display_name setGlobalDebugLoggingEnabled
 //                                                documentation ```java\npublic static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnabled)\n```
 //                                                documentation  Similar to {@link #setDebugLoggingEnabled(boolean)}, but this changes the global default for\n all EpoxyControllers.\n <p>\n The default is false.\n
 //                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 48
+//                                                                                  display_name globalDebugLoggingEnabled
 //                                                                                  documentation ```java\nboolean globalDebugLoggingEnabled\n```
     EpoxyController.globalDebugLoggingEnabled = globalDebugLoggingEnabled;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
@@ -1409,6 +1523,7 @@ public static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnable
    */
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
+//                      display_name moveModel
 //                      documentation ```java\npublic void moveModel(int fromPosition, int toPosition)\n```
 //                      documentation  An optimized way to move a model from one position to another without rebuilding all models.\n This is intended to be used with {@link androidx.recyclerview.widget.ItemTouchHelper} to\n allow for efficient item dragging and rearranging. It cannot be\n <p>\n If you call this you MUST also update the data backing your models as necessary.\n <p>\n This will immediately change the model's position and notify the change to the RecyclerView.\n However, a delayed request to rebuild models will be scheduled for the future to guarantee that\n models are in sync with data.\n\n @param fromPosition Previous position of the item.\n @param toPosition   New position of the item.\n
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#moveModel().
@@ -1416,8 +1531,10 @@ public void moveModel(int fromPosition, int toPosition) {
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#moveModel().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 49
+//                                       display_name fromPosition
 //                                       documentation ```java\nint fromPosition\n```
 //                                            ^^^^^^^^^^ definition local 50
+//                                                       display_name toPosition
 //                                                       documentation ```java\nint toPosition\n```
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
@@ -1443,9 +1560,11 @@ public void moveModel(int fromPosition, int toPosition) {
    */
   public void notifyModelChanged(int position) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#notifyModelChanged().
+//                               display_name notifyModelChanged
 //                               documentation ```java\npublic void notifyModelChanged(int position)\n```
 //                               documentation  An way to notify the adapter that a model has changed. This is intended to be used with\n {@link androidx.recyclerview.widget.ItemTouchHelper} to allow revert swiping a model.\n <p>\n This will immediately notify the change to the RecyclerView.\n\n @param position Position of the item.\n
 //                                   ^^^^^^^^ definition local 51
+//                                            display_name position
 //                                            documentation ```java\nint position\n```
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
@@ -1466,6 +1585,7 @@ public void notifyModelChanged(int position) {
   public EpoxyControllerAdapter getAdapter() {
 //       ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#
 //                              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getAdapter().
+//                                         display_name getAdapter
 //                                         documentation ```java\n@NonNull\npublic EpoxyControllerAdapter getAdapter()\n```
 //                                         documentation  Get the underlying adapter built by this controller. Use this to get the adapter to set on a\n RecyclerView, or to get information about models currently in use.\n
     return adapter;
@@ -1474,10 +1594,12 @@ public EpoxyControllerAdapter getAdapter() {
 
   public void onSaveInstanceState(@NonNull Bundle outState) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onSaveInstanceState().
+//                                display_name onSaveInstanceState
 //                                documentation ```java\npublic void onSaveInstanceState(unresolved_type outState)\n```
 //                                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                         ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                ^^^^^^^^ definition local 52
+//                                                         display_name outState
 //                                                         documentation ```java\n@NonNull\nunresolved_type outState\n```
     adapter.onSaveInstanceState(outState);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1487,10 +1609,12 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
 
   public void onRestoreInstanceState(@Nullable Bundle inState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onRestoreInstanceState().
+//                                   display_name onRestoreInstanceState
 //                                   documentation ```java\npublic void onRestoreInstanceState(unresolved_type inState)\n```
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                    ^^^^^^^ definition local 53
+//                                                            display_name inState
 //                                                            documentation ```java\n@Nullable\nunresolved_type inState\n```
     adapter.onRestoreInstanceState(inState);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1509,6 +1633,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
   public SpanSizeLookup getSpanSizeLookup() {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getSpanSizeLookup().
+//                                        display_name getSpanSizeLookup
 //                                        documentation ```java\n@NonNull\npublic unresolved_type getSpanSizeLookup()\n```
 //                                        documentation  For use with a grid layout manager - use this to get the {@link SpanSizeLookup} for models in\n this controller. This will delegate span look up calls to each model's {@link\n EpoxyModel#getSpanSize(int, int, int)}. Make sure to also call {@link #setSpanCount(int)} so\n the span count is correct.\n
     return adapter.getSpanSizeLookup();
@@ -1525,9 +1650,11 @@ public SpanSizeLookup getSpanSizeLookup() {
    */
   public void setSpanCount(int spanCount) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setSpanCount().
+//                         display_name setSpanCount
 //                         documentation ```java\npublic void setSpanCount(int spanCount)\n```
 //                         documentation  If you are using a grid layout manager you must call this to set the span count of the grid.\n This span count will be passed on to the models so models can choose which span count to be.\n\n @see #getSpanSizeLookup()\n @see EpoxyModel#getSpanSize(int, int, int)\n
 //                             ^^^^^^^^^ definition local 54
+//                                       display_name spanCount
 //                                       documentation ```java\nint spanCount\n```
     adapter.setSpanCount(spanCount);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1537,6 +1664,7 @@ public void setSpanCount(int spanCount) {
 
   public int getSpanCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getSpanCount().
+//                        display_name getSpanCount
 //                        documentation ```java\npublic int getSpanCount()\n```
     return adapter.getSpanCount();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1545,6 +1673,7 @@ public int getSpanCount() {
 
   public boolean isMultiSpan() {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isMultiSpan().
+//                           display_name isMultiSpan
 //                           documentation ```java\npublic boolean isMultiSpan()\n```
     return adapter.isMultiSpan();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1565,11 +1694,13 @@ public boolean isMultiSpan() {
    */
   protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onExceptionSwallowed().
+//                                    display_name onExceptionSwallowed
 //                                    documentation ```java\nprotected void onExceptionSwallowed(RuntimeException exception)\n```
 //                                    documentation  This is called when recoverable exceptions occur at runtime. By default they are ignored and\n Epoxy will recover, but you can override this to be aware of when they happen.\n <p>\n A common use for this is being aware of duplicates when {@link #setFilterDuplicates(boolean)}\n is enabled.\n <p>\n By default the global exception handler provided by\n {@link #setGlobalExceptionHandler(ExceptionHandler)}\n is called with the exception. Overriding this allows you to provide your own handling for a\n controller.\n
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                              ^^^^^^^^^ definition local 55
+//                                                                        display_name exception
 //                                                                        documentation ```java\n@NonNull\nRuntimeException exception\n```
     globalExceptionHandler.onException(this, exception);
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
@@ -1584,6 +1715,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
   private static ExceptionHandler globalExceptionHandler =
 //               ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
 //                                ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
+//                                                       display_name globalExceptionHandler
 //                                                       documentation ```java\nprivate static ExceptionHandler globalExceptionHandler\n```
 //                                                       documentation  Default handler for exceptions in all EpoxyControllers. Set with {@link\n #setGlobalExceptionHandler(ExceptionHandler)}\n
       new ExceptionHandler() {
@@ -1593,16 +1725,19 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
         public void onException(@NonNull EpoxyController controller,
 //                  ^^^^^^^^^^^ definition local 57
+//                              display_name onException
 //                              documentation ```java\n@Override\npublic void onException(EpoxyController controller, RuntimeException exception)\n```
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                       ^^^^^^^^^^ definition local 58
+//                                                                  display_name controller
 //                                                                  documentation ```java\n@NonNull\nEpoxyController controller\n```
             @NonNull RuntimeException exception) {
 //           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                    ^^^^^^^^^ definition local 59
+//                                              display_name exception
 //                                              documentation ```java\n@NonNull\nRuntimeException exception\n```
           // Ignore exceptions as the default
         }
@@ -1624,12 +1759,14 @@ public void onException(@NonNull EpoxyController controller,
    */
   public static void setGlobalExceptionHandler(
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalExceptionHandler().
+//                                             display_name setGlobalExceptionHandler
 //                                             documentation ```java\npublic static void setGlobalExceptionHandler(ExceptionHandler globalExceptionHandler)\n```
 //                                             documentation  Set a callback to be notified when a recoverable exception occurs at runtime.  By default these\n are ignored and Epoxy will recover, but you can override this to be aware of when they happen.\n <p>\n For example, you could choose to rethrow the exception in development builds, or log them in\n production.\n <p>\n A common use for this is being aware of duplicates when {@link #setFilterDuplicates(boolean)}\n is enabled.\n <p>\n This callback will be used in all EpoxyController classes. If you would like specific handling\n in a certain controller you can override {@link #onExceptionSwallowed(RuntimeException)} in\n that controller.\n
       @NonNull ExceptionHandler globalExceptionHandler) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
 //                              ^^^^^^^^^^^^^^^^^^^^^^ definition local 60
+//                                                     display_name globalExceptionHandler
 //                                                     documentation ```java\n@NonNull\nExceptionHandler globalExceptionHandler\n```
     EpoxyController.globalExceptionHandler = globalExceptionHandler;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
@@ -1639,6 +1776,7 @@ public static void setGlobalExceptionHandler(
 
   public interface ExceptionHandler {
 //                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
+//                                  display_name ExceptionHandler
 //                                  documentation ```java\npublic interface ExceptionHandler\n```
     /**
      * This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy
@@ -1651,23 +1789,28 @@ public interface ExceptionHandler {
      */
     void onException(@NonNull EpoxyController controller, @NonNull RuntimeException exception);
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
+//                   display_name onException
 //                   documentation ```java\npublic abstract void onException(EpoxyController controller, RuntimeException exception)\n```
 //                   documentation  This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy\n will recover, but you can override this to be aware of when they happen.\n <p>\n For example, you could choose to rethrow the exception in development builds, or log them in\n production.\n\n @param controller The EpoxyController that the error occurred in.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                            ^^^^^^^^^^ definition local 61
+//                                                       display_name controller
 //                                                       documentation ```java\n@NonNull\nEpoxyController controller\n```
 //                                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                                                  ^^^^^^^^^ definition local 62
+//                                                                                            display_name exception
 //                                                                                            documentation ```java\n@NonNull\nRuntimeException exception\n```
   }
 
   void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerViewInternal().
+//                                      display_name onAttachedToRecyclerViewInternal
 //                                      documentation ```java\nvoid onAttachedToRecyclerViewInternal(unresolved_type recyclerView)\n```
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                   ^^^^^^^^^^^^ definition local 63
+//                                                                display_name recyclerView
 //                                                                documentation ```java\nunresolved_type recyclerView\n```
     recyclerViewAttachCount++;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
@@ -1684,6 +1827,7 @@ void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
 //       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
         public void run() {
 //                  ^^^ definition local 65
+//                      display_name run
 //                      documentation ```java\n@Override\npublic void run()\n```
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
           // Only warn if there are still multiple adapters attached after a delay, to allow for
@@ -1716,9 +1860,11 @@ public void run() {
 
   void onDetachedFromRecyclerViewInternal(RecyclerView recyclerView) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerViewInternal().
+//                                        display_name onDetachedFromRecyclerViewInternal
 //                                        documentation ```java\nvoid onDetachedFromRecyclerViewInternal(unresolved_type recyclerView)\n```
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                     ^^^^^^^^^^^^ definition local 66
+//                                                                  display_name recyclerView
 //                                                                  documentation ```java\nunresolved_type recyclerView\n```
     recyclerViewAttachCount--;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
@@ -1730,11 +1876,13 @@ void onDetachedFromRecyclerViewInternal(RecyclerView recyclerView) {
   /** Called when the controller's adapter is attach to a recyclerview. */
   protected void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerView().
+//                                        display_name onAttachedToRecyclerView
 //                                        documentation ```java\nprotected void onAttachedToRecyclerView(unresolved_type recyclerView)\n```
 //                                        documentation Called when the controller's adapter is attach to a recyclerview. 
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                              ^^^^^^^^^^^^ definition local 67
+//                                                                           display_name recyclerView
 //                                                                           documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
 
   }
@@ -1742,11 +1890,13 @@ protected void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
   /** Called when the controller's adapter is detached from a recyclerview. */
   protected void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerView().
+//                                          display_name onDetachedFromRecyclerView
 //                                          documentation ```java\nprotected void onDetachedFromRecyclerView(unresolved_type recyclerView)\n```
 //                                          documentation Called when the controller's adapter is detached from a recyclerview. 
 //                                           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                ^^^^^^^^^^^^ definition local 68
+//                                                                             display_name recyclerView
 //                                                                             documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
 
   }
@@ -1786,23 +1936,28 @@ protected void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
    */
   protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel<?> boundModel,
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
+//                            display_name onModelBound
 //                            documentation ```java\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> boundModel, int position, EpoxyModel<?> previouslyBoundModel)\n```
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound. Alternatively you may attach a listener directly to\n a generated model with model.onBind(...)\n\n @param previouslyBoundModel If non null, this is a model with the same id as the newly bound\n                             model, and was previously bound to a view. This means that {@link\n                             #buildModels()} returned a model that is different from the\n                             previouslyBoundModel and the view is being rebound to incorporate\n                             the change. You can compare this previous model with the new one to\n                             see exactly what changed.\n                             <p>\n                             The newly bound model and the previously bound model are guaranteed\n                             to have the same id, but will not necessarily be of the same type\n                             depending on your implementation of {@link #buildModels()}. With\n                             common usage patterns of Epoxy they should be the same type, and\n                             will only differ if you are using different model classes with the\n                             same id.\n                             <p>\n                             Comparing the newly bound model with the previous model allows you\n                             to be more intelligent when updating your view. This may help you\n                             optimize, or make it easier to work with animations.\n                             <p>\n                             If the new model and the previous model have the same view type\n                             (given by {@link EpoxyModel#getViewType()}), and if you are using\n                             the default ReyclerView item animator, the same view will be kept.\n                             If you are using a custom item animator then the view will be the\n                             same if the animator returns true in canReuseUpdatedViewHolder.\n                             <p>\n                             This previously bound model is taken as a payload from the diffing\n                             process, and follows the same general conditions for all\n                             recyclerview change payloads.\n
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 69
+//                                                            display_name holder
 //                                                            documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
 //                                                              ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^^^^^^ definition local 70
+//                                                                                               display_name boundModel
 //                                                                                               documentation ```java\n@NonNull\nEpoxyModel<?> boundModel\n```
       int position,
 //        ^^^^^^^^ definition local 71
+//                 display_name position
 //                 documentation ```java\nint position\n```
       @Nullable EpoxyModel<?> previouslyBoundModel) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 72
+//                                                 display_name previouslyBoundModel
 //                                                 documentation ```java\n@Nullable\nEpoxyModel<?> previouslyBoundModel\n```
   }
 
@@ -1813,15 +1968,18 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel
    */
   protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelUnbound().
+//                              display_name onModelUnbound
 //                              documentation ```java\nprotected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
 //                              documentation  Called immediately after a model is unbound from a view holder. Subclasses can override this if\n they want alerts on when a model is unbound. Alternatively you may attach a listener directly\n to a generated model with model.onUnbind(...)\n
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                       ^^^^^^ definition local 73
+//                                                              display_name holder
 //                                                              documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
 //                                                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                      ^^^^^ definition local 74
+//                                                                                            display_name model
 //                                                                                            documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
 
   }
@@ -1834,16 +1992,19 @@ protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyMod
    */
   protected void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder,
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewAttachedToWindow().
+//                                      display_name onViewAttachedToWindow
 //                                      documentation ```java\nprotected void onViewAttachedToWindow(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
 //                                      documentation  Called when the given viewholder is attached to the window, along with the model it is bound\n to.\n\n @see BaseEpoxyAdapter#onViewAttachedToWindow(EpoxyViewHolder)\n
 //                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                               ^^^^^^ definition local 75
+//                                                                      display_name holder
 //                                                                      documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 76
+//                                 display_name model
 //                                 documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
 
   }
@@ -1856,16 +2017,19 @@ protected void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder,
    */
   protected void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder,
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewDetachedFromWindow().
+//                                        display_name onViewDetachedFromWindow
 //                                        documentation ```java\nprotected void onViewDetachedFromWindow(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
 //                                        documentation  Called when the given viewholder is detechaed from the window, along with the model it is bound\n to.\n\n @see BaseEpoxyAdapter#onViewDetachedFromWindow(EpoxyViewHolder)\n
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                 ^^^^^^ definition local 77
+//                                                                        display_name holder
 //                                                                        documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 78
+//                                 display_name model
 //                                 documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
 
   }
@@ -1883,11 +2047,13 @@ protected void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder,
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setupStickyHeaderView().
+//                                  display_name setupStickyHeaderView
 //                                  documentation ```java\n@Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)\n```
 //                                  documentation  Optional callback to setup the sticky view,\n by default it doesn't do anything.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^^ definition local 79
+//                                                             display_name stickyHeader
 //                                                             documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
     // no-op
   }
@@ -1903,11 +2069,13 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView().
+//                                     display_name teardownStickyHeaderView
 //                                     documentation ```java\n@Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)\n```
 //                                     documentation  Optional callback to perform tear down operation on the\n sticky view, by default it doesn't do anything.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^^^^^ definition local 80
+//                                                                display_name stickyHeader
 //                                                                documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
     // no-op
   }
@@ -1923,9 +2091,11 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isStickyHeader().
+//                              display_name isStickyHeader
 //                              documentation ```java\n@Override\npublic boolean isStickyHeader(int position)\n```
 //                              documentation  Called to check if the item at the position is a sticky item,\n by default returns false.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                  ^^^^^^^^ definition local 81
+//                                           display_name position
 //                                           documentation ```java\nint position\n```
     return false;
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
index ee752fdc7..9a91334bc 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
@@ -57,6 +57,7 @@
 
 public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements ResultCallback {
 //                 ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#
+//                                        display_name EpoxyControllerAdapter
 //                                        documentation ```java\npublic final class EpoxyControllerAdapter\n```
 //                                        relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                        relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -67,35 +68,43 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
   private final NotifyBlocker notifyBlocker = new NotifyBlocker();
 //              ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#
 //                            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyBlocker.
+//                                          display_name notifyBlocker
 //                                          documentation ```java\nprivate final NotifyBlocker notifyBlocker\n```
 //                                                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#`<init>`().
   private final AsyncEpoxyDiffer differ;
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
+//                                      display_name differ
 //                                      documentation ```java\nprivate final AsyncEpoxyDiffer differ\n```
   private final EpoxyController epoxyController;
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
+//                                              display_name epoxyController
 //                                              documentation ```java\nprivate final EpoxyController epoxyController\n```
   private int itemCount;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#itemCount.
+//                      display_name itemCount
 //                      documentation ```java\nprivate int itemCount\n```
   private final List<OnModelBuildFinishedListener> modelBuildListeners = new ArrayList<>();
 //              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                 ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
+//                                                                     display_name modelBuildListeners
 //                                                                     documentation ```java\nprivate final List<OnModelBuildFinishedListener> modelBuildListeners\n```
 //                                                                           ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
 
   EpoxyControllerAdapter(@NonNull EpoxyController epoxyController, Handler diffingHandler) {
 //^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\nEpoxyControllerAdapter(EpoxyController epoxyController, unresolved_type diffingHandler)\n```
 //                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                ^^^^^^^^^^^^^^^ definition local 0
+//                                                                display_name epoxyController
 //                                                                documentation ```java\n@NonNull\nEpoxyController epoxyController\n```
 //                                                                 ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                         ^^^^^^^^^^^^^^ definition local 1
+//                                                                                        display_name diffingHandler
 //                                                                                        documentation ```java\nunresolved_type diffingHandler\n```
     this.epoxyController = epoxyController;
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
@@ -118,11 +127,13 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed().
+//                                    display_name onExceptionSwallowed
 //                                    documentation ```java\n@Override\nprotected void onExceptionSwallowed(RuntimeException exception)\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onExceptionSwallowed().
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                              ^^^^^^^^^ definition local 2
+//                                                                        display_name exception
 //                                                                        documentation ```java\n@NonNull\nRuntimeException exception\n```
     epoxyController.onExceptionSwallowed(exception);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
@@ -138,6 +149,7 @@ List<? extends EpoxyModel<?>> getCurrentModels() {
 //^^^^ reference semanticdb maven jdk 11 java/util/List#
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
+//                                               display_name getCurrentModels
 //                                               documentation ```java\n@NonNull\n@Override\nList<? extends EpoxyModel<?>> getCurrentModels()\n```
 //                                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
     return differ.getCurrentList();
@@ -149,6 +161,7 @@ List<? extends EpoxyModel<?>> getCurrentModels() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getItemCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
+//                        display_name getItemCount
 //                        documentation ```java\n@Override\npublic int getItemCount()\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemCount().
     // RecyclerView calls this A LOT. The base class implementation does
@@ -161,11 +174,13 @@ public int getItemCount() {
   /** This is set from whatever thread model building happened on, so must be thread safe. */
   void setModels(@NonNull ControllerModelList models) {
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
+//               display_name setModels
 //               documentation ```java\nvoid setModels(ControllerModelList models)\n```
 //               documentation This is set from whatever thread model building happened on, so must be thread safe. 
 //                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
 //                                            ^^^^^^ definition local 3
+//                                                   display_name models
 //                                                   documentation ```java\n@NonNull\nControllerModelList models\n```
     // If debug model validations are on then we should help detect the error case where models
     // were incorrectly mutated once they were added. That check is also done before and after
@@ -180,6 +195,7 @@ void setModels(@NonNull ControllerModelList models) {
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^^^^^^^^^^^^^ definition local 4
+//                                              display_name currentModels
 //                                              documentation ```java\nList<? extends EpoxyModel<?>> currentModels\n```
 //                                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
     if (!currentModels.isEmpty() && currentModels.get(0).isDebugValidationEnabled()) {
@@ -190,6 +206,7 @@ void setModels(@NonNull ControllerModelList models) {
 //                                                       ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isDebugValidationEnabled().
       for (int i = 0; i < currentModels.size(); i++) {
 //             ^ definition local 5
+//               display_name i
 //               documentation ```java\nint i\n```
 //                    ^ reference local 5
 //                        ^^^^^^^^^^^^^ reference local 4
@@ -198,6 +215,7 @@ void setModels(@NonNull ControllerModelList models) {
         EpoxyModel<?> model = currentModels.get(i);
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^ definition local 6
+//                          display_name model
 //                          documentation ```java\nEpoxyModel<?> model\n```
 //                            ^^^^^^^^^^^^^ reference local 4
 //                                          ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -223,6 +241,7 @@ void setModels(@NonNull ControllerModelList models) {
    */
   public boolean isDiffInProgress() {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isDiffInProgress().
+//                                display_name isDiffInProgress
 //                                documentation ```java\npublic boolean isDiffInProgress()\n```
 //                                documentation  @return True if a diff operation is in progress.\n
     return differ.isDiffInProgress();
@@ -235,11 +254,13 @@ public boolean isDiffInProgress() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onResult(@NonNull DiffResult result) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
+//                     display_name onResult
 //                     documentation ```java\n@Override\npublic void onResult(DiffResult result)\n```
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult().
 //                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                                         ^^^^^^ definition local 7
+//                                                display_name result
 //                                                documentation ```java\n@NonNull\nDiffResult result\n```
     itemCount = result.newModels.size();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#itemCount.
@@ -258,6 +279,7 @@ public void onResult(@NonNull DiffResult result) {
 
     for (int i = modelBuildListeners.size() - 1; i >= 0; i--) {
 //           ^ definition local 8
+//             display_name i
 //             documentation ```java\nint i\n```
 //               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                                   ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -274,9 +296,11 @@ public void onResult(@NonNull DiffResult result) {
 
   public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#addModelBuildListener().
+//                                  display_name addModelBuildListener
 //                                  documentation ```java\npublic void addModelBuildListener(OnModelBuildFinishedListener listener)\n```
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                               ^^^^^^^^ definition local 9
+//                                                                        display_name listener
 //                                                                        documentation ```java\nOnModelBuildFinishedListener listener\n```
     modelBuildListeners.add(listener);
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
@@ -286,9 +310,11 @@ public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 
   public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#removeModelBuildListener().
+//                                     display_name removeModelBuildListener
 //                                     documentation ```java\npublic void removeModelBuildListener(OnModelBuildFinishedListener listener)\n```
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                                  ^^^^^^^^ definition local 10
+//                                                                           display_name listener
 //                                                                           documentation ```java\nOnModelBuildFinishedListener listener\n```
     modelBuildListeners.remove(listener);
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
@@ -300,6 +326,7 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   boolean diffPayloadsEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#diffPayloadsEnabled().
+//                            display_name diffPayloadsEnabled
 //                            documentation ```java\n@Override\nboolean diffPayloadsEnabled()\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
     return true;
@@ -309,10 +336,12 @@ boolean diffPayloadsEnabled() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onAttachedToRecyclerView().
+//                                     display_name onAttachedToRecyclerView
 //                                     documentation ```java\n@Override\npublic void onAttachedToRecyclerView(unresolved_type recyclerView)\n```
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                           ^^^^^^^^^^^^ definition local 11
+//                                                                        display_name recyclerView
 //                                                                        documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
     super.onAttachedToRecyclerView(recyclerView);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
@@ -328,11 +357,13 @@ public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView().
+//                                       display_name onDetachedFromRecyclerView
 //                                       documentation ```java\n@Override\npublic void onDetachedFromRecyclerView(unresolved_type recyclerView)\n```
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
 //                                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                             ^^^^^^^^^^^^ definition local 12
+//                                                                          display_name recyclerView
 //                                                                          documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
     super.onDetachedFromRecyclerView(recyclerView);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
@@ -348,11 +379,13 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow().
+//                                   display_name onViewAttachedToWindow
 //                                   documentation ```java\n@Override\npublic void onViewAttachedToWindow(EpoxyViewHolder holder)\n```
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
 //                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                            ^^^^^^ definition local 13
+//                                                                   display_name holder
 //                                                                   documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
     super.onViewAttachedToWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
@@ -370,11 +403,13 @@ public void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow().
+//                                     display_name onViewDetachedFromWindow
 //                                     documentation ```java\n@Override\npublic void onViewDetachedFromWindow(EpoxyViewHolder holder)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                              ^^^^^^ definition local 14
+//                                                                     display_name holder
 //                                                                     documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
     super.onViewDetachedFromWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
@@ -392,22 +427,27 @@ public void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel<?> model,
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
+//                            display_name onModelBound
 //                            documentation ```java\n@Override\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, EpoxyModel<?> previouslyBoundModel)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 15
+//                                                            display_name holder
 //                                                            documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
 //                                                              ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^ definition local 16
+//                                                                                          display_name model
 //                                                                                          documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
       int position, @Nullable EpoxyModel<?> previouslyBoundModel) {
 //        ^^^^^^^^ definition local 17
+//                 display_name position
 //                 documentation ```java\nint position\n```
 //                   ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 18
+//                                                               display_name previouslyBoundModel
 //                                                               documentation ```java\n@Nullable\nEpoxyModel<?> previouslyBoundModel\n```
     epoxyController.onModelBound(holder, model, position, previouslyBoundModel);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
@@ -422,15 +462,18 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound().
+//                              display_name onModelUnbound
 //                              documentation ```java\n@Override\nprotected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelUnbound().
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                       ^^^^^^ definition local 19
+//                                                              display_name holder
 //                                                              documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
 //                                                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                      ^^^^^ definition local 20
+//                                                                                            display_name model
 //                                                                                            documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
     epoxyController.onModelUnbound(holder, model);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
@@ -446,6 +489,7 @@ public List<EpoxyModel<?>> getCopyOfModels() {
 //       ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCopyOfModels().
+//                                           display_name getCopyOfModels
 //                                           documentation ```java\n@NonNull\npublic List<EpoxyModel<?>> getCopyOfModels()\n```
 //                                           documentation Get an unmodifiable copy of the current models set on the adapter. 
     //noinspection unchecked
@@ -464,9 +508,11 @@ public List<EpoxyModel<?>> getCopyOfModels() {
   public EpoxyModel<?> getModelAtPosition(int position) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelAtPosition().
+//                                        display_name getModelAtPosition
 //                                        documentation ```java\n@NonNull\npublic EpoxyModel<?> getModelAtPosition(int position)\n```
 //                                        documentation  @throws IndexOutOfBoundsException If the given position is out of range of the current model\n                                   list.\n
 //                                            ^^^^^^^^ definition local 21
+//                                                     display_name position
 //                                                     documentation ```java\nint position\n```
     return getCurrentModels().get(position);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
@@ -483,13 +529,16 @@ public EpoxyModel<?> getModelAtPosition(int position) {
   public EpoxyModel<?> getModelById(long id) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelById().
+//                                  display_name getModelById
 //                                  documentation ```java\n@Nullable\npublic EpoxyModel<?> getModelById(long id)\n```
 //                                  documentation  Searches the current model list for the model with the given id. Returns the matching model if\n one is found, otherwise null is returned.\n
 //                                       ^^ definition local 22
+//                                          display_name id
 //                                          documentation ```java\nlong id\n```
     for (EpoxyModel<?> model : getCurrentModels()) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 23
+//                           display_name model
 //                           documentation ```java\nEpoxyModel<?> model\n```
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
       if (model.id() == id) {
@@ -508,19 +557,23 @@ public EpoxyModel<?> getModelById(long id) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
+//                            display_name getModelPosition
 //                            documentation ```java\n@Override\npublic int getModelPosition(EpoxyModel<?> targetModel)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                   ^^^^^^^^^^^ definition local 24
+//                                                               display_name targetModel
 //                                                               documentation ```java\n@NonNull\nEpoxyModel<?> targetModel\n```
     int size = getCurrentModels().size();
 //      ^^^^ definition local 25
+//           display_name size
 //           documentation ```java\nint size\n```
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 26
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 26
 //                      ^^^^ reference local 25
@@ -528,6 +581,7 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
       EpoxyModel<?> model = getCurrentModels().get(i);
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^ definition local 27
+//                        display_name model
 //                        documentation ```java\nEpoxyModel<?> model\n```
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                             ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -552,6 +606,7 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
   public BoundViewHolders getBoundViewHolders() {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getBoundViewHolders().
+//                                            display_name getBoundViewHolders
 //                                            documentation ```java\n@NonNull\n@Override\npublic BoundViewHolders getBoundViewHolders()\n```
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
     return super.getBoundViewHolders();
@@ -563,15 +618,19 @@ public BoundViewHolders getBoundViewHolders() {
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/UiThread#
   void moveModel(int fromPosition, int toPosition) {
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
+//               display_name moveModel
 //               documentation ```java\n@UiThread\nvoid moveModel(int fromPosition, int toPosition)\n```
 //                   ^^^^^^^^^^^^ definition local 28
+//                                display_name fromPosition
 //                                documentation ```java\nint fromPosition\n```
 //                                     ^^^^^^^^^^ definition local 29
+//                                                display_name toPosition
 //                                                documentation ```java\nint toPosition\n```
     ArrayList<EpoxyModel<?>> updatedList = new ArrayList<>(getCurrentModels());
 //  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^ definition local 30
+//                                       display_name updatedList
 //                                       documentation ```java\nArrayList<EpoxyModel<?>> updatedList\n```
 //                                             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+2).
 //                                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
@@ -596,6 +655,7 @@ void moveModel(int fromPosition, int toPosition) {
 
     boolean interruptedDiff = differ.forceListOverride(updatedList);
 //          ^^^^^^^^^^^^^^^ definition local 31
+//                          display_name interruptedDiff
 //                          documentation ```java\nboolean interruptedDiff\n```
 //                            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
@@ -615,13 +675,16 @@ void moveModel(int fromPosition, int toPosition) {
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/UiThread#
   void notifyModelChanged(int position) {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged().
+//                        display_name notifyModelChanged
 //                        documentation ```java\n@UiThread\nvoid notifyModelChanged(int position)\n```
 //                            ^^^^^^^^ definition local 32
+//                                     display_name position
 //                                     documentation ```java\nint position\n```
     ArrayList<EpoxyModel<?>> updatedList = new ArrayList<>(getCurrentModels());
 //  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^ definition local 33
+//                                       display_name updatedList
 //                                       documentation ```java\nArrayList<EpoxyModel<?>> updatedList\n```
 //                                             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+2).
 //                                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
@@ -638,6 +701,7 @@ void notifyModelChanged(int position) {
 
     boolean interruptedDiff = differ.forceListOverride(updatedList);
 //          ^^^^^^^^^^^^^^^ definition local 34
+//                          display_name interruptedDiff
 //                          documentation ```java\nboolean interruptedDiff\n```
 //                            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
@@ -657,6 +721,7 @@ void notifyModelChanged(int position) {
 //                     ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#ITEM_CALLBACK.
+//                                                               display_name ITEM_CALLBACK
 //                                                               documentation ```java\nprivate static final unresolved_type ITEM_CALLBACK\n```
       new ItemCallback<EpoxyModel<?>>() {
 //        ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
@@ -685,10 +750,12 @@ public Object getChangePayload(EpoxyModel<?> oldItem, EpoxyModel<?> newItem) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader().
+//                              display_name isStickyHeader
 //                              documentation ```java\n@Override\npublic boolean isStickyHeader(int position)\n```
 //                              documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader().
 //                                  ^^^^^^^^ definition local 35
+//                                           display_name position
 //                                           documentation ```java\nint position\n```
     return epoxyController.isStickyHeader(position);
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
@@ -704,12 +771,14 @@ public boolean isStickyHeader(int position) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView().
+//                                  display_name setupStickyHeaderView
 //                                  documentation ```java\n@Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)\n```
 //                                  documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView().
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^^ definition local 36
+//                                                             display_name stickyHeader
 //                                                             documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
     epoxyController.setupStickyHeaderView(stickyHeader);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
@@ -725,12 +794,14 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView().
+//                                     display_name teardownStickyHeaderView
 //                                     documentation ```java\n@Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)\n```
 //                                     documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView().
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^^^^^ definition local 37
+//                                                                display_name stickyHeader
 //                                                                documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
     epoxyController.teardownStickyHeaderView(stickyHeader);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
index 83ca871bd..c79a89fda 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
@@ -29,6 +29,7 @@
  */
 public class EpoxyDiffLogger extends AdapterDataObserver {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#
+//                           display_name EpoxyDiffLogger
 //                           documentation ```java\npublic class EpoxyDiffLogger\n```
 //                           documentation  This data observer can be registered with an Epoxy adapter or controller to log all item change\n events. This may be useful to use in debug builds in order to observe model updates and monitor\n for issues.\n <p>\n You may want to look for unexpected item updates to catch improper hashCode/equals\n implementations in your models.\n <p>\n Additionally, you may want to look for frequent or unnecessary updates as an opportunity for\n optimization.\n
 //                           relationship is_implementation semanticdb maven . . AdapterDataObserver#
@@ -36,13 +37,16 @@ public class EpoxyDiffLogger extends AdapterDataObserver {
   private final String tag;
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#tag.
+//                         display_name tag
 //                         documentation ```java\nprivate final String tag\n```
 
   public EpoxyDiffLogger(String tag) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\npublic EpoxyDiffLogger(String tag)\n```
 //                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                              ^^^ definition local 0
+//                                  display_name tag
 //                                  documentation ```java\nString tag\n```
     this.tag = tag;
 //       ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#tag.
@@ -53,10 +57,13 @@ public EpoxyDiffLogger(String tag) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeChanged(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged().
+//                               display_name onItemRangeChanged
 //                               documentation ```java\n@Override\npublic void onItemRangeChanged(int positionStart, int itemCount)\n```
 //                                   ^^^^^^^^^^^^^ definition local 1
+//                                                 display_name positionStart
 //                                                 documentation ```java\nint positionStart\n```
 //                                                      ^^^^^^^^^ definition local 2
+//                                                                display_name itemCount
 //                                                                documentation ```java\nint itemCount\n```
     Log.d(tag, "Item range changed. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
@@ -70,14 +77,18 @@ public void onItemRangeChanged(int positionStart, int itemCount) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Object payload) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(+1).
+//                               display_name onItemRangeChanged
 //                               documentation ```java\n@Override\npublic void onItemRangeChanged(int positionStart, int itemCount, Object payload)\n```
 //                                   ^^^^^^^^^^^^^ definition local 3
+//                                                 display_name positionStart
 //                                                 documentation ```java\nint positionStart\n```
 //                                                      ^^^^^^^^^ definition local 4
+//                                                                display_name itemCount
 //                                                                documentation ```java\nint itemCount\n```
 //                                                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                  ^^^^^^^ definition local 5
+//                                                                                          display_name payload
 //                                                                                          documentation ```java\n@Nullable\nObject payload\n```
     if (payload == null) {
 //      ^^^^^^^ reference local 5
@@ -100,10 +111,13 @@ public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Objec
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeInserted(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeInserted().
+//                                display_name onItemRangeInserted
 //                                documentation ```java\n@Override\npublic void onItemRangeInserted(int positionStart, int itemCount)\n```
 //                                    ^^^^^^^^^^^^^ definition local 6
+//                                                  display_name positionStart
 //                                                  documentation ```java\nint positionStart\n```
 //                                                       ^^^^^^^^^ definition local 7
+//                                                                 display_name itemCount
 //                                                                 documentation ```java\nint itemCount\n```
     Log.d(tag, "Item range inserted. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
@@ -117,10 +131,13 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeRemoved(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeRemoved().
+//                               display_name onItemRangeRemoved
 //                               documentation ```java\n@Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)\n```
 //                                   ^^^^^^^^^^^^^ definition local 8
+//                                                 display_name positionStart
 //                                                 documentation ```java\nint positionStart\n```
 //                                                      ^^^^^^^^^ definition local 9
+//                                                                display_name itemCount
 //                                                                documentation ```java\nint itemCount\n```
     Log.d(tag, "Item range removed. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
@@ -134,12 +151,16 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeMoved().
+//                             display_name onItemRangeMoved
 //                             documentation ```java\n@Override\npublic void onItemRangeMoved(int fromPosition, int toPosition, int itemCount)\n```
 //                                 ^^^^^^^^^^^^ definition local 10
+//                                              display_name fromPosition
 //                                              documentation ```java\nint fromPosition\n```
 //                                                   ^^^^^^^^^^ definition local 11
+//                                                              display_name toPosition
 //                                                              documentation ```java\nint toPosition\n```
 //                                                                   ^^^^^^^^^ definition local 12
+//                                                                             display_name itemCount
 //                                                                             documentation ```java\nint itemCount\n```
     Log.d(tag, "Item moved. From: " + fromPosition + " To: " + toPosition);
 //  ^^^ reference semanticdb maven . . Log#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
index 196656ef3..028c6f472 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
@@ -10,10 +10,12 @@
  */
 public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchCallback<T> {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
+//                                 display_name EpoxyDragCallback
 //                                 documentation ```java\npublic interface EpoxyDragCallback<T extends EpoxyModel>\n```
 //                                 documentation  For use with {@link EpoxyModelTouchCallback}\n
 //                                 relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                 ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
+//                                   display_name T
 //                                   documentation ```java\nT extends EpoxyModel\n```
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
@@ -32,17 +34,21 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
    */
   void onDragStarted(T model, View itemView, int adapterPosition);
 //     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
+//                   display_name onDragStarted
 //                   documentation ```java\npublic abstract void onDragStarted(T model, unresolved_type itemView, int adapterPosition)\n```
 //                   documentation  Called when the view switches from an idle state to a dragged state, as the user begins a drag\n interaction with it. You can use this callback to modify the view to indicate it is being\n dragged.\n <p>\n This is the first callback in the lifecycle of a drag event.\n\n @param model           The model representing the view that is being dragged\n @param itemView        The view that is being dragged\n @param adapterPosition The adapter position of the model\n
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
 //                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                     ^^^^^ definition local 0
+//                           display_name model
 //                           documentation ```java\nT model\n```
 //                            ^^^^ reference semanticdb maven . . View#
 //                                 ^^^^^^^^ definition local 1
+//                                          display_name itemView
 //                                          documentation ```java\nunresolved_type itemView\n```
 //                                               ^^^^^^^^^^^^^^^ definition local 2
+//                                                               display_name adapterPosition
 //                                                               documentation ```java\nint adapterPosition\n```
 
   /**
@@ -61,19 +67,24 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
    */
   void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, View itemView);
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
+//                  display_name onModelMoved
 //                  documentation ```java\npublic abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)\n```
 //                  documentation  Called after {@link #onDragStarted(EpoxyModel, View, int)} when the dragged view is dropped to\n a new position. The EpoxyController will be updated automatically for you to reposition the\n models and notify the RecyclerView of the change.\n <p>\n You MUST use this callback to modify your data backing the models to reflect the change.\n <p>\n The next callback in the drag lifecycle will be {@link #onDragStarted(EpoxyModel, View, int)}\n\n @param modelBeingMoved The model representing the view that was moved\n @param itemView        The view that was moved\n @param fromPosition    The adapter position that the model came from\n @param toPosition      The new adapter position of the model\n
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
 //                      ^^^^^^^^^^^^ definition local 3
+//                                   display_name fromPosition
 //                                   documentation ```java\nint fromPosition\n```
 //                                        ^^^^^^^^^^ definition local 4
+//                                                   display_name toPosition
 //                                                   documentation ```java\nint toPosition\n```
 //                                                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                                                      ^^^^^^^^^^^^^^^ definition local 5
+//                                                                      display_name modelBeingMoved
 //                                                                      documentation ```java\nT modelBeingMoved\n```
 //                                                                       ^^^^ reference semanticdb maven . . View#
 //                                                                            ^^^^^^^^ definition local 6
+//                                                                                     display_name itemView
 //                                                                                     documentation ```java\nunresolved_type itemView\n```
 
   /**
@@ -92,14 +103,17 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
    */
   void onDragReleased(T model, View itemView);
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
+//                    display_name onDragReleased
 //                    documentation ```java\npublic abstract void onDragReleased(T model, unresolved_type itemView)\n```
 //                    documentation  Called after {@link #onDragStarted(EpoxyModel, View, int)} when the view being dragged is\n released. If the view was dragged to a new, valid location then {@link #onModelMoved(int, int,\n EpoxyModel, View)} will be called before this and the view will settle to the new location.\n Otherwise the view will animate back to its original position.\n <p>\n You can use this callback to modify the view as it animates back into position.\n <p>\n {@link BaseEpoxyTouchCallback#clearView(EpoxyModel, View)} will be called after this, when the\n view has finished animating. Final cleanup of the view should be done there.\n\n @param model    The model representing the view that is being released\n @param itemView The view that was being dragged\n
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                      ^^^^^ definition local 7
+//                            display_name model
 //                            documentation ```java\nT model\n```
 //                             ^^^^ reference semanticdb maven . . View#
 //                                  ^^^^^^^^ definition local 8
+//                                           display_name itemView
 //                                           documentation ```java\nunresolved_type itemView\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
index a7047e898..96f65b281 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
@@ -20,15 +20,18 @@
  */
 public abstract class EpoxyHolder {
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
+//                                display_name EpoxyHolder
 //                                documentation ```java\npublic abstract class EpoxyHolder\n```
 //                                documentation  Used in conjunction with {@link com.airbnb.epoxy.EpoxyModelWithHolder} to provide a view holder\n pattern when binding to a model.\n
 
   public EpoxyHolder(@NonNull ViewParent parent) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`().
+//                   display_name <init>
 //                   documentation ```java\npublic EpoxyHolder(unresolved_type parent)\n```
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                       ^^^^^^ definition local 0
+//                                              display_name parent
 //                                              documentation ```java\n@NonNull\nunresolved_type parent\n```
     this();
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`(+1).
@@ -36,6 +39,7 @@ public EpoxyHolder(@NonNull ViewParent parent) {
 
   public EpoxyHolder() {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`(+1).
+//                   display_name <init>
 //                   documentation ```java\npublic EpoxyHolder()\n```
   }
 
@@ -49,10 +53,12 @@ public EpoxyHolder() {
    */
   protected abstract void bindView(@NonNull View itemView);
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#bindView().
+//                                 display_name bindView
 //                                 documentation ```java\nprotected abstract void bindView(unresolved_type itemView)\n```
 //                                 documentation  Called when this holder is created, with the view that it should hold. You can use this\n opportunity to find views by id, and do any other initialization you need. This is called only\n once for the lifetime of the class.\n\n @param itemView A view inflated from the layout provided by\n {@link EpoxyModelWithHolder#getLayout()}\n
 //                                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                          ^^^^ reference semanticdb maven . . View#
 //                                               ^^^^^^^^ definition local 1
+//                                                        display_name itemView
 //                                                        documentation ```java\n@NonNull\nunresolved_type itemView\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
index 380b1d499..524a2b6a6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
@@ -58,6 +58,7 @@
  */
 public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#
+//                                     display_name EpoxyItemSpacingDecorator
 //                                     documentation ```java\npublic class EpoxyItemSpacingDecorator\n```
 //                                     documentation  Modifies item spacing in a recycler view so that items are equally spaced no matter where they\n are on the grid. Only designed to work with standard linear or grid layout managers.\n
 //                                     relationship is_implementation semanticdb maven . . RecyclerView/ItemDecoration#
@@ -65,38 +66,49 @@ public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration {
 //                                                          ^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/ItemDecoration#
   private int pxBetweenItems;
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
+//                           display_name pxBetweenItems
 //                           documentation ```java\nprivate int pxBetweenItems\n```
   private boolean verticallyScrolling;
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#verticallyScrolling.
+//                                    display_name verticallyScrolling
 //                                    documentation ```java\nprivate boolean verticallyScrolling\n```
   private boolean horizontallyScrolling;
 //                ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#horizontallyScrolling.
+//                                      display_name horizontallyScrolling
 //                                      documentation ```java\nprivate boolean horizontallyScrolling\n```
   private boolean firstItem;
 //                ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#firstItem.
+//                          display_name firstItem
 //                          documentation ```java\nprivate boolean firstItem\n```
   private boolean lastItem;
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#lastItem.
+//                         display_name lastItem
 //                         documentation ```java\nprivate boolean lastItem\n```
   private boolean grid;
 //                ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
+//                     display_name grid
 //                     documentation ```java\nprivate boolean grid\n```
 
   private boolean isFirstItemInRow;
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isFirstItemInRow.
+//                                 display_name isFirstItemInRow
 //                                 documentation ```java\nprivate boolean isFirstItemInRow\n```
   private boolean fillsLastSpan;
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#fillsLastSpan.
+//                              display_name fillsLastSpan
 //                              documentation ```java\nprivate boolean fillsLastSpan\n```
   private boolean isInFirstRow;
 //                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow.
+//                             display_name isInFirstRow
 //                             documentation ```java\nprivate boolean isInFirstRow\n```
   private boolean isInLastRow;
 //                ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow.
+//                            display_name isInLastRow
 //                            documentation ```java\nprivate boolean isInLastRow\n```
 
   public EpoxyItemSpacingDecorator() {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`().
+//                                 display_name <init>
 //                                 documentation ```java\npublic EpoxyItemSpacingDecorator()\n```
     this(0);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`(+1).
@@ -104,9 +116,11 @@ public EpoxyItemSpacingDecorator() {
 
   public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`(+1).
+//                                 display_name <init>
 //                                 documentation ```java\npublic EpoxyItemSpacingDecorator(int pxBetweenItems)\n```
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                         ^^^^^^^^^^^^^^ definition local 0
+//                                                        display_name pxBetweenItems
 //                                                        documentation ```java\n@Px\nint pxBetweenItems\n```
     setPxBetweenItems(pxBetweenItems);
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems().
@@ -115,9 +129,11 @@ public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) {
 
   public void setPxBetweenItems(@Px int pxBetweenItems) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems().
+//                              display_name setPxBetweenItems
 //                              documentation ```java\npublic void setPxBetweenItems(int pxBetweenItems)\n```
 //                               ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                      ^^^^^^^^^^^^^^ definition local 1
+//                                                     display_name pxBetweenItems
 //                                                     documentation ```java\n@Px\nint pxBetweenItems\n```
     this.pxBetweenItems = pxBetweenItems;
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
@@ -128,6 +144,7 @@ public void setPxBetweenItems(@Px int pxBetweenItems) {
 // ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
   public int getPxBetweenItems() {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getPxBetweenItems().
+//                             display_name getPxBetweenItems
 //                             documentation ```java\n@Px\npublic int getPxBetweenItems()\n```
     return pxBetweenItems;
 //         ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
@@ -137,18 +154,23 @@ public int getPxBetweenItems() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State state) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//                           display_name getItemOffsets
 //                           documentation ```java\n@Override\npublic void getItemOffsets(unresolved_type outRect, unresolved_type view, unresolved_type parent, unresolved_type state)\n```
 //                           ^^^^ reference semanticdb maven . . Rect#
 //                                ^^^^^^^ definition local 2
+//                                        display_name outRect
 //                                        documentation ```java\nunresolved_type outRect\n```
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^ definition local 3
+//                                                   display_name view
 //                                                   documentation ```java\nunresolved_type view\n```
 //                                                    ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                 ^^^^^^ definition local 4
+//                                                                        display_name parent
 //                                                                        documentation ```java\nunresolved_type parent\n```
 //                                                                         ^^^^^ reference semanticdb maven . . State#
 //                                                                               ^^^^^ definition local 5
+//                                                                                     display_name state
 //                                                                                     documentation ```java\nunresolved_type state\n```
     // Zero everything out for the common case
     outRect.setEmpty();
@@ -157,6 +179,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 
     int position = parent.getChildAdapterPosition(view);
 //      ^^^^^^^^ definition local 6
+//               display_name position
 //               documentation ```java\nint position\n```
 //                 ^^^^^^ reference local 4
 //                        ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getChildAdapterPosition#
@@ -173,6 +196,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
 //               ^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/LayoutManager#
 //                             ^^^^^^ definition local 7
+//                                    display_name layout
 //                                    documentation ```java\nunresolved_type layout\n```
 //                                      ^^^^^^ reference local 4
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getLayoutManager#
@@ -184,18 +208,22 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 
     boolean left = useLeftPadding();
 //          ^^^^ definition local 8
+//               display_name left
 //               documentation ```java\nboolean left\n```
 //                 ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useLeftPadding().
     boolean right = useRightPadding();
 //          ^^^^^ definition local 9
+//                display_name right
 //                documentation ```java\nboolean right\n```
 //                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useRightPadding().
     boolean top = useTopPadding();
 //          ^^^ definition local 10
+//              display_name top
 //              documentation ```java\nboolean top\n```
 //                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useTopPadding().
     boolean bottom = useBottomPadding();
 //          ^^^^^^ definition local 11
+//                 display_name bottom
 //                 documentation ```java\nboolean bottom\n```
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useBottomPadding().
 
@@ -207,6 +235,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //        ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#horizontallyScrolling.
         boolean temp = left;
 //              ^^^^ definition local 12
+//                   display_name temp
 //                   documentation ```java\nboolean temp\n```
 //                     ^^^^ reference local 8
         left = right;
@@ -218,6 +247,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
       } else {
         boolean temp = top;
 //              ^^^^ definition local 13
+//                   display_name temp
 //                   documentation ```java\nboolean temp\n```
 //                     ^^^ reference local 10
         top = bottom;
@@ -233,6 +263,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
     // to add up to the total desired space
     int padding = pxBetweenItems / 2;
 //      ^^^^^^^ definition local 14
+//              display_name padding
 //              documentation ```java\nint padding\n```
 //                ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
     outRect.right = right ? padding : 0;
@@ -259,17 +290,22 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 
   private void calculatePositionDetails(RecyclerView parent, int position, LayoutManager layout) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
+//                                      display_name calculatePositionDetails
 //                                      documentation ```java\nprivate void calculatePositionDetails(unresolved_type parent, int position, unresolved_type layout)\n```
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                   ^^^^^^ definition local 15
+//                                                          display_name parent
 //                                                          documentation ```java\nunresolved_type parent\n```
 //                                                               ^^^^^^^^ definition local 16
+//                                                                        display_name position
 //                                                                        documentation ```java\nint position\n```
 //                                                                         ^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#
 //                                                                                       ^^^^^^ definition local 17
+//                                                                                              display_name layout
 //                                                                                              documentation ```java\nunresolved_type layout\n```
     int itemCount = parent.getAdapter().getItemCount();
 //      ^^^^^^^^^ definition local 18
+//                display_name itemCount
 //                documentation ```java\nint itemCount\n```
 //                  ^^^^^^ reference local 15
 //                         ^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getAdapter#
@@ -299,28 +335,33 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
       GridLayoutManager grid = (GridLayoutManager) layout;
 //    ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#
 //                      ^^^^ definition local 19
+//                           display_name grid
 //                           documentation ```java\nunresolved_type grid\n```
 //                              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#
 //                                                 ^^^^^^ reference local 17
       final SpanSizeLookup spanSizeLookup = grid.getSpanSizeLookup();
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                         ^^^^^^^^^^^^^^ definition local 20
+//                                        display_name spanSizeLookup
 //                                        documentation ```java\nfinal unresolved_type spanSizeLookup\n```
 //                                          ^^^^ reference local 19
 //                                               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#getSpanSizeLookup#
       int spanSize = spanSizeLookup.getSpanSize(position);
 //        ^^^^^^^^ definition local 21
+//                 display_name spanSize
 //                 documentation ```java\nint spanSize\n```
 //                   ^^^^^^^^^^^^^^ reference local 20
 //                                  ^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#getSpanSize#
 //                                              ^^^^^^^^ reference local 16
       int spanCount = grid.getSpanCount();
 //        ^^^^^^^^^ definition local 22
+//                  display_name spanCount
 //                  documentation ```java\nint spanCount\n```
 //                    ^^^^ reference local 19
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#getSpanCount#
       int spanIndex = spanSizeLookup.getSpanIndex(position, spanCount);
 //        ^^^^^^^^^ definition local 23
+//                  display_name spanIndex
 //                  documentation ```java\nint spanIndex\n```
 //                    ^^^^^^^^^^^^^^ reference local 20
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#getSpanIndex#
@@ -354,14 +395,18 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 
   private static boolean shouldReverseLayout(LayoutManager layout, boolean horizontallyScrolling) {
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
+//                                           display_name shouldReverseLayout
 //                                           documentation ```java\nprivate static boolean shouldReverseLayout(unresolved_type layout, boolean horizontallyScrolling)\n```
 //                                           ^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#
 //                                                         ^^^^^^ definition local 24
+//                                                                display_name layout
 //                                                                documentation ```java\nunresolved_type layout\n```
 //                                                                         ^^^^^^^^^^^^^^^^^^^^^ definition local 25
+//                                                                                               display_name horizontallyScrolling
 //                                                                                               documentation ```java\nboolean horizontallyScrolling\n```
     boolean reverseLayout =
 //          ^^^^^^^^^^^^^ definition local 26
+//                        display_name reverseLayout
 //                        documentation ```java\nboolean reverseLayout\n```
         layout instanceof LinearLayoutManager && ((LinearLayoutManager) layout).getReverseLayout();
 //      ^^^^^^ reference local 24
@@ -371,6 +416,7 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
 //                                                                              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . LinearLayoutManager#getReverseLayout#
     boolean rtl = layout.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL;
 //          ^^^ definition local 27
+//              display_name rtl
 //              documentation ```java\nboolean rtl\n```
 //                ^^^^^^ reference local 24
 //                       ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#getLayoutDirection#
@@ -391,6 +437,7 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
 
   private boolean useBottomPadding() {
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useBottomPadding().
+//                                 display_name useBottomPadding
 //                                 documentation ```java\nprivate boolean useBottomPadding()\n```
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
@@ -409,6 +456,7 @@ private boolean useBottomPadding() {
 
   private boolean useTopPadding() {
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useTopPadding().
+//                              display_name useTopPadding
 //                              documentation ```java\nprivate boolean useTopPadding()\n```
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
@@ -427,6 +475,7 @@ private boolean useTopPadding() {
 
   private boolean useRightPadding() {
 //                ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useRightPadding().
+//                                display_name useRightPadding
 //                                documentation ```java\nprivate boolean useRightPadding()\n```
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
@@ -445,6 +494,7 @@ private boolean useRightPadding() {
 
   private boolean useLeftPadding() {
 //                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useLeftPadding().
+//                               display_name useLeftPadding
 //                               documentation ```java\nprivate boolean useLeftPadding()\n```
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
@@ -463,19 +513,25 @@ private boolean useLeftPadding() {
 
   private static boolean isInFirstRow(int position, SpanSizeLookup spanSizeLookup, int spanCount) {
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
+//                                    display_name isInFirstRow
 //                                    documentation ```java\nprivate static boolean isInFirstRow(int position, unresolved_type spanSizeLookup, int spanCount)\n```
 //                                        ^^^^^^^^ definition local 28
+//                                                 display_name position
 //                                                 documentation ```java\nint position\n```
 //                                                  ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                                                                 ^^^^^^^^^^^^^^ definition local 29
+//                                                                                display_name spanSizeLookup
 //                                                                                documentation ```java\nunresolved_type spanSizeLookup\n```
 //                                                                                     ^^^^^^^^^ definition local 30
+//                                                                                               display_name spanCount
 //                                                                                               documentation ```java\nint spanCount\n```
     int totalSpan = 0;
 //      ^^^^^^^^^ definition local 31
+//                display_name totalSpan
 //                documentation ```java\nint totalSpan\n```
     for (int i = 0; i <= position; i++) {
 //           ^ definition local 32
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 32
 //                       ^^^^^^^^ reference local 28
@@ -497,22 +553,29 @@ private static boolean isInFirstRow(int position, SpanSizeLookup spanSizeLookup,
 
   private static boolean isInLastRow(int position, int itemCount, SpanSizeLookup spanSizeLookup,
 //                       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
+//                                   display_name isInLastRow
 //                                   documentation ```java\nprivate static boolean isInLastRow(int position, int itemCount, unresolved_type spanSizeLookup, int spanCount)\n```
 //                                       ^^^^^^^^ definition local 33
+//                                                display_name position
 //                                                documentation ```java\nint position\n```
 //                                                     ^^^^^^^^^ definition local 34
+//                                                               display_name itemCount
 //                                                               documentation ```java\nint itemCount\n```
 //                                                                ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                                                                               ^^^^^^^^^^^^^^ definition local 35
+//                                                                                              display_name spanSizeLookup
 //                                                                                              documentation ```java\nunresolved_type spanSizeLookup\n```
       int spanCount) {
 //        ^^^^^^^^^ definition local 36
+//                  display_name spanCount
 //                  documentation ```java\nint spanCount\n```
     int totalSpan = 0;
 //      ^^^^^^^^^ definition local 37
+//                display_name totalSpan
 //                documentation ```java\nint totalSpan\n```
     for (int i = itemCount - 1; i >= position; i--) {
 //           ^ definition local 38
+//             display_name i
 //             documentation ```java\nint i\n```
 //               ^^^^^^^^^ reference local 34
 //                              ^ reference local 38
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
index 5775b731c..7424aed06 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
@@ -72,9 +72,11 @@
  */
 public abstract class EpoxyModel<T> {
 //                    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
+//                               display_name EpoxyModel
 //                               documentation ```java\npublic abstract class EpoxyModel<T>\n```
 //                               documentation  Helper to bind data to a view using a builder style. The parameterized type should extend\n Android's View or EpoxyHolder.\n\n @see EpoxyModelWithHolder\n @see EpoxyModelWithView\n
 //                               ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
+//                                 display_name T
 //                                 documentation ```java\nT\n```
 
   /**
@@ -84,6 +86,7 @@ public abstract class EpoxyModel<T> {
    */
   private static long idCounter = -1;
 //                    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#idCounter.
+//                              display_name idCounter
 //                              documentation ```java\nprivate static long idCounter\n```
 //                              documentation  Counts how many of these objects are created, so that each new object can have a unique id .\n Uses negative values so that these autogenerated ids don't clash with database ids that may be\n set with {@link #id(long)}\n
 
@@ -94,14 +97,17 @@ public abstract class EpoxyModel<T> {
    */
   private long id;
 //             ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
+//                display_name id
 //                documentation ```java\nprivate long id\n```
 //                documentation  An id that can be used to uniquely identify this {@link EpoxyModel} for use in RecyclerView\n stable ids. It defaults to a unique id for this object instance, if you want to maintain the\n same id across instances use {@link #id(long)}\n
   @LayoutRes private int layout;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                       ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout.
+//                              display_name layout
 //                              documentation ```java\n@LayoutRes\nprivate int layout\n```
   private boolean shown = true;
 //                ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shown.
+//                      display_name shown
 //                      documentation ```java\nprivate boolean shown\n```
   /**
    * Set to true once this model is diffed in an adapter. Used to ensure that this model's id
@@ -109,6 +115,7 @@ public abstract class EpoxyModel<T> {
    */
   boolean addedToAdapter;
 //        ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addedToAdapter.
+//                       display_name addedToAdapter
 //                       documentation ```java\nboolean addedToAdapter\n```
 //                       documentation  Set to true once this model is diffed in an adapter. Used to ensure that this model's id\n doesn't change after being diffed.\n
   /**
@@ -119,6 +126,7 @@ public abstract class EpoxyModel<T> {
   private EpoxyController firstControllerAddedTo;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo.
+//                                               display_name firstControllerAddedTo
 //                                               documentation ```java\nprivate EpoxyController firstControllerAddedTo\n```
 //                                               documentation  The first controller this model was added to. A reference is kept in debug mode in order to run\n validations. The model is allowed to be added to other controllers, but we only keep a\n reference to the first.\n
   /**
@@ -129,27 +137,34 @@ public abstract class EpoxyModel<T> {
   EpoxyController controllerToStageTo;
 //^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#controllerToStageTo.
+//                                    display_name controllerToStageTo
 //                                    documentation ```java\nEpoxyController controllerToStageTo\n```
 //                                    documentation  Models are staged when they are changed. This allows them to be automatically added when they\n are done being changed (eg the next model is changed/added or buildModels finishes). It is only\n allowed for AutoModels, and only if implicit adding is enabled.\n
   private boolean currentlyInInterceptors;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#currentlyInInterceptors.
+//                                        display_name currentlyInInterceptors
 //                                        documentation ```java\nprivate boolean currentlyInInterceptors\n```
   private int hashCodeWhenAdded;
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCodeWhenAdded.
+//                              display_name hashCodeWhenAdded
 //                              documentation ```java\nprivate int hashCodeWhenAdded\n```
   private boolean hasDefaultId;
 //                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId.
+//                             display_name hasDefaultId
 //                             documentation ```java\nprivate boolean hasDefaultId\n```
   @Nullable private SpanSizeOverrideCallback spanSizeOverride;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
 //                                           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
+//                                                            display_name spanSizeOverride
 //                                                            documentation ```java\n@Nullable\nprivate SpanSizeOverrideCallback spanSizeOverride\n```
 
   protected EpoxyModel(long id) {
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
+//                     display_name <init>
 //                     documentation ```java\nprotected EpoxyModel(long id)\n```
 //                          ^^ definition local 0
+//                             display_name id
 //                             documentation ```java\nlong id\n```
     id(id);
 //  ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
@@ -158,6 +173,7 @@ protected EpoxyModel(long id) {
 
   public EpoxyModel() {
 //       ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`(+1).
+//                  display_name <init>
 //                  documentation ```java\npublic EpoxyModel()\n```
     this(idCounter--);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
@@ -168,6 +184,7 @@ public EpoxyModel() {
 
   boolean hasDefaultId() {
 //        ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId().
+//                     display_name hasDefaultId
 //                     documentation ```java\nboolean hasDefaultId()\n```
     return hasDefaultId;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId.
@@ -183,6 +200,7 @@ boolean hasDefaultId() {
    */
   protected int getViewType() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
+//                          display_name getViewType
 //                          documentation ```java\nprotected int getViewType()\n```
 //                          documentation  Get the view type to associate with this model in the recyclerview. For models that use a\n layout resource, the view type is simply the layout resource value by default.\n <p>\n If this returns 0 Epoxy will assign a unique view type for this model at run time.\n\n @see androidx.recyclerview.widget.RecyclerView.Adapter#getItemViewType(int)\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getViewType().
@@ -197,12 +215,14 @@ protected int getViewType() {
   protected View buildView(@NonNull ViewGroup parent) {
 //          ^^^^ reference semanticdb maven . . View#
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
+//                         display_name buildView
 //                         documentation ```java\nprotected unresolved_type buildView(unresolved_type parent)\n```
 //                         documentation  Create and return a new instance of a view for this model. By default a view is created by\n inflating the layout resource.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#buildView().
 //                          ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                  ^^^^^^^^^ reference semanticdb maven . . ViewGroup#
 //                                            ^^^^^^ definition local 1
+//                                                   display_name parent
 //                                                   documentation ```java\n@NonNull\nunresolved_type parent\n```
     return LayoutInflater.from(parent.getContext()).inflate(getLayout(), parent, false);
 //         ^^^^^^^^^^^^^^ reference semanticdb maven . . LayoutInflater#
@@ -220,6 +240,7 @@ protected View buildView(@NonNull ViewGroup parent) {
    */
   public void bind(@NonNull T view) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
+//                 display_name bind
 //                 documentation ```java\npublic void bind(T view)\n```
 //                 documentation  Binds the current data to the given view. You should bind all fields including unset/empty\n fields to ensure proper recycling.\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
@@ -228,6 +249,7 @@ public void bind(@NonNull T view) {
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                            ^^^^ definition local 2
+//                                 display_name view
 //                                 documentation ```java\n@NonNull\nT view\n```
 
   }
@@ -242,6 +264,7 @@ public void bind(@NonNull T view) {
    */
   public void bind(@NonNull T view, @NonNull List<Object> payloads) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
+//                 display_name bind
 //                 documentation ```java\npublic void bind(T view, List<Object> payloads)\n```
 //                 documentation  Similar to {@link #bind(Object)}, but provides a non null, non empty list of payloads\n describing what changed. This is the payloads list specified in the adapter's notifyItemChanged\n method. This is a useful optimization to allow you to only change part of a view instead of\n updating the whole thing, which may prevent unnecessary layout calls. If there are no payloads\n then {@link #bind(Object)} is called instead. This will only be used if the model is used with\n an {@link EpoxyAdapter}\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
@@ -249,11 +272,13 @@ public void bind(@NonNull T view, @NonNull List<Object> payloads) {
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                            ^^^^ definition local 3
+//                                 display_name view
 //                                 documentation ```java\n@NonNull\nT view\n```
 //                                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                           ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                        ^^^^^^^^ definition local 4
+//                                                                 display_name payloads
 //                                                                 documentation ```java\n@NonNull\nList<Object> payloads\n```
     bind(view);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
@@ -293,6 +318,7 @@ public void bind(@NonNull T view, @NonNull List<Object> payloads) {
    */
   public void bind(@NonNull T view, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
+//                 display_name bind
 //                 documentation ```java\npublic void bind(T view, EpoxyModel<?> previouslyBoundModel)\n```
 //                 documentation  Similar to {@link #bind(Object)}, but provides a non null model which was previously bound to\n this view. This will only be called if the model is used with an {@link EpoxyController}.\n\n @param previouslyBoundModel This is a model with the same id that was previously bound. You can\n                             compare this previous model with the current one to see exactly\n                             what changed.\n                             <p>\n                             This model and the previously bound model are guaranteed to have\n                             the same id, but will not necessarily be of the same type depending\n                             on your implementation of {@link EpoxyController#buildModels()}.\n                             With common usage patterns of Epoxy they should be the same type,\n                             and will only differ if you are using different model classes with\n                             the same id.\n                             <p>\n                             Comparing the newly bound model with the previous model allows you\n                             to be more intelligent when binding your view. This may help you\n                             optimize view binding, or make it easier to work with animations.\n                             <p>\n                             If the new model and the previous model have the same view type\n                             (given by {@link EpoxyModel#getViewType()}), and if you are using\n                             the default ReyclerView item animator, the same view will be\n                             reused. This means that you only need to update the view to reflect\n                             the data that changed. If you are using a custom item animator then\n                             the view will be the same if the animator returns true in\n                             canReuseUpdatedViewHolder.\n                             <p>\n                             This previously bound model is taken as a payload from the diffing\n                             process, and follows the same general conditions for all\n                             recyclerview change payloads.\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
@@ -300,10 +326,12 @@ public void bind(@NonNull T view, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                            ^^^^ definition local 5
+//                                 display_name view
 //                                 documentation ```java\n@NonNull\nT view\n```
 //                                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                         ^^^^^^^^^^^^^^^^^^^^ definition local 6
+//                                                                              display_name previouslyBoundModel
 //                                                                              documentation ```java\n@NonNull\nEpoxyModel<?> previouslyBoundModel\n```
     bind(view);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
@@ -322,6 +350,7 @@ public void bind(@NonNull T view, @NonNull EpoxyModel<?> previouslyBoundModel) {
    */
   public void unbind(@NonNull T view) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
+//                   display_name unbind
 //                   documentation ```java\npublic void unbind(T view)\n```
 //                   documentation  Called when the view bound to this model is recycled. Subclasses can override this if their\n view should release resources when it's recycled.\n <p>\n Note that {@link #bind(Object)} can be called multiple times without an unbind call in between\n if the view has remained on screen to be reused across item changes. This means that you should\n not rely on unbind to clear a view or model's state before bind is called again.\n\n @see EpoxyAdapter#onViewRecycled(EpoxyViewHolder)\n
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
@@ -330,6 +359,7 @@ public void unbind(@NonNull T view) {
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                              ^^^^ definition local 7
+//                                   display_name view
 //                                   documentation ```java\n@NonNull\nT view\n```
   }
 
@@ -340,15 +370,18 @@ public void unbind(@NonNull T view) {
    */
   public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T view) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
+//                                     display_name onVisibilityStateChanged
 //                                     documentation ```java\npublic void onVisibilityStateChanged(int visibilityState, T view)\n```
 //                                     documentation  TODO link to the wiki\n\n @see OnVisibilityStateChanged annotation\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged().
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                     ^^^^^^^^^^^^^^^ definition local 8
+//                                                                     display_name visibilityState
 //                                                                     documentation ```java\n@Visibility\nint visibilityState\n```
 //                                                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                                                                 ^^^^ definition local 9
+//                                                                                      display_name view
 //                                                                                      documentation ```java\n@NonNull\nT view\n```
   }
 
@@ -359,6 +392,7 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T
    */
   public void onVisibilityChanged(
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
+//                                display_name onVisibilityChanged
 //                                documentation ```java\npublic void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T view)\n```
 //                                documentation  TODO link to the wiki\n\n @see OnVisibilityChanged annotation\n
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
@@ -367,31 +401,37 @@ public void onVisibilityChanged(
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                                ^^^^^^^^^^^^^^^^^^^^ definition local 10
+//                                                                     display_name percentVisibleHeight
 //                                                                     documentation ```java\n@FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleHeight\n```
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                                ^^^^^^^^^^^^^^^^^^^ definition local 11
+//                                                                    display_name percentVisibleWidth
 //                                                                    documentation ```java\n@FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleWidth\n```
       @Px int visibleHeight,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 12
+//                          display_name visibleHeight
 //                          documentation ```java\n@Px\nint visibleHeight\n```
       @Px int visibleWidth,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^ definition local 13
+//                         display_name visibleWidth
 //                         documentation ```java\n@Px\nint visibleWidth\n```
       @NonNull T view
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //               ^^^^ definition local 14
+//                    display_name view
 //                    documentation ```java\n@NonNull\nT view\n```
   ) {
   }
 
   public long id() {
 //            ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id().
+//               display_name id
 //               documentation ```java\npublic long id()\n```
     return id;
 //         ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
@@ -406,9 +446,11 @@ public EpoxyModel<T> id(long id) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
+//                        display_name id
 //                        documentation ```java\npublic EpoxyModel<T> id(long id)\n```
 //                        documentation  Override the default id in cases where the data subject naturally has an id, like an object\n from a database. This id can only be set before the model is added to the adapter, it is an\n error to change the id after that.\n
 //                             ^^ definition local 15
+//                                display_name id
 //                                documentation ```java\nlong id\n```
     if ((addedToAdapter || firstControllerAddedTo != null) && id != this.id) {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addedToAdapter.
@@ -438,14 +480,17 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+2).
+//                        display_name id
 //                        documentation ```java\npublic EpoxyModel<T> id(Number[] ids)\n```
 //                        documentation  Use multiple numbers as the id for this model. Useful when you don't have a single long that\n represents a unique id.\n <p>\n This hashes the numbers, so there is a tiny risk of collision with other ids.\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Number#
 //                                            ^^^ definition local 16
+//                                                display_name ids
 //                                                documentation ```java\n@Nullable\nNumber[] ids\n```
     long result = 0;
 //       ^^^^^^ definition local 17
+//              display_name result
 //              documentation ```java\nlong result\n```
     if (ids != null) {
 //      ^^^ reference local 16
@@ -453,6 +498,7 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //          ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                   ^^^^^^ reference semanticdb maven jdk 11 java/lang/Number#
 //                          ^^ definition local 18
+//                             display_name id
 //                             documentation ```java\n@Nullable\nNumber id\n```
 //                               ^^^ reference local 16
         result = 31 * result + hashLong64Bit(id == null ? 0 : id.hashCode());
@@ -479,14 +525,18 @@ public EpoxyModel<T> id(long id1, long id2) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+3).
+//                        display_name id
 //                        documentation ```java\npublic EpoxyModel<T> id(long id1, long id2)\n```
 //                        documentation  Use two numbers as the id for this model. Useful when you don't have a single long that\n represents a unique id.\n <p>\n This hashes the two numbers, so there is a tiny risk of collision with other ids.\n
 //                             ^^^ definition local 19
+//                                 display_name id1
 //                                 documentation ```java\nlong id1\n```
 //                                       ^^^ definition local 20
+//                                           display_name id2
 //                                           documentation ```java\nlong id2\n```
     long result = hashLong64Bit(id1);
 //       ^^^^^^ definition local 21
+//              display_name result
 //              documentation ```java\nlong result\n```
 //                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashLong64Bit().
 //                              ^^^ reference local 19
@@ -516,11 +566,13 @@ public EpoxyModel<T> id(@Nullable CharSequence key) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+4).
+//                        display_name id
 //                        documentation ```java\npublic EpoxyModel<T> id(CharSequence key)\n```
 //                        documentation  Use a string as the model id. Useful for models that don't clearly map to a numerical id. This\n is preferable to using {@link String#hashCode()} because that is a 32 bit hash and this is a 64\n bit hash, giving better spread and less chance of collision with other ids.\n <p>\n Since this uses a hashcode method to convert the String to a long there is a very small chance\n that you may have a collision with another id. Assuming an even spread of hashcodes, and\n several hundred models in the adapter, there would be roughly 1 in 100 trillion chance of a\n collision. (http://preshing.com/20110504/hash-collision-probabilities/)\n\n @see IdUtils#hashString64Bit(CharSequence)\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^ definition local 22
+//                                                   display_name key
 //                                                   documentation ```java\n@Nullable\nCharSequence key\n```
     id(hashString64Bit(key));
 //  ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
@@ -538,18 +590,22 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
+//                        display_name id
 //                        documentation ```java\npublic EpoxyModel<T> id(CharSequence key, CharSequence[] otherKeys)\n```
 //                        documentation  Use several strings to define the id of the model.\n <p>\n Similar to {@link #id(CharSequence)}, but with additional strings.\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^ definition local 23
+//                                                   display_name key
 //                                                   documentation ```java\n@Nullable\nCharSequence key\n```
 //                                                     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                                              ^^^^^^^^^ definition local 24
+//                                                                                        display_name otherKeys
 //                                                                                        documentation ```java\n@Nullable\nCharSequence[] otherKeys\n```
     long result = hashString64Bit(key);
 //       ^^^^^^ definition local 25
+//              display_name result
 //              documentation ```java\nlong result\n```
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                ^^^ reference local 23
@@ -558,6 +614,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
       for (CharSequence otherKey : otherKeys) {
 //         ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                      ^^^^^^^^ definition local 26
+//                               display_name otherKey
 //                               documentation ```java\nCharSequence otherKey\n```
 //                                 ^^^^^^^^^ reference local 24
         result = 31 * result + hashString64Bit(otherKey);
@@ -588,16 +645,20 @@ public EpoxyModel<T> id(@Nullable CharSequence key, long id) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+6).
+//                        display_name id
 //                        documentation ```java\npublic EpoxyModel<T> id(CharSequence key, long id)\n```
 //                        documentation  Set an id that is namespaced with a string. This is useful when you need to show models of\n multiple types, side by side and don't want to risk id collisions.\n <p>\n Since this uses a hashcode method to convert the String to a long there is a very small chance\n that you may have a collision with another id. Assuming an even spread of hashcodes, and\n several hundred models in the adapter, there would be roughly 1 in 100 trillion chance of a\n collision. (http://preshing.com/20110504/hash-collision-probabilities/)\n\n @see IdUtils#hashString64Bit(CharSequence)\n @see IdUtils#hashLong64Bit(long)\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^ definition local 27
+//                                                   display_name key
 //                                                   documentation ```java\n@Nullable\nCharSequence key\n```
 //                                                         ^^ definition local 28
+//                                                            display_name id
 //                                                            documentation ```java\nlong id\n```
     long result = hashString64Bit(key);
 //       ^^^^^^ definition local 29
+//              display_name result
 //              documentation ```java\nlong result\n```
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                ^^^ reference local 27
@@ -627,6 +688,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, long id) {
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
   protected abstract int getDefaultLayout();
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
+//                                        display_name getDefaultLayout
 //                                        documentation ```java\n@LayoutRes\nprotected abstract int getDefaultLayout()\n```
 //                                        documentation  Return the default layout resource to be used when creating views for this model. The resource\n will be inflated to create a view for the model; additionally the layout int is used as the\n views type in the RecyclerView.\n <p>\n This can be left unimplemented if you use the {@link EpoxyModelClass} annotation to define a\n layout.\n <p>\n This default value can be overridden with {@link #layout(int)} at runtime to change the layout\n dynamically.\n
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getDefaultLayout().
@@ -640,10 +702,12 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout().
+//                            display_name layout
 //                            documentation ```java\n@NonNull\npublic EpoxyModel<T> layout(int layoutRes)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#layout().
 //                             ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                           ^^^^^^^^^ definition local 30
+//                                                     display_name layoutRes
 //                                                     documentation ```java\n@LayoutRes\nint layoutRes\n```
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
@@ -657,6 +721,7 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
   public final int getLayout() {
 //                 ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getLayout().
+//                           display_name getLayout
 //                           documentation ```java\n@LayoutRes\npublic final int getLayout()\n```
     if (layout == 0) {
 //      ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout.
@@ -677,6 +742,7 @@ public EpoxyModel<T> reset() {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#reset().
+//                           display_name reset
 //                           documentation ```java\n@NonNull\npublic EpoxyModel<T> reset()\n```
 //                           documentation  Sets fields of the model to default ones.\n
     onMutation();
@@ -696,11 +762,13 @@ public EpoxyModel<T> reset() {
    */
   public void addTo(@NonNull EpoxyController controller) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addTo().
+//                  display_name addTo
 //                  documentation ```java\npublic void addTo(EpoxyController controller)\n```
 //                  documentation  Add this model to the given controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                           ^^^^^^^^^^ definition local 31
+//                                                      display_name controller
 //                                                      documentation ```java\n@NonNull\nEpoxyController controller\n```
     controller.addInternal(this);
 //  ^^^^^^^^^^ reference local 31
@@ -713,13 +781,16 @@ public void addTo(@NonNull EpoxyController controller) {
    */
   public void addIf(boolean condition, @NonNull EpoxyController controller) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf().
+//                  display_name addIf
 //                  documentation ```java\npublic void addIf(boolean condition, EpoxyController controller)\n```
 //                  documentation  Add this model to the given controller if the condition is true. Can only be called from inside\n {@link EpoxyController#buildModels()}.\n
 //                          ^^^^^^^^^ definition local 32
+//                                    display_name condition
 //                                    documentation ```java\nboolean condition\n```
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                              ^^^^^^^^^^ definition local 33
+//                                                                         display_name controller
 //                                                                         documentation ```java\n@NonNull\nEpoxyController controller\n```
     if (condition) {
 //      ^^^^^^^^^ reference local 32
@@ -745,15 +816,18 @@ public void addIf(boolean condition, @NonNull EpoxyController controller) {
    */
   public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController controller) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf(+1).
+//                  display_name addIf
 //                  documentation ```java\npublic void addIf(AddPredicate predicate, EpoxyController controller)\n```
 //                  documentation  Add this model to the given controller if the {@link AddPredicate} return true. Can only be\n called from inside {@link EpoxyController#buildModels()}.\n
 //                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#
 //                                        ^^^^^^^^^ definition local 34
+//                                                  display_name predicate
 //                                                  documentation ```java\n@NonNull\nAddPredicate predicate\n```
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                                            ^^^^^^^^^^ definition local 35
+//                                                                                       display_name controller
 //                                                                                       documentation ```java\n@NonNull\nEpoxyController controller\n```
     addIf(predicate.addIf(), controller);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf().
@@ -767,10 +841,12 @@ public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController cont
    */
   public interface AddPredicate {
 //                 ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#
+//                              display_name AddPredicate
 //                              documentation ```java\npublic interface AddPredicate\n```
 //                              documentation  @see #addIf(AddPredicate, EpoxyController)\n
     boolean addIf();
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#addIf().
+//                display_name addIf
 //                documentation ```java\npublic abstract boolean addIf()\n```
   }
 
@@ -780,11 +856,13 @@ public interface AddPredicate {
    */
   protected final void addWithDebugValidation(@NonNull EpoxyController controller) {
 //                     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addWithDebugValidation().
+//                                            display_name addWithDebugValidation
 //                                            documentation ```java\nprotected final void addWithDebugValidation(EpoxyController controller)\n```
 //                                            documentation  This is used internally by generated models to turn on validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with an {@link EpoxyController}.\n
 //                                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                                     ^^^^^^^^^^ definition local 36
+//                                                                                display_name controller
 //                                                                                documentation ```java\n@NonNull\nEpoxyController controller\n```
     if (controller == null) {
 //      ^^^^^^^^^^ reference local 36
@@ -827,10 +905,12 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller)
 //       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
         public void onInterceptorsStarted(EpoxyController controller) {
 //                  ^^^^^^^^^^^^^^^^^^^^^ definition local 38
+//                                        display_name onInterceptorsStarted
 //                                        documentation ```java\n@Override\npublic void onInterceptorsStarted(EpoxyController controller)\n```
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                        ^^^^^^^^^^ definition local 39
+//                                                                   display_name controller
 //                                                                   documentation ```java\nEpoxyController controller\n```
           currentlyInInterceptors = true;
 //        ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#currentlyInInterceptors.
@@ -840,10 +920,12 @@ public void onInterceptorsStarted(EpoxyController controller) {
 //       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
         public void onInterceptorsFinished(EpoxyController controller) {
 //                  ^^^^^^^^^^^^^^^^^^^^^^ definition local 40
+//                                         display_name onInterceptorsFinished
 //                                         documentation ```java\n@Override\npublic void onInterceptorsFinished(EpoxyController controller)\n```
 //                                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                         ^^^^^^^^^^ definition local 41
+//                                                                    display_name controller
 //                                                                    documentation ```java\nEpoxyController controller\n```
           hashCodeWhenAdded = EpoxyModel.this.hashCode();
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCodeWhenAdded.
@@ -859,6 +941,7 @@ public void onInterceptorsFinished(EpoxyController controller) {
 
   boolean isDebugValidationEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isDebugValidationEnabled().
+//                                 display_name isDebugValidationEnabled
 //                                 documentation ```java\nboolean isDebugValidationEnabled()\n```
     return firstControllerAddedTo != null;
 //         ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo.
@@ -876,6 +959,7 @@ boolean isDebugValidationEnabled() {
    */
   protected final void onMutation() {
 //                     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
+//                                display_name onMutation
 //                                documentation ```java\nprotected final void onMutation()\n```
 //                                documentation  This is used internally by generated models to do validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with an {@link EpoxyController}.\n This method validates that it is ok to change this model. It is only valid if the model hasn't\n yet been added, or the change is being done from an {@link EpoxyController.Interceptor}\n callback.\n <p>\n This is also used to stage the model for implicitly adding it, if it is an AutoModel and\n implicit adding is enabled.\n
     // The model may be added to multiple controllers, in which case if it was already diffed
@@ -901,15 +985,18 @@ protected final void onMutation() {
 
   private static int getPosition(@NonNull EpoxyController controller,
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getPosition().
+//                               display_name getPosition
 //                               documentation ```java\nprivate static int getPosition(EpoxyController controller, EpoxyModel<?> model)\n```
 //                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                        ^^^^^^^^^^ definition local 42
+//                                                                   display_name controller
 //                                                                   documentation ```java\n@NonNull\nEpoxyController controller\n```
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 43
+//                                 display_name model
 //                                 documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
     // If the model was added to multiple controllers, or was removed from the controller and then
     // modified, this won't be correct. But those should be very rare cases that we don't need to
@@ -941,13 +1028,16 @@ private static int getPosition(@NonNull EpoxyController controller,
    */
   protected final void validateStateHasNotChangedSinceAdded(String descriptionOfChange,
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#validateStateHasNotChangedSinceAdded().
+//                                                          display_name validateStateHasNotChangedSinceAdded
 //                                                          documentation ```java\nprotected final void validateStateHasNotChangedSinceAdded(String descriptionOfChange, int modelPosition)\n```
 //                                                          documentation  This is used internally by generated models to do validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with a {@link EpoxyController}. This\n method validates that the model's hashCode hasn't been changed since it was added to the\n controller. This is similar to {@link #onMutation()}, but that method is only used for\n specific model changes such as calling a setter. By checking the hashCode, this method allows\n us to catch more subtle changes, such as through setting a field directly or through changing\n an object that is set on the model.\n
 //                                                          ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                                                 ^^^^^^^^^^^^^^^^^^^ definition local 44
+//                                                                                     display_name descriptionOfChange
 //                                                                                     documentation ```java\nString descriptionOfChange\n```
       int modelPosition) {
 //        ^^^^^^^^^^^^^ definition local 45
+//                      display_name modelPosition
 //                      documentation ```java\nint modelPosition\n```
     if (isDebugValidationEnabled()
 //      ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isDebugValidationEnabled().
@@ -967,12 +1057,14 @@ protected final void validateStateHasNotChangedSinceAdded(String descriptionOfCh
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
+//                      display_name equals
 //                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 46
+//                               display_name o
 //                               documentation ```java\nObject o\n```
     if (this == o) {
 //              ^ reference local 46
@@ -987,6 +1079,7 @@ public boolean equals(Object o) {
     EpoxyModel<?> that = (EpoxyModel<?>) o;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^ definition local 47
+//                     display_name that
 //                     documentation ```java\nEpoxyModel<?> that\n```
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^ reference local 46
@@ -1013,12 +1106,14 @@ public boolean equals(Object o) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
+//                    display_name hashCode
 //                    documentation ```java\n@Override\npublic int hashCode()\n```
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = (int) (id ^ (id >>> 32));
 //      ^^^^^^ definition local 48
+//             display_name result
 //             documentation ```java\nint result\n```
 //                      ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
 //                            ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
@@ -1044,16 +1139,20 @@ public int hashCode() {
    */
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
+//                       display_name getSpanSize
 //                       documentation ```java\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)\n```
 //                       documentation  Subclasses can override this if they want their view to take up more than one span in a grid\n layout.\n\n @param totalSpanCount The number of spans in the grid\n @param position       The position of the model\n @param itemCount      The total number of items in the adapter\n
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize().
 //                           ^^^^^^^^^^^^^^ definition local 49
+//                                          display_name totalSpanCount
 //                                          documentation ```java\nint totalSpanCount\n```
 //                                               ^^^^^^^^ definition local 50
+//                                                        display_name position
 //                                                        documentation ```java\nint position\n```
 //                                                             ^^^^^^^^^ definition local 51
+//                                                                       display_name itemCount
 //                                                                       documentation ```java\nint itemCount\n```
     return 1;
   }
@@ -1062,10 +1161,12 @@ public EpoxyModel<T> spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride().
+//                                      display_name spanSizeOverride
 //                                      documentation ```java\npublic EpoxyModel<T> spanSizeOverride(SpanSizeOverrideCallback spanSizeCallback)\n```
 //                                       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
 //                                                                         ^^^^^^^^^^^^^^^^ definition local 52
+//                                                                                          display_name spanSizeCallback
 //                                                                                          documentation ```java\n@Nullable\nSpanSizeOverrideCallback spanSizeCallback\n```
     this.spanSizeOverride = spanSizeCallback;
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
@@ -1075,15 +1176,20 @@ public EpoxyModel<T> spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz
 
   public interface SpanSizeOverrideCallback {
 //                 ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
+//                                          display_name SpanSizeOverrideCallback
 //                                          documentation ```java\npublic interface SpanSizeOverrideCallback\n```
     int getSpanSize(int totalSpanCount, int position, int itemCount);
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize().
+//                  display_name getSpanSize
 //                  documentation ```java\npublic abstract int getSpanSize(int totalSpanCount, int position, int itemCount)\n```
 //                      ^^^^^^^^^^^^^^ definition local 53
+//                                     display_name totalSpanCount
 //                                     documentation ```java\nint totalSpanCount\n```
 //                                          ^^^^^^^^ definition local 54
+//                                                   display_name position
 //                                                   documentation ```java\nint position\n```
 //                                                        ^^^^^^^^^ definition local 55
+//                                                                  display_name itemCount
 //                                                                  documentation ```java\nint itemCount\n```
   }
 
@@ -1093,13 +1199,17 @@ public interface SpanSizeOverrideCallback {
    */
   public final int spanSize(int totalSpanCount, int position, int itemCount) {
 //                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSize().
+//                          display_name spanSize
 //                          documentation ```java\npublic final int spanSize(int totalSpanCount, int position, int itemCount)\n```
 //                          documentation  Returns the actual span size of this model, using the {@link SpanSizeOverrideCallback} if one\n was set, otherwise using the value from {@link #getSpanSize(int, int, int)}\n
 //                              ^^^^^^^^^^^^^^ definition local 56
+//                                             display_name totalSpanCount
 //                                             documentation ```java\nint totalSpanCount\n```
 //                                                  ^^^^^^^^ definition local 57
+//                                                           display_name position
 //                                                           documentation ```java\nint position\n```
 //                                                                ^^^^^^^^^ definition local 58
+//                                                                          display_name itemCount
 //                                                                          documentation ```java\nint itemCount\n```
     if (spanSizeOverride != null) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
@@ -1129,6 +1239,7 @@ public EpoxyModel<T> show() {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show().
+//                          display_name show
 //                          documentation ```java\n@NonNull\npublic EpoxyModel<T> show()\n```
 //                          documentation  Change the visibility of the model so that it's view is shown. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
     return show(true);
@@ -1146,9 +1257,11 @@ public EpoxyModel<T> show(boolean show) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show(+1).
+//                          display_name show
 //                          documentation ```java\n@NonNull\npublic EpoxyModel<T> show(boolean show)\n```
 //                          documentation  Change the visibility of the model's view. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
 //                                  ^^^^ definition local 59
+//                                       display_name show
 //                                       documentation ```java\nboolean show\n```
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
@@ -1169,6 +1282,7 @@ public EpoxyModel<T> hide() {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hide().
+//                          display_name hide
 //                          documentation ```java\n@NonNull\npublic EpoxyModel<T> hide()\n```
 //                          documentation  Change the visibility of the model so that it's view is hidden. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
     return show(false);
@@ -1181,6 +1295,7 @@ public EpoxyModel<T> hide() {
    */
   public boolean isShown() {
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isShown().
+//                       display_name isShown
 //                       documentation ```java\npublic boolean isShown()\n```
 //                       documentation  Whether the model's view should be shown on screen. If false it won't be inflated and drawn,\n and will be like it was never added to the recycler view.\n
     return shown;
@@ -1192,6 +1307,7 @@ public boolean isShown() {
    */
   public boolean shouldSaveViewState() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shouldSaveViewState().
+//                                   display_name shouldSaveViewState
 //                                   documentation ```java\npublic boolean shouldSaveViewState()\n```
 //                                   documentation  Whether the adapter should save the state of the view bound to this model.\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(+1).
@@ -1209,12 +1325,14 @@ public boolean shouldSaveViewState() {
    */
   public boolean onFailedToRecycleView(@NonNull T view) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
+//                                     display_name onFailedToRecycleView
 //                                     documentation ```java\npublic boolean onFailedToRecycleView(T view)\n```
 //                                     documentation  Called if the RecyclerView failed to recycle this model's view. You can take this opportunity\n to clear the animation(s) that affect the View's transient state and return <code>true</code>\n so that the View can be recycled. Keep in mind that the View in question is already removed\n from the RecyclerView.\n\n @return True if the View should be recycled, false otherwise\n @see EpoxyAdapter#onFailedToRecycleView(androidx.recyclerview.widget.RecyclerView.ViewHolder)\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                                ^^^^ definition local 60
+//                                                     display_name view
 //                                                     documentation ```java\n@NonNull\nT view\n```
     return false;
   }
@@ -1226,6 +1344,7 @@ public boolean onFailedToRecycleView(@NonNull T view) {
    */
   public void onViewAttachedToWindow(@NonNull T view) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
+//                                   display_name onViewAttachedToWindow
 //                                   documentation ```java\npublic void onViewAttachedToWindow(T view)\n```
 //                                   documentation  Called when this model's view is attached to the window.\n\n @see EpoxyAdapter#onViewAttachedToWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder)\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
@@ -1233,6 +1352,7 @@ public void onViewAttachedToWindow(@NonNull T view) {
 //                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                              ^^^^ definition local 61
+//                                                   display_name view
 //                                                   documentation ```java\n@NonNull\nT view\n```
 
   }
@@ -1245,6 +1365,7 @@ public void onViewAttachedToWindow(@NonNull T view) {
    */
   public void onViewDetachedFromWindow(@NonNull T view) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
+//                                     display_name onViewDetachedFromWindow
 //                                     documentation ```java\npublic void onViewDetachedFromWindow(T view)\n```
 //                                     documentation  Called when this model's view is detached from the the window.\n\n @see EpoxyAdapter#onViewDetachedFromWindow(androidx.recyclerview.widget.RecyclerView\n .ViewHolder)\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
@@ -1252,6 +1373,7 @@ public void onViewDetachedFromWindow(@NonNull T view) {
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                                ^^^^ definition local 62
+//                                                     display_name view
 //                                                     documentation ```java\n@NonNull\nT view\n```
 
   }
@@ -1261,6 +1383,7 @@ public void onViewDetachedFromWindow(@NonNull T view) {
   public String toString() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#toString().
+//                       display_name toString
 //                       documentation ```java\n@Override\npublic String toString()\n```
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return getClass().getSimpleName() + "{"
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
index e6e5691bd..59ec009f3 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
@@ -98,6 +98,7 @@
 //^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
+//                           display_name EpoxyModelGroup
 //                           documentation ```java\n@SuppressWarnings("rawtypes")\npublic class EpoxyModelGroup\n```
 //                           documentation  An {@link EpoxyModel} that contains other models, and allows you to combine those models in\n whatever view configuration you want.\n <p>\n The constructors take a list of models and a layout resource. The layout must have a viewgroup as\n its top level view; it determines how the view of each model is laid out. There are two ways to\n specify this\n <p>\n 1. Leave the viewgroup empty. The view for each model will be inflated and added in order. This\n works fine if you don't need to include any other views, your model views don't need their layout\n params changed, and your views don't need ids (eg for saving state).\n <p>\n Alternatively you can have nested view groups, with the innermost viewgroup given the id\n "epoxy_model_group_child_container" to mark it as the viewgroup that should have the model views\n added to it. The viewgroup marked with this id should be empty. This allows you to nest\n viewgroups, such as a LinearLayout inside of a CardView.\n <p>\n 2. Include a {@link ViewStub} for each of the models in the list. There should be at least as\n many view stubs as models. Extra stubs will be ignored. Each model will have its view replace the\n stub in order of the view stub's position in the view group. That is, the view group's children\n will be iterated through in order. The first view stub found will be used for the first model in\n the models list, the second view stub will be used for the second model, and so on. A depth first\n recursive search through nested viewgroups is done to find these viewstubs.\n <p>\n The layout can be of any ViewGroup subclass, and can have arbitrary other child views besides the\n view stubs. It can arrange the views and view stubs however is needed.\n <p>\n Any layout param options set on the view stubs will be transferred to the corresponding model\n view by default. If you want a model to keep the layout params from it's own layout resource you\n can override {@link #useViewStubLayoutParams(EpoxyModel, int)}\n <p>\n If you want to override the id used for a model's view you can set {@link\n ViewStub#setInflatedId(int)} via xml. That id will be transferred over to the view taking that\n stub's place. This is necessary if you want your model to save view state, since without this the\n model's view won't have an id to associate the saved state with.\n <p>\n By default this model inherits the same id as the first model in the list. Call {@link #id(long)}\n to override that if needed.\n <p>\n When a model group is recycled, its child views are automatically recycled to a pool that is\n shared with all other model groups in the activity. This enables model groups to more efficiently\n manage their children. The shared pool is cleaned up when the activity is destroyed.\n
 //                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -109,10 +110,12 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
 //                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
+//                                           display_name models
 //                                           documentation ```java\nprotected final List<EpoxyModel<?>> models\n```
 
   private boolean shouldSaveViewStateDefault = false;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewStateDefault.
+//                                           display_name shouldSaveViewStateDefault
 //                                           documentation ```java\nprivate boolean shouldSaveViewStateDefault\n```
 
   @Nullable
@@ -120,6 +123,7 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
   private Boolean shouldSaveViewState = null;
 //        ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Boolean#
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState.
+//                                    display_name shouldSaveViewState
 //                                    documentation ```java\n@Nullable\nprivate Boolean shouldSaveViewState\n```
 
   /**
@@ -128,14 +132,17 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
    */
   public EpoxyModelGroup(@LayoutRes int layoutRes, Collection<? extends EpoxyModel<?>> models) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\npublic EpoxyModelGroup(int layoutRes, Collection<? extends EpoxyModel<?>> models)\n```
 //                       documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                      ^^^^^^^^^ definition local 0
+//                                                display_name layoutRes
 //                                                documentation ```java\n@LayoutRes\nint layoutRes\n```
 //                                                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                     ^^^^^^ definition local 1
+//                                                                                            display_name models
 //                                                                                            documentation ```java\nCollection<? extends EpoxyModel<?>> models\n```
     this(layoutRes, new ArrayList<>(models));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
@@ -150,13 +157,16 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, Collection<? extends EpoxyModel
    */
   public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel<?>... models) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+1).
+//                       display_name <init>
 //                       documentation ```java\npublic EpoxyModelGroup(int layoutRes, EpoxyModel<?>[] models)\n```
 //                       documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                      ^^^^^^^^^ definition local 2
+//                                                display_name layoutRes
 //                                                documentation ```java\n@LayoutRes\nint layoutRes\n```
 //                                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^^ definition local 3
+//                                                                         display_name models
 //                                                                         documentation ```java\nEpoxyModel<?>[] models\n```
     this(layoutRes, new ArrayList<>(Arrays.asList(models)));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
@@ -173,14 +183,17 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel<?>... models) {
    */
   private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
 //        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
+//                        display_name <init>
 //                        documentation ```java\nprivate EpoxyModelGroup(int layoutRes, List<EpoxyModel<?>> models)\n```
 //                        documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                         ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                       ^^^^^^^^^ definition local 4
+//                                                 display_name layoutRes
 //                                                 documentation ```java\n@LayoutRes\nint layoutRes\n```
 //                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                      ^^^^^^ definition local 5
+//                                                                             display_name models
 //                                                                             documentation ```java\nList<EpoxyModel<?>> models\n```
     if (models.isEmpty()) {
 //      ^^^^^^ reference local 5
@@ -203,10 +216,12 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
 
     boolean saveState = false;
 //          ^^^^^^^^^ definition local 6
+//                    display_name saveState
 //                    documentation ```java\nboolean saveState\n```
     for (EpoxyModel<?> model : models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 7
+//                           display_name model
 //                           documentation ```java\nEpoxyModel<?> model\n```
 //                             ^^^^^^ reference local 5
       if (model.shouldSaveViewState()) {
@@ -228,6 +243,7 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
    */
   protected EpoxyModelGroup() {
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+3).
+//                          display_name <init>
 //                          documentation ```java\nprotected EpoxyModelGroup()\n```
 //                          documentation  Constructor use for DSL\n
     models = new ArrayList<>();
@@ -242,10 +258,12 @@ protected EpoxyModelGroup() {
    */
   protected EpoxyModelGroup(@LayoutRes int layoutRes) {
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+4).
+//                          display_name <init>
 //                          documentation ```java\nprotected EpoxyModelGroup(int layoutRes)\n```
 //                          documentation  Constructor use for DSL\n
 //                           ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                         ^^^^^^^^^ definition local 8
+//                                                   display_name layoutRes
 //                                                   documentation ```java\n@LayoutRes\nint layoutRes\n```
     this();
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+3).
@@ -256,10 +274,12 @@ protected EpoxyModelGroup(@LayoutRes int layoutRes) {
 
   protected void addModel(@NonNull EpoxyModel<?> model) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#addModel().
+//                        display_name addModel
 //                        documentation ```java\nprotected void addModel(EpoxyModel<?> model)\n```
 //                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^ definition local 9
+//                                                     display_name model
 //                                                     documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
     // By default we save view state if any of the models need to save state.
     shouldSaveViewStateDefault |= model.shouldSaveViewState();
@@ -278,12 +298,14 @@ protected void addModel(@NonNull EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void bind(@NonNull ModelGroupHolder holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
+//                 display_name bind
 //                 documentation ```java\n@CallSuper\n@Override\npublic void bind(unresolved_type holder)\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                           ^^^^^^ definition local 10
+//                                                  display_name holder
 //                                                  documentation ```java\n@NonNull\nunresolved_type holder\n```
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
@@ -293,15 +315,19 @@ public void bind(@NonNull ModelGroupHolder holder) {
 //     ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 12
+//                        display_name onModel
 //                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 13
+//                                         display_name model
 //                                         documentation ```java\nEpoxyModel model\n```
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 14
+//                                                                     display_name viewHolder
 //                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                          ^^^^^^^^^^ definition local 15
+//                                                                                     display_name modelIndex
 //                                                                                     documentation ```java\nint modelIndex\n```
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
@@ -324,17 +350,20 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void bind(@NonNull ModelGroupHolder holder, @NonNull final List<Object> payloads) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
+//                 display_name bind
 //                 documentation ```java\n@CallSuper\n@Override\npublic void bind(unresolved_type holder, List<Object> payloads)\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                           ^^^^^^ definition local 16
+//                                                  display_name holder
 //                                                  documentation ```java\n@NonNull\nunresolved_type holder\n```
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                               ^^^^^^^^ definition local 17
+//                                                                                        display_name payloads
 //                                                                                        documentation ```java\n@NonNull\nfinal List<Object> payloads\n```
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
@@ -344,15 +373,19 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull final List<Object> p
 //     ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 19
+//                        display_name onModel
 //                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 20
+//                                         display_name model
 //                                         documentation ```java\nEpoxyModel model\n```
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 21
+//                                                                     display_name viewHolder
 //                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                          ^^^^^^^^^^ definition local 22
+//                                                                                     display_name modelIndex
 //                                                                                     documentation ```java\nint modelIndex\n```
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
@@ -373,16 +406,19 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
+//                 display_name bind
 //                 documentation ```java\n@Override\npublic void bind(unresolved_type holder, EpoxyModel<?> previouslyBoundModel)\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                           ^^^^^^ definition local 23
+//                                                  display_name holder
 //                                                  documentation ```java\n@NonNull\nunresolved_type holder\n```
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^^^^^^^^^^^^^^^^^^^^ definition local 24
+//                                                                                               display_name previouslyBoundModel
 //                                                                                               documentation ```java\n@NonNull\nEpoxyModel<?> previouslyBoundModel\n```
     if (!(previouslyBoundModel instanceof EpoxyModelGroup)) {
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 24
@@ -396,6 +432,7 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
     final EpoxyModelGroup previousGroup = (EpoxyModelGroup) previouslyBoundModel;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                        ^^^^^^^^^^^^^ definition local 25
+//                                      display_name previousGroup
 //                                      documentation ```java\nfinal EpoxyModelGroup previousGroup\n```
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                                                          ^^^^^^^^^^^^^^^^^^^^ reference local 24
@@ -408,15 +445,19 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
 //     ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 27
+//                        display_name onModel
 //                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 28
+//                                         display_name model
 //                                         documentation ```java\nEpoxyModel model\n```
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 29
+//                                                                     display_name viewHolder
 //                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                          ^^^^^^^^^^ definition local 30
+//                                                                                     display_name modelIndex
 //                                                                                     documentation ```java\nint modelIndex\n```
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
@@ -431,6 +472,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
           EpoxyModel<?> previousModel = previousGroup.models.get(modelIndex);
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^^^ definition local 31
+//                                    display_name previousModel
 //                                    documentation ```java\nEpoxyModel<?> previousModel\n```
 //                                      ^^^^^^^^^^^^^ reference local 25
 //                                                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
@@ -466,12 +508,15 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 
   private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHolder) {
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
+//                                      display_name setViewVisibility
 //                                      documentation ```java\nprivate static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHolder)\n```
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^ definition local 32
+//                                                       display_name model
 //                                                       documentation ```java\nEpoxyModel model\n```
 //                                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                        ^^^^^^^^^^ definition local 33
+//                                                                                   display_name viewHolder
 //                                                                                   documentation ```java\nEpoxyViewHolder viewHolder\n```
     if (model.isShown()) {
 //      ^^^^^ reference local 32
@@ -498,12 +543,14 @@ private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHold
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void unbind(@NonNull ModelGroupHolder holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
+//                   display_name unbind
 //                   documentation ```java\n@CallSuper\n@Override\npublic void unbind(unresolved_type holder)\n```
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                             ^^^^^^ definition local 34
+//                                                    display_name holder
 //                                                    documentation ```java\n@NonNull\nunresolved_type holder\n```
     holder.unbindGroup();
 //  ^^^^^^ reference local 34
@@ -516,11 +563,13 @@ public void unbind(@NonNull ModelGroupHolder holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewAttachedToWindow(ModelGroupHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
+//                                   display_name onViewAttachedToWindow
 //                                   documentation ```java\n@CallSuper\n@Override\npublic void onViewAttachedToWindow(unresolved_type holder)\n```
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
 //                                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                                    ^^^^^^ definition local 35
+//                                                           display_name holder
 //                                                           documentation ```java\nunresolved_type holder\n```
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
@@ -530,15 +579,19 @@ public void onViewAttachedToWindow(ModelGroupHolder holder) {
 //     ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 37
+//                        display_name onModel
 //                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 38
+//                                         display_name model
 //                                         documentation ```java\nEpoxyModel model\n```
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 39
+//                                                                     display_name viewHolder
 //                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                          ^^^^^^^^^^ definition local 40
+//                                                                                     display_name modelIndex
 //                                                                                     documentation ```java\nint modelIndex\n```
         //noinspection unchecked
         model.onViewAttachedToWindow(viewHolder.objectToBind());
@@ -556,11 +609,13 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewDetachedFromWindow(ModelGroupHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
+//                                     display_name onViewDetachedFromWindow
 //                                     documentation ```java\n@CallSuper\n@Override\npublic void onViewDetachedFromWindow(unresolved_type holder)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                                      ^^^^^^ definition local 41
+//                                                             display_name holder
 //                                                             documentation ```java\nunresolved_type holder\n```
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
@@ -570,15 +625,19 @@ public void onViewDetachedFromWindow(ModelGroupHolder holder) {
 //     ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 43
+//                        display_name onModel
 //                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 44
+//                                         display_name model
 //                                         documentation ```java\nEpoxyModel model\n```
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 45
+//                                                                     display_name viewHolder
 //                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                          ^^^^^^^^^^ definition local 46
+//                                                                                     display_name modelIndex
 //                                                                                     documentation ```java\nint modelIndex\n```
         //noinspection unchecked
         model.onViewDetachedFromWindow(viewHolder.objectToBind());
@@ -592,24 +651,29 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 
   private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callback) {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
+//                           display_name iterateModels
 //                           documentation ```java\nprivate void iterateModels(unresolved_type holder, IterateModelsCallback callback)\n```
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                            ^^^^^^ definition local 47
+//                                                   display_name holder
 //                                                   documentation ```java\nunresolved_type holder\n```
 //                                                    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
 //                                                                          ^^^^^^^^ definition local 48
+//                                                                                   display_name callback
 //                                                                                   documentation ```java\nIterateModelsCallback callback\n```
     holder.bindGroupIfNeeded(this);
 //  ^^^^^^ reference local 47
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#bindGroupIfNeeded#
     int modelCount = models.size();
 //      ^^^^^^^^^^ definition local 49
+//                 display_name modelCount
 //                 documentation ```java\nint modelCount\n```
 //                   ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
     for (int i = 0; i < modelCount; i++) {
 //           ^ definition local 50
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 50
 //                      ^^^^^^^^^^ reference local 49
@@ -630,17 +694,22 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba
 
   private interface IterateModelsCallback {
 //                  ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
+//                                        display_name IterateModelsCallback
 //                                        documentation ```java\nprivate interface IterateModelsCallback\n```
     void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex);
 //       ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
+//               display_name onModel
 //               documentation ```java\npublic abstract void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                          ^^^^^ definition local 51
+//                                display_name model
 //                                documentation ```java\nEpoxyModel model\n```
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 52
+//                                                            display_name viewHolder
 //                                                            documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                 ^^^^^^^^^^ definition local 53
+//                                                                            display_name modelIndex
 //                                                                            documentation ```java\nint modelIndex\n```
   }
 
@@ -648,13 +717,17 @@ private interface IterateModelsCallback {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
+//                       display_name getSpanSize
 //                       documentation ```java\n@Override\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^^^^^^ definition local 54
+//                                          display_name totalSpanCount
 //                                          documentation ```java\nint totalSpanCount\n```
 //                                               ^^^^^^^^ definition local 55
+//                                                        display_name position
 //                                                        documentation ```java\nint position\n```
 //                                                             ^^^^^^^^^ definition local 56
+//                                                                       display_name itemCount
 //                                                                       documentation ```java\nint itemCount\n```
     // Defaults to using the span size of the first model. Override this if you need to customize it
     return models.get(0).spanSize(totalSpanCount, position, itemCount);
@@ -670,6 +743,7 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected final int getDefaultLayout() {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getDefaultLayout().
+//                                     display_name getDefaultLayout
 //                                     documentation ```java\n@Override\nprotected final int getDefaultLayout()\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     throw new UnsupportedOperationException(
@@ -682,8 +756,10 @@ protected final int getDefaultLayout() {
   public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState().
+//                                           display_name shouldSaveViewState
 //                                           documentation ```java\n@NonNull\npublic EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState)\n```
 //                                                   ^^^^^^^^^^^^^^^^^^^ definition local 57
+//                                                                       display_name shouldSaveViewState
 //                                                                       documentation ```java\nboolean shouldSaveViewState\n```
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
@@ -697,6 +773,7 @@ public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean shouldSaveViewState() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(+1).
+//                                   display_name shouldSaveViewState
 //                                   documentation ```java\n@Override\npublic boolean shouldSaveViewState()\n```
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shouldSaveViewState().
     // By default state is saved if any of the models have saved state enabled.
@@ -722,12 +799,15 @@ public boolean shouldSaveViewState() {
    */
   protected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition) {
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#useViewStubLayoutParams().
+//                                          display_name useViewStubLayoutParams
 //                                          documentation ```java\nprotected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition)\n```
 //                                          documentation  Whether the layout params set on the view stub for the given model should be carried over to\n the model's view. Default is true\n <p>\n Set this to false if you want the layout params on the model's layout resource to be kept.\n\n @param model         The model who's view is being created\n @param modelPosition The position of the model in the models list\n
 //                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^ definition local 58
+//                                                              display_name model
 //                                                              documentation ```java\nEpoxyModel<?> model\n```
 //                                                                   ^^^^^^^^^^^^^ definition local 59
+//                                                                                 display_name modelPosition
 //                                                                                 documentation ```java\nint modelPosition\n```
     return true;
   }
@@ -737,11 +817,13 @@ protected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition
   protected final ModelGroupHolder createNewHolder(@NonNull ViewParent parent) {
 //                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#createNewHolder().
+//                                                 display_name createNewHolder
 //                                                 documentation ```java\n@Override\nprotected final unresolved_type createNewHolder(unresolved_type parent)\n```
 //                                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#createNewHolder().
 //                                                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                                                     ^^^^^^ definition local 60
+//                                                                            display_name parent
 //                                                                            documentation ```java\n@NonNull\nunresolved_type parent\n```
     return new ModelGroupHolder(parent);
 //                              ^^^^^^ reference local 60
@@ -751,11 +833,13 @@ protected final ModelGroupHolder createNewHolder(@NonNull ViewParent parent) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
+//                      display_name equals
 //                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 61
+//                               display_name o
 //                               documentation ```java\nObject o\n```
     if (this == o) {
 //              ^ reference local 61
@@ -776,6 +860,7 @@ public boolean equals(Object o) {
     EpoxyModelGroup that = (EpoxyModelGroup) o;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                  ^^^^ definition local 62
+//                       display_name that
 //                       documentation ```java\nEpoxyModelGroup that\n```
 //                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                                           ^ reference local 61
@@ -791,11 +876,13 @@ public boolean equals(Object o) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#hashCode().
+//                    display_name hashCode
 //                    documentation ```java\n@Override\npublic int hashCode()\n```
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = super.hashCode();
 //      ^^^^^^ definition local 63
+//             display_name result
 //             documentation ```java\nint result\n```
 //               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#super.
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
index 358389c3f..c90952451 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
@@ -40,6 +40,7 @@
  */
 public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
+//                                            display_name EpoxyModelTouchCallback
 //                                            documentation ```java\npublic abstract class EpoxyModelTouchCallback<T extends EpoxyModel>\n```
 //                                            documentation  A wrapper around {@link androidx.recyclerview.widget.ItemTouchHelper.Callback} to enable\n easier touch support when working with Epoxy models.\n <p>\n For simplicity you can use {@link EpoxyTouchHelper} to set up touch handling via this class for\n you instead of using this class directly. However, you may choose to use this class directly with\n your own {@link ItemTouchHelper} if you need extra flexibility or customization.\n
 //                                            relationship is_implementation semanticdb maven . . ItemTouchHelper/Callback#
@@ -48,6 +49,7 @@ public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
+//                                              display_name T
 //                                              documentation ```java\nT extends EpoxyModel\n```
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
     extends EpoxyTouchHelperCallback implements EpoxyDragCallback<T>, EpoxySwipeCallback<T> {
@@ -59,37 +61,45 @@ public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 
   private static final int TOUCH_DEBOUNCE_MILLIS = 300;
 //                         ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#TOUCH_DEBOUNCE_MILLIS.
+//                                               display_name TOUCH_DEBOUNCE_MILLIS
 //                                               documentation ```java\nprivate static final int TOUCH_DEBOUNCE_MILLIS\n```
 
   @Nullable private final EpoxyController controller;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                        ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#controller.
+//                                                   display_name controller
 //                                                   documentation ```java\n@Nullable\nprivate final EpoxyController controller\n```
   private final Class<T> targetModelClass;
 //              ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#targetModelClass.
+//                                        display_name targetModelClass
 //                                        documentation ```java\nprivate final Class<T> targetModelClass\n```
   private EpoxyViewHolder holderBeingDragged;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                        ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingDragged.
+//                                           display_name holderBeingDragged
 //                                           documentation ```java\nprivate EpoxyViewHolder holderBeingDragged\n```
   private EpoxyViewHolder holderBeingSwiped;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingSwiped.
+//                                          display_name holderBeingSwiped
 //                                          documentation ```java\nprivate EpoxyViewHolder holderBeingSwiped\n```
 
   public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class<T> targetModelClass) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#`<init>`().
+//                               display_name <init>
 //                               documentation ```java\npublic EpoxyModelTouchCallback(EpoxyController controller, Class<T> targetModelClass)\n```
 //                                ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                         ^^^^^^^^^^ definition local 0
+//                                                                    display_name controller
 //                                                                    documentation ```java\n@Nullable\nEpoxyController controller\n```
 //                                                                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                                                              ^^^^^^^^^^^^^^^^ definition local 1
+//                                                                                               display_name targetModelClass
 //                                                                                               documentation ```java\nClass<T> targetModelClass\n```
     this.controller = controller;
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#controller.
@@ -103,18 +113,22 @@ public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class<T> ta
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHolder) {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
+//                               display_name getMovementFlags
 //                               documentation ```java\n@Override\nprotected int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder)\n```
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(+1).
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                            ^^^^^^^^^^^^ definition local 2
+//                                                         display_name recyclerView
 //                                                         documentation ```java\nunresolved_type recyclerView\n```
 //                                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                          ^^^^^^^^^^ definition local 3
+//                                                                                     display_name viewHolder
 //                                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
     EpoxyModel<?> model = viewHolder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 4
+//                      display_name model
 //                      documentation ```java\nEpoxyModel<?> model\n```
 //                        ^^^^^^^^^^ reference local 3
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -124,6 +138,7 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
     // callback has a view actively selected.
     boolean isOtherCallbackActive =
 //          ^^^^^^^^^^^^^^^^^^^^^ definition local 5
+//                                display_name isOtherCallbackActive
 //                                documentation ```java\nboolean isOtherCallbackActive\n```
         holderBeingDragged == null
 //      ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingDragged.
@@ -153,18 +168,22 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current,
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
+//                              display_name canDropOver
 //                              documentation ```java\n@Override\nprotected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target)\n```
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                           ^^^^^^^^^^^^ definition local 6
+//                                                        display_name recyclerView
 //                                                        documentation ```java\nunresolved_type recyclerView\n```
 //                                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                         ^^^^^^^ definition local 7
+//                                                                                 display_name current
 //                                                                                 documentation ```java\nEpoxyViewHolder current\n```
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 8
+//                           display_name target
 //                           documentation ```java\nEpoxyViewHolder target\n```
     // By default we don't allow dropping on a model that isn't a drag target
     return isTouchableModel(target.getModel());
@@ -175,9 +194,11 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current
 
   protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                  ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
+//                                   display_name isTouchableModel
 //                                   documentation ```java\nprotected boolean isTouchableModel(EpoxyModel<?> model)\n```
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^ definition local 9
+//                                                       display_name model
 //                                                       documentation ```java\nEpoxyModel<?> model\n```
     return targetModelClass.isInstance(model);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#targetModelClass.
@@ -189,18 +210,22 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                  ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
+//                         display_name onMove
 //                         documentation ```java\n@Override\nprotected boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target)\n```
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                      ^^^^^^^^^^^^ definition local 10
+//                                                   display_name recyclerView
 //                                                   documentation ```java\nunresolved_type recyclerView\n```
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                    ^^^^^^^^^^ definition local 11
+//                                                                               display_name viewHolder
 //                                                                               documentation ```java\nEpoxyViewHolder viewHolder\n```
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 12
+//                           display_name target
 //                           documentation ```java\nEpoxyViewHolder target\n```
 
     if (controller == null) {
@@ -212,11 +237,13 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 
     int fromPosition = viewHolder.getAdapterPosition();
 //      ^^^^^^^^^^^^ definition local 13
+//                   display_name fromPosition
 //                   documentation ```java\nint fromPosition\n```
 //                     ^^^^^^^^^^ reference local 11
 //                                ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     int toPosition = target.getAdapterPosition();
 //      ^^^^^^^^^^ definition local 14
+//                 display_name toPosition
 //                 documentation ```java\nint toPosition\n```
 //                   ^^^^^^ reference local 12
 //                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
@@ -229,6 +256,7 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
     EpoxyModel<?> model = viewHolder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 15
+//                      display_name model
 //                      documentation ```java\nEpoxyModel<?> model\n```
 //                        ^^^^^^^^^^ reference local 11
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -258,17 +286,22 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, View itemView) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
+//                         display_name onModelMoved
 //                         documentation ```java\n@Override\npublic void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)\n```
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                             ^^^^^^^^^^^^ definition local 16
+//                                          display_name fromPosition
 //                                          documentation ```java\nint fromPosition\n```
 //                                               ^^^^^^^^^^ definition local 17
+//                                                          display_name toPosition
 //                                                          documentation ```java\nint toPosition\n```
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                                             ^^^^^^^^^^^^^^^ definition local 18
+//                                                                             display_name modelBeingMoved
 //                                                                             documentation ```java\nT modelBeingMoved\n```
 //                                                                              ^^^^ reference semanticdb maven . . View#
 //                                                                                   ^^^^^^^^ definition local 19
+//                                                                                            display_name itemView
 //                                                                                            documentation ```java\nunresolved_type itemView\n```
 
   }
@@ -277,27 +310,33 @@ public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, Vi
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
+//                        display_name onSwiped
 //                        documentation ```java\n@Override\nprotected void onSwiped(EpoxyViewHolder viewHolder, int direction)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                        ^^^^^^^^^^ definition local 20
+//                                                   display_name viewHolder
 //                                                   documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                        ^^^^^^^^^ definition local 21
+//                                                                  display_name direction
 //                                                                  documentation ```java\nint direction\n```
     EpoxyModel<?> model = viewHolder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 22
+//                      display_name model
 //                      documentation ```java\nEpoxyModel<?> model\n```
 //                        ^^^^^^^^^^ reference local 20
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     View view = viewHolder.itemView;
 //  ^^^^ reference semanticdb maven . . View#
 //       ^^^^ definition local 23
+//            display_name view
 //            documentation ```java\nunresolved_type view\n```
 //              ^^^^^^^^^^ reference local 20
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#itemView#
     int position = viewHolder.getAdapterPosition();
 //      ^^^^^^^^ definition local 24
+//               display_name position
 //               documentation ```java\nint position\n```
 //                 ^^^^^^^^^^ reference local 20
 //                            ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
@@ -326,17 +365,22 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onSwipeCompleted(T model, View itemView, int position, int direction) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
+//                             display_name onSwipeCompleted
 //                             documentation ```java\n@Override\npublic void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)\n```
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                               ^^^^^ definition local 25
+//                                     display_name model
 //                                     documentation ```java\nT model\n```
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 26
+//                                                    display_name itemView
 //                                                    documentation ```java\nunresolved_type itemView\n```
 //                                                         ^^^^^^^^ definition local 27
+//                                                                  display_name position
 //                                                                  documentation ```java\nint position\n```
 //                                                                       ^^^^^^^^^ definition local 28
+//                                                                                 display_name direction
 //                                                                                 documentation ```java\nint direction\n```
 
   }
@@ -345,13 +389,16 @@ public void onSwipeCompleted(T model, View itemView, int position, int direction
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actionState) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
+//                                 display_name onSelectedChanged
 //                                 documentation ```java\n@Override\nprotected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState)\n```
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                           ^^^^^^^^^^ definition local 29
+//                                                                      display_name viewHolder
 //                                                                      documentation ```java\n@Nullable\nEpoxyViewHolder viewHolder\n```
 //                                                                           ^^^^^^^^^^^ definition local 30
+//                                                                                       display_name actionState
 //                                                                                       documentation ```java\nint actionState\n```
     super.onSelectedChanged(viewHolder, actionState);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
@@ -364,6 +411,7 @@ protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actio
       EpoxyModel<?> model = viewHolder.getModel();
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^ definition local 31
+//                        display_name model
 //                        documentation ```java\nEpoxyModel<?> model\n```
 //                          ^^^^^^^^^^ reference local 29
 //                                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -446,9 +494,11 @@ protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actio
 
   private void markRecyclerViewHasSelection(RecyclerView recyclerView) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#markRecyclerViewHasSelection().
+//                                          display_name markRecyclerViewHasSelection
 //                                          documentation ```java\nprivate void markRecyclerViewHasSelection(unresolved_type recyclerView)\n```
 //                                          ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                       ^^^^^^^^^^^^ definition local 32
+//                                                                    display_name recyclerView
 //                                                                    documentation ```java\nunresolved_type recyclerView\n```
     recyclerView.setTag(R.id.epoxy_touch_helper_selection_status, Boolean.TRUE);
 //  ^^^^^^^^^^^^ reference local 32
@@ -462,9 +512,11 @@ private void markRecyclerViewHasSelection(RecyclerView recyclerView) {
 
   private boolean recyclerViewHasSelection(RecyclerView recyclerView) {
 //                ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#recyclerViewHasSelection().
+//                                         display_name recyclerViewHasSelection
 //                                         documentation ```java\nprivate boolean recyclerViewHasSelection(unresolved_type recyclerView)\n```
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                      ^^^^^^^^^^^^ definition local 33
+//                                                                   display_name recyclerView
 //                                                                   documentation ```java\nunresolved_type recyclerView\n```
     return recyclerView.getTag(R.id.epoxy_touch_helper_selection_status) != null;
 //         ^^^^^^^^^^^^ reference local 33
@@ -476,9 +528,11 @@ private boolean recyclerViewHasSelection(RecyclerView recyclerView) {
 
   private void clearRecyclerViewSelectionMarker(RecyclerView recyclerView) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearRecyclerViewSelectionMarker().
+//                                              display_name clearRecyclerViewSelectionMarker
 //                                              documentation ```java\nprivate void clearRecyclerViewSelectionMarker(unresolved_type recyclerView)\n```
 //                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                           ^^^^^^^^^^^^ definition local 34
+//                                                                        display_name recyclerView
 //                                                                        documentation ```java\nunresolved_type recyclerView\n```
     recyclerView.setTag(R.id.epoxy_touch_helper_selection_status, null);
 //  ^^^^^^^^^^^^ reference local 34
@@ -492,15 +546,19 @@ private void clearRecyclerViewSelectionMarker(RecyclerView recyclerView) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
+//                           display_name onSwipeStarted
 //                           documentation ```java\n@Override\npublic void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)\n```
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                             ^^^^^ definition local 35
+//                                   display_name model
 //                                   documentation ```java\nT model\n```
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^ definition local 36
+//                                                  display_name itemView
 //                                                  documentation ```java\nunresolved_type itemView\n```
 //                                                       ^^^^^^^^^^^^^^^ definition local 37
+//                                                                       display_name adapterPosition
 //                                                                       documentation ```java\nint adapterPosition\n```
 
   }
@@ -509,13 +567,16 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onSwipeReleased(T model, View itemView) {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
+//                            display_name onSwipeReleased
 //                            documentation ```java\n@Override\npublic void onSwipeReleased(T model, unresolved_type itemView)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                              ^^^^^ definition local 38
+//                                    display_name model
 //                                    documentation ```java\nT model\n```
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 39
+//                                                   display_name itemView
 //                                                   documentation ```java\nunresolved_type itemView\n```
 
   }
@@ -524,15 +585,19 @@ public void onSwipeReleased(T model, View itemView) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onDragStarted(T model, View itemView, int adapterPosition) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
+//                          display_name onDragStarted
 //                          documentation ```java\n@Override\npublic void onDragStarted(T model, unresolved_type itemView, int adapterPosition)\n```
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                            ^^^^^ definition local 40
+//                                  display_name model
 //                                  documentation ```java\nT model\n```
 //                                   ^^^^ reference semanticdb maven . . View#
 //                                        ^^^^^^^^ definition local 41
+//                                                 display_name itemView
 //                                                 documentation ```java\nunresolved_type itemView\n```
 //                                                      ^^^^^^^^^^^^^^^ definition local 42
+//                                                                      display_name adapterPosition
 //                                                                      documentation ```java\nint adapterPosition\n```
 
   }
@@ -541,13 +606,16 @@ public void onDragStarted(T model, View itemView, int adapterPosition) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onDragReleased(T model, View itemView) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
+//                           display_name onDragReleased
 //                           documentation ```java\n@Override\npublic void onDragReleased(T model, unresolved_type itemView)\n```
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                             ^^^^^ definition local 43
+//                                   display_name model
 //                                   documentation ```java\nT model\n```
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^ definition local 44
+//                                                  display_name itemView
 //                                                  documentation ```java\nunresolved_type itemView\n```
 
   }
@@ -556,15 +624,18 @@ public void onDragReleased(T model, View itemView) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHolder) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
+//                         display_name clearView
 //                         documentation ```java\n@Override\nprotected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder)\n```
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                            ^^^^^^^^^^^^ definition local 45
+//                                                         display_name recyclerView
 //                                                         documentation ```java\nfinal unresolved_type recyclerView\n```
 //                                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                          ^^^^^^^^^^ definition local 46
+//                                                                                     display_name viewHolder
 //                                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
     super.clearView(recyclerView, viewHolder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
@@ -593,6 +664,7 @@ protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHo
 //     ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
       public void run() {
 //                ^^^ definition local 48
+//                    display_name run
 //                    documentation ```java\n@Override\npublic void run()\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         clearRecyclerViewSelectionMarker(recyclerView);
@@ -607,15 +679,18 @@ public void run() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void clearView(T model, View itemView) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
+//                      display_name clearView
 //                      documentation ```java\n@Override\npublic void clearView(T model, unresolved_type itemView)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                        ^^^^^ definition local 49
+//                              display_name model
 //                              documentation ```java\nT model\n```
 //                               ^^^^ reference semanticdb maven . . View#
 //                                    ^^^^^^^^ definition local 50
+//                                             display_name itemView
 //                                             documentation ```java\nunresolved_type itemView\n```
 
   }
@@ -624,26 +699,34 @@ public void clearView(T model, View itemView) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
+//                           display_name onChildDraw
 //                           documentation ```java\n@Override\nprotected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                           ^^^^^^ reference semanticdb maven . . Canvas#
 //                                  ^ definition local 51
+//                                    display_name c
 //                                    documentation ```java\nunresolved_type c\n```
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                  ^^^^^^^^^^^^ definition local 52
+//                                                               display_name recyclerView
 //                                                               documentation ```java\nunresolved_type recyclerView\n```
 //                                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                ^^^^^^^^^^ definition local 53
+//                                                                                           display_name viewHolder
 //                                                                                           documentation ```java\nEpoxyViewHolder viewHolder\n```
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 54
+//             display_name dX
 //             documentation ```java\nfloat dX\n```
 //                    ^^ definition local 55
+//                       display_name dY
 //                       documentation ```java\nfloat dY\n```
 //                            ^^^^^^^^^^^ definition local 56
+//                                        display_name actionState
 //                                        documentation ```java\nint actionState\n```
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 57
+//                                                                   display_name isCurrentlyActive
 //                                                                   documentation ```java\nboolean isCurrentlyActive\n```
     super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
@@ -659,6 +742,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
     EpoxyModel<?> model = viewHolder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 58
+//                      display_name model
 //                      documentation ```java\nEpoxyModel<?> model\n```
 //                        ^^^^^^^^^^ reference local 53
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -675,12 +759,14 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
     View itemView = viewHolder.itemView;
 //  ^^^^ reference semanticdb maven . . View#
 //       ^^^^^^^^ definition local 59
+//                display_name itemView
 //                documentation ```java\nunresolved_type itemView\n```
 //                  ^^^^^^^^^^ reference local 53
 //                             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#itemView#
 
     float swipeProgress;
 //        ^^^^^^^^^^^^^ definition local 60
+//                      display_name swipeProgress
 //                      documentation ```java\nfloat swipeProgress\n```
     if (Math.abs(dX) > Math.abs(dY)) {
 //      ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
@@ -705,6 +791,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
     // Clamp to 1/-1 in the case of side padding where the view can be swiped extra
     float clampedProgress = Math.max(-1f, Math.min(1f, swipeProgress));
 //        ^^^^^^^^^^^^^^^ definition local 61
+//                        display_name clampedProgress
 //                        documentation ```java\nfloat clampedProgress\n```
 //                          ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
 //                               ^^^ reference semanticdb maven jdk 11 java/lang/Math#max(+2).
@@ -726,19 +813,24 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
+//                                   display_name onSwipeProgressChanged
 //                                   documentation ```java\n@Override\npublic void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)\n```
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                     ^^^^^ definition local 62
+//                                           display_name model
 //                                           documentation ```java\nT model\n```
 //                                            ^^^^ reference semanticdb maven . . View#
 //                                                 ^^^^^^^^ definition local 63
+//                                                          display_name itemView
 //                                                          documentation ```java\nunresolved_type itemView\n```
 //                                                                 ^^^^^^^^^^^^^ definition local 64
+//                                                                               display_name swipeProgress
 //                                                                               documentation ```java\nfloat swipeProgress\n```
       Canvas canvas) {
 //    ^^^^^^ reference semanticdb maven . . Canvas#
 //           ^^^^^^ definition local 65
+//                  display_name canvas
 //                  documentation ```java\nunresolved_type canvas\n```
 
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
index 7f54407cd..f7bbda0d8 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
@@ -36,10 +36,12 @@
  */
 public abstract class EpoxyModelWithHolder<T extends EpoxyHolder> extends EpoxyModel<T> {
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#
+//                                         display_name EpoxyModelWithHolder
 //                                         documentation ```java\npublic abstract class EpoxyModelWithHolder<T extends EpoxyHolder>\n```
 //                                         documentation  A version of {@link com.airbnb.epoxy.EpoxyModel} that allows you to use a view holder pattern\n instead of a specific view when binding to your model.\n
 //                                         relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
+//                                           display_name T
 //                                           documentation ```java\nT extends EpoxyHolder\n```
 //                                                   ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -47,13 +49,16 @@ public abstract class EpoxyModelWithHolder<T extends EpoxyHolder> extends EpoxyM
 
   public EpoxyModelWithHolder() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#`<init>`().
+//                            display_name <init>
 //                            documentation ```java\npublic EpoxyModelWithHolder()\n```
   }
 
   public EpoxyModelWithHolder(long id) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#`<init>`(+1).
+//                            display_name <init>
 //                            documentation ```java\npublic EpoxyModelWithHolder(long id)\n```
 //                                 ^^ definition local 0
+//                                    display_name id
 //                                    documentation ```java\nlong id\n```
     super(id);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
@@ -64,24 +69,28 @@ public EpoxyModelWithHolder(long id) {
   protected abstract T createNewHolder(@NonNull ViewParent parent);
 //                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#createNewHolder().
+//                                     display_name createNewHolder
 //                                     documentation ```java\nprotected abstract T createNewHolder(unresolved_type parent)\n```
 //                                     documentation This should return a new instance of your {@link com.airbnb.epoxy.EpoxyHolder} class. 
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#createNewHolder().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                                         ^^^^^^ definition local 1
+//                                                                display_name parent
 //                                                                documentation ```java\n@NonNull\nunresolved_type parent\n```
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void bind(@NonNull T holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
+//                 display_name bind
 //                 documentation ```java\n@Override\npublic void bind(T holder)\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                            ^^^^^^ definition local 2
+//                                   display_name holder
 //                                   documentation ```java\n@NonNull\nT holder\n```
     super.bind(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
@@ -93,17 +102,20 @@ public void bind(@NonNull T holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void bind(@NonNull T holder, @NonNull List<Object> payloads) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
+//                 display_name bind
 //                 documentation ```java\n@Override\npublic void bind(T holder, List<Object> payloads)\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                            ^^^^^^ definition local 3
+//                                   display_name holder
 //                                   documentation ```java\n@NonNull\nT holder\n```
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                          ^^^^^^^^ definition local 4
+//                                                                   display_name payloads
 //                                                                   documentation ```java\n@NonNull\nList<Object> payloads\n```
     super.bind(holder, payloads);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
@@ -116,16 +128,19 @@ public void bind(@NonNull T holder, @NonNull List<Object> payloads) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void bind(@NonNull T holder, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
+//                 display_name bind
 //                 documentation ```java\n@Override\npublic void bind(T holder, EpoxyModel<?> previouslyBoundModel)\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                            ^^^^^^ definition local 5
+//                                   display_name holder
 //                                   documentation ```java\n@NonNull\nT holder\n```
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^^^^^^^^^^^^^^^^ definition local 6
+//                                                                                display_name previouslyBoundModel
 //                                                                                documentation ```java\n@NonNull\nEpoxyModel<?> previouslyBoundModel\n```
     super.bind(holder, previouslyBoundModel);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
@@ -138,12 +153,14 @@ public void bind(@NonNull T holder, @NonNull EpoxyModel<?> previouslyBoundModel)
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void unbind(@NonNull T holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
+//                   display_name unbind
 //                   documentation ```java\n@Override\npublic void unbind(T holder)\n```
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                              ^^^^^^ definition local 7
+//                                     display_name holder
 //                                     documentation ```java\n@NonNull\nT holder\n```
     super.unbind(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
@@ -156,14 +173,17 @@ public void unbind(@NonNull T holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged().
+//                                     display_name onVisibilityStateChanged
 //                                     documentation ```java\n@Override\npublic void onVisibilityStateChanged(int visibilityState, T holder)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                     ^^^^^^^^^^^^^^^ definition local 8
+//                                                                     display_name visibilityState
 //                                                                     documentation ```java\n@Visibility\nint visibilityState\n```
 //                                                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                                                                 ^^^^^^ definition local 9
+//                                                                                        display_name holder
 //                                                                                        documentation ```java\n@NonNull\nT holder\n```
     super.onVisibilityStateChanged(visibilityState, holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
@@ -176,6 +196,7 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onVisibilityChanged(
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
+//                                display_name onVisibilityChanged
 //                                documentation ```java\n@Override\npublic void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T holder)\n```
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
       @FloatRange(from = 0, to = 100) float percentVisibleHeight,
@@ -183,24 +204,29 @@ public void onVisibilityChanged(
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 10
+//                                                               display_name percentVisibleHeight
 //                                                               documentation ```java\n@FloatRange(from = 0, to = 100)\nfloat percentVisibleHeight\n```
       @FloatRange(from = 0, to = 100) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                          ^^^^^^^^^^^^^^^^^^^ definition local 11
+//                                                              display_name percentVisibleWidth
 //                                                              documentation ```java\n@FloatRange(from = 0, to = 100)\nfloat percentVisibleWidth\n```
       @Px int visibleHeight, @Px int visibleWidth,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 12
+//                          display_name visibleHeight
 //                          documentation ```java\n@Px\nint visibleHeight\n```
 //                            ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                   ^^^^^^^^^^^^ definition local 13
+//                                                display_name visibleWidth
 //                                                documentation ```java\n@Px\nint visibleWidth\n```
       @NonNull T holder) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //               ^^^^^^ definition local 14
+//                      display_name holder
 //                      documentation ```java\n@NonNull\nT holder\n```
     super.onVisibilityChanged(
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
@@ -219,10 +245,12 @@ public void onVisibilityChanged(
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean onFailedToRecycleView(T holder) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView().
+//                                     display_name onFailedToRecycleView
 //                                     documentation ```java\n@Override\npublic boolean onFailedToRecycleView(T holder)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                       ^^^^^^ definition local 15
+//                                              display_name holder
 //                                              documentation ```java\nT holder\n```
     return super.onFailedToRecycleView(holder);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
@@ -234,11 +262,13 @@ public boolean onFailedToRecycleView(T holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewAttachedToWindow(T holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
+//                                   display_name onViewAttachedToWindow
 //                                   documentation ```java\n@Override\npublic void onViewAttachedToWindow(T holder)\n```
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
 //                                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                     ^^^^^^ definition local 16
+//                                            display_name holder
 //                                            documentation ```java\nT holder\n```
     super.onViewAttachedToWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
@@ -250,11 +280,13 @@ public void onViewAttachedToWindow(T holder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onViewDetachedFromWindow(T holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
+//                                     display_name onViewDetachedFromWindow
 //                                     documentation ```java\n@Override\npublic void onViewDetachedFromWindow(T holder)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                       ^^^^^^ definition local 17
+//                                              display_name holder
 //                                              documentation ```java\nT holder\n```
     super.onViewDetachedFromWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
index ddf437e2a..fdbd41a01 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
@@ -36,12 +36,15 @@
  */
 public abstract class EpoxyModelWithView<T extends View> extends EpoxyModel<T> {
 //                    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#
+//                                       display_name EpoxyModelWithView
 //                                       documentation ```java\npublic abstract class EpoxyModelWithView<T extends unresolved_type>\n```
 //                                       documentation  A model that allows its view to be built programmatically instead of by inflating a layout\n resource. Just implement {@link #buildView} so the adapter can create a new view for this model\n when needed.\n <p>\n {@link #getViewType()} is used by the adapter to know how to reuse views for this model. This\n means that all models that return the same type should be able to share the same view, and the\n view won't be shared with models of any other type.\n <p>\n If it is left unimplemented then at runtime a unique view type will be created to use for all\n models of that class. The generated view type will be negative so that it cannot collide with\n values from resource files, which are used in normal Epoxy models. If you would like to share\n the same view between models of different classes you can have those classes return the same view\n type. A good way to manually create a view type value is by creating an R.id. value in an ids\n resource file.\n
 //                                       relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#`<init>`().
+//                                       display_name <init>
 //                                       documentation ```java\npublic EpoxyModelWithView()\n```
 //                                       ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
+//                                         display_name T
 //                                         documentation ```java\nT extends unresolved_type\n```
 //                                                 ^^^^ reference semanticdb maven . . View#
 //                                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -57,6 +60,7 @@ public abstract class EpoxyModelWithView<T extends View> extends EpoxyModel<T> {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected int getViewType() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getViewType().
+//                          display_name getViewType
 //                          documentation ```java\n@Override\nprotected int getViewType()\n```
 //                          documentation  Get the view type associated with this model's view. Any models with the same view type will\n have views recycled between them.\n\n @see androidx.recyclerview.widget.RecyclerView.Adapter#getItemViewType(int)\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
@@ -74,18 +78,21 @@ protected int getViewType() {
   protected abstract T buildView(@NonNull ViewGroup parent);
 //                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
 //                     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#buildView().
+//                               display_name buildView
 //                               documentation ```java\n@Override\nprotected abstract T buildView(unresolved_type parent)\n```
 //                               documentation  Create and return a new instance of a view for this model. If no layout params are set on the\n returned view then default layout params will be used.\n\n @param parent The parent ViewGroup that the returned view will be added to.\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
 //                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                        ^^^^^^^^^ reference semanticdb maven . . ViewGroup#
 //                                                  ^^^^^^ definition local 0
+//                                                         display_name parent
 //                                                         documentation ```java\n@NonNull\nunresolved_type parent\n```
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected final int getDefaultLayout() {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getDefaultLayout().
+//                                     display_name getDefaultLayout
 //                                     documentation ```java\n@Override\nprotected final int getDefaultLayout()\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     throw new UnsupportedOperationException(
@@ -99,10 +106,12 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#layout().
+//                            display_name layout
 //                            documentation ```java\n@Override\npublic EpoxyModel<T> layout(int layoutRes)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout().
 //                             ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                           ^^^^^^^^^ definition local 1
+//                                                     display_name layoutRes
 //                                                     documentation ```java\n@LayoutRes\nint layoutRes\n```
     throw new UnsupportedOperationException(
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`(+1).
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyRecyclerView.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyRecyclerView.kt
index d0390d0e4..bc4f409e0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyRecyclerView.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyRecyclerView.kt
@@ -96,18 +96,23 @@ import com.airbnb.viewmodeladapter.R
  */
 open class EpoxyRecyclerView @JvmOverloads constructor(
 //         ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#
+//                           display_name EpoxyRecyclerView
 //                           documentation ```kt\npublic open class EpoxyRecyclerView\n```\n\n----\n\n\n A RecyclerView implementation that makes for easier integration with Epoxy. The goal of this\n class is to reduce boilerplate in setting up a RecyclerView by applying common defaults.\n Additionally, several performance optimizations are made.\n\n Improvements in this class are:\n\n 1. A single view pool is automatically shared between all [EpoxyRecyclerView] instances in\n the same activity. This should increase view recycling potential and increase performance when\n nested RecyclerViews are used. See [.initViewPool].\n\n 2. A layout manager is automatically added with assumed defaults. See [createLayoutManager]\n\n 3. Fixed size is enabled if this view's size is MATCH_PARENT\n\n 4. If a [GridLayoutManager] is used this will automatically sync the span count with the\n [EpoxyController]. See [syncSpanCount]\n\n 5. Helper methods like [withModels], [setModels], [buildModelsWith]\n make it simpler to set up simple RecyclerViews.\n\n 6. Set an EpoxyController and build models in one step -\n [setControllerAndBuildModels] or [withModels]\n\n 7. Support for automatic item spacing. See [.setItemSpacingPx]\n\n 8. Defaults for usage as a nested recyclerview are provided in [Carousel].\n\n 9. [setClipToPadding] is set to false by default since that behavior is commonly\n desired in a scrolling list\n
 //                            ^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/jvm/JvmOverloads#`<init>`().
 //                                         ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#`<init>`().
+//                                                     display_name EpoxyRecyclerView
 //                                                     documentation ```kt\npublic constructor EpoxyRecyclerView(context: [Error type: Unresolved type for Context], attrs: [Error type: Unresolved type for AttributeSet]? = ..., defStyleAttr: kotlin.Int = ...)\n```
     context: Context,
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#`<init>`().(context)
+//          display_name context
 //          documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
     attrs: AttributeSet? = null,
 //  ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#`<init>`().(attrs)
+//        display_name attrs
 //        documentation ```kt\nvalue-parameter attrs: [Error type: Unresolved type for AttributeSet]? = ...\n```
     defStyleAttr: Int = 0
 //  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#`<init>`().(defStyleAttr)
+//               display_name defStyleAttr
 //               documentation ```kt\nvalue-parameter defStyleAttr: kotlin.Int = ...\n```
 //                ^^^ reference semanticdb maven . . kotlin/Int#
 ) : RecyclerView(context, attrs, defStyleAttr) {
@@ -117,16 +122,21 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     protected val spacingDecorator = EpoxyItemSpacingDecorator()
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getSpacingDecorator().
+//                                 display_name spacingDecorator
 //                                 documentation ```kt\nprotected final val spacingDecorator: [Error type: Not found recorded type for EpoxyItemSpacingDecorator()]\n```
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#spacingDecorator.
+//                                 display_name spacingDecorator
 //                                 documentation ```kt\nprotected final val spacingDecorator: [Error type: Not found recorded type for EpoxyItemSpacingDecorator()]\n```
 
     private var epoxyController: EpoxyController? = null
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#epoxyController.
+//                              display_name epoxyController
 //                              documentation ```kt\nprivate final var epoxyController: [Error type: Unresolved type for EpoxyController]?\n```
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getEpoxyController().
+//                              display_name epoxyController
 //                              documentation ```kt\nprivate final var epoxyController: [Error type: Unresolved type for EpoxyController]?\n```
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setEpoxyController().
+//                              display_name epoxyController
 //                              documentation ```kt\nprivate final var epoxyController: [Error type: Unresolved type for EpoxyController]?\n```
 
     /**
@@ -145,26 +155,35 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     private var removedAdapter: RecyclerView.Adapter<*>? = null
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getRemovedAdapter().
+//                             display_name removedAdapter
 //                             documentation ```kt\nprivate final var removedAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```\n\n----\n\n\n The adapter that was removed because the RecyclerView was detached from the window. We save it\n so we can reattach it if the RecyclerView is reattached to window. This allows us to\n automatically restore the adapter, without risking leaking the RecyclerView if this view is\n never used again.\n\n Since the adapter is removed this recyclerview won't get adapter changes, but that's fine since\n the view isn't attached to window and isn't being drawn.\n\n This reference is cleared if another adapter is manually set, so we don't override the user's\n adapter choice.\n\n @see .setRemoveAdapterWhenDetachedFromWindow\n
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#removedAdapter.
+//                             display_name removedAdapter
 //                             documentation ```kt\nprivate final var removedAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```\n\n----\n\n\n The adapter that was removed because the RecyclerView was detached from the window. We save it\n so we can reattach it if the RecyclerView is reattached to window. This allows us to\n automatically restore the adapter, without risking leaking the RecyclerView if this view is\n never used again.\n\n Since the adapter is removed this recyclerview won't get adapter changes, but that's fine since\n the view isn't attached to window and isn't being drawn.\n\n This reference is cleared if another adapter is manually set, so we don't override the user's\n adapter choice.\n\n @see .setRemoveAdapterWhenDetachedFromWindow\n
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setRemovedAdapter().
+//                             display_name removedAdapter
 //                             documentation ```kt\nprivate final var removedAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```\n\n----\n\n\n The adapter that was removed because the RecyclerView was detached from the window. We save it\n so we can reattach it if the RecyclerView is reattached to window. This allows us to\n automatically restore the adapter, without risking leaking the RecyclerView if this view is\n never used again.\n\n Since the adapter is removed this recyclerview won't get adapter changes, but that's fine since\n the view isn't attached to window and isn't being drawn.\n\n This reference is cleared if another adapter is manually set, so we don't override the user's\n adapter choice.\n\n @see .setRemoveAdapterWhenDetachedFromWindow\n
 
     private var removeAdapterWhenDetachedFromWindow = true
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getRemoveAdapterWhenDetachedFromWindow().
+//                                                  display_name removeAdapterWhenDetachedFromWindow
 //                                                  documentation ```kt\nprivate final var removeAdapterWhenDetachedFromWindow: kotlin.Boolean\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#removeAdapterWhenDetachedFromWindow.
+//                                                  display_name removeAdapterWhenDetachedFromWindow
 //                                                  documentation ```kt\nprivate final var removeAdapterWhenDetachedFromWindow: kotlin.Boolean\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setRemoveAdapterWhenDetachedFromWindow().
+//                                                  display_name setRemoveAdapterWhenDetachedFromWindow
 //                                                  documentation ```kt\npublic final fun setRemoveAdapterWhenDetachedFromWindow(removeAdapterWhenDetachedFromWindow: kotlin.Boolean)\n```\n\n----\n\n\n If set to true, any adapter set on this recyclerview will be removed when this view is detached\n from the window. This is useful to prevent leaking a reference to this RecyclerView. This is\n useful in cases where the same adapter can be used across multiple views (views which can be\n destroyed and recreated), such as with fragments. In that case the adapter is not necessarily\n cleared from previous RecyclerViews, so the adapter will continue to hold a reference to those\n views and leak them. More details at https://github.com/airbnb/epoxy/wiki/Avoiding-Memory-Leaks#parent-view\n\n The default is true, but you can disable this if you don't want your adapter detached\n automatically.\n\n If the adapter is removed via this setting, it will be re-set on the RecyclerView if the\n RecyclerView is re-attached to the window at a later point.\n
 
     private var delayMsWhenRemovingAdapterOnDetach: Int = DEFAULT_ADAPTER_REMOVAL_DELAY_MS
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#delayMsWhenRemovingAdapterOnDetach.
+//                                                 display_name delayMsWhenRemovingAdapterOnDetach
 //                                                 documentation ```kt\nprivate final var delayMsWhenRemovingAdapterOnDetach: kotlin.Int\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getDelayMsWhenRemovingAdapterOnDetach().
+//                                                 display_name delayMsWhenRemovingAdapterOnDetach
 //                                                 documentation ```kt\nprivate final var delayMsWhenRemovingAdapterOnDetach: kotlin.Int\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setDelayMsWhenRemovingAdapterOnDetach().
+//                                                 display_name setDelayMsWhenRemovingAdapterOnDetach
 //                                                 documentation ```kt\npublic final fun setDelayMsWhenRemovingAdapterOnDetach(delayMsWhenRemovingAdapterOnDetach: kotlin.Int)\n```\n\n----\n\n\n If [.setRemoveAdapterWhenDetachedFromWindow] is set to true, this is the delay\n in milliseconds between when [.onDetachedFromWindow] is called and when the adapter is\n actually removed.\n\n By default a delay of {@value #DEFAULT_ADAPTER_REMOVAL_DELAY_MS} ms is used so that view\n transitions can complete before the adapter is removed. Otherwise if the adapter is removed\n before transitions finish it can clear the screen and break the transition. A notable case is\n fragment transitions, in which the fragment view is detached from window before the transition\n ends.\n
 //                                                  ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#Companion#DEFAULT_ADAPTER_REMOVAL_DELAY_MS.
@@ -177,16 +196,21 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     private var isRemoveAdapterRunnablePosted: Boolean = false
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getIsRemoveAdapterRunnablePosted().
+//                                            display_name isRemoveAdapterRunnablePosted
 //                                            documentation ```kt\nprivate final var isRemoveAdapterRunnablePosted: kotlin.Boolean\n```\n\n----\n\n\n Tracks whether [.removeAdapterRunnable] has been posted to run\n later. This lets us know if we should cancel the runnable at certain times. This removes the\n overhead of needlessly attempting to remove the runnable when it isn't posted.\n
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#isRemoveAdapterRunnablePosted.
+//                                            display_name isRemoveAdapterRunnablePosted
 //                                            documentation ```kt\nprivate final var isRemoveAdapterRunnablePosted: kotlin.Boolean\n```\n\n----\n\n\n Tracks whether [.removeAdapterRunnable] has been posted to run\n later. This lets us know if we should cancel the runnable at certain times. This removes the\n overhead of needlessly attempting to remove the runnable when it isn't posted.\n
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setIsRemoveAdapterRunnablePosted().
+//                                            display_name isRemoveAdapterRunnablePosted
 //                                            documentation ```kt\nprivate final var isRemoveAdapterRunnablePosted: kotlin.Boolean\n```\n\n----\n\n\n Tracks whether [.removeAdapterRunnable] has been posted to run\n later. This lets us know if we should cancel the runnable at certain times. This removes the\n overhead of needlessly attempting to remove the runnable when it isn't posted.\n
 //                                             ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
     private val removeAdapterRunnable = Runnable {
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getRemoveAdapterRunnable().
+//                                    display_name removeAdapterRunnable
 //                                    documentation ```kt\nprivate final val removeAdapterRunnable: java.lang.Runnable\n```
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#removeAdapterRunnable.
+//                                    display_name removeAdapterRunnable
 //                                    documentation ```kt\nprivate final val removeAdapterRunnable: java.lang.Runnable\n```
 //                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
         if (isRemoveAdapterRunnablePosted) {
@@ -206,8 +230,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private val preloadScrollListeners: MutableList<EpoxyPreloader<*>> = mutableListOf()
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getPreloadScrollListeners().
+//                                     display_name preloadScrollListeners
 //                                     documentation ```kt\nprivate final val preloadScrollListeners: kotlin.collections.MutableList<com.airbnb.epoxy.preload.EpoxyPreloader<*>>\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#preloadScrollListeners.
+//                                     display_name preloadScrollListeners
 //                                     documentation ```kt\nprivate final val preloadScrollListeners: kotlin.collections.MutableList<com.airbnb.epoxy.preload.EpoxyPreloader<*>>\n```
 //                                      ^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/MutableList#
 //                                                  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#
@@ -215,8 +241,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private val preloadConfigs: MutableList<PreloadConfig<*, *, *>> = mutableListOf()
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getPreloadConfigs().
+//                             display_name preloadConfigs
 //                             documentation ```kt\nprivate final val preloadConfigs: kotlin.collections.MutableList<com.airbnb.epoxy.EpoxyRecyclerView.PreloadConfig<*, *, *>>\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#preloadConfigs.
+//                             display_name preloadConfigs
 //                             documentation ```kt\nprivate final val preloadConfigs: kotlin.collections.MutableList<com.airbnb.epoxy.EpoxyRecyclerView.PreloadConfig<*, *, *>>\n```
 //                              ^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/MutableList#
 //                                          ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#
@@ -224,39 +252,53 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private class PreloadConfig<T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder>(
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#
+//                              display_name PreloadConfig
 //                              documentation ```kt\nprivate final class PreloadConfig<T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#`<init>`().
+//                              display_name PreloadConfig
 //                              documentation ```kt\npublic constructor PreloadConfig<T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder>(maxPreload: kotlin.Int, errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */, preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>, requestHolderFactory: () -> P)\n```
 //                              ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#[T]
+//                                display_name T
 //                                documentation ```kt\n<T>\n```
 //                                                 ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#[U]
+//                                                   display_name U
 //                                                   documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                                                     ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                                                    ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#[P]
+//                                                                      display_name P
 //                                                                      documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                                        ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
         val maxPreload: Int,
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#`<init>`().(maxPreload)
+//                     display_name maxPreload
 //                     documentation ```kt\nvalue-parameter maxPreload: kotlin.Int\n```
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#getMaxPreload().
+//                     display_name maxPreload
 //                     documentation ```kt\npublic final val maxPreload: kotlin.Int\n```
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#maxPreload.
+//                     display_name maxPreload
 //                     documentation ```kt\npublic final val maxPreload: kotlin.Int\n```
 //                      ^^^ reference semanticdb maven . . kotlin/Int#
         val errorHandler: PreloadErrorHandler,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#`<init>`().(errorHandler)
+//                       display_name errorHandler
 //                       documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#errorHandler.
+//                       display_name errorHandler
 //                       documentation ```kt\npublic final val errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#getErrorHandler().
+//                       display_name errorHandler
 //                       documentation ```kt\npublic final val errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
         val preloader: EpoxyModelPreloader<T, U, P>,
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#`<init>`().(preloader)
+//                    display_name preloader
 //                    documentation ```kt\nvalue-parameter preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#getPreloader().
+//                    display_name preloader
 //                    documentation ```kt\npublic final val preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#preloader.
+//                    display_name preloader
 //                    documentation ```kt\npublic final val preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```
 //                     ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
 //                                         ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#[T]
@@ -264,10 +306,13 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 //                                               ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#[P]
         val requestHolderFactory: () -> P
 //          ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#`<init>`().(requestHolderFactory)
+//                               display_name requestHolderFactory
 //                               documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //          ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#getRequestHolderFactory().
+//                               display_name requestHolderFactory
 //                               documentation ```kt\npublic final val requestHolderFactory: () -> P\n```
 //          ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#requestHolderFactory.
+//                               display_name requestHolderFactory
 //                               documentation ```kt\npublic final val requestHolderFactory: () -> P\n```
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#PreloadConfig#[P]
     )
@@ -287,25 +332,32 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     fun <T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder> addPreloader(
 //       ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().[T]
+//         display_name T
 //         documentation ```kt\n<T>\n```
 //                          ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().[U]
+//                            display_name U
 //                            documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().[P]
+//                                               display_name P
 //                                               documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                 ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().
+//                                                                                    display_name addPreloader
 //                                                                                    documentation ```kt\npublic final fun <T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder> addPreloader(maxPreloadDistance: kotlin.Int = ..., errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */, preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>, requestHolderFactory: () -> P)\n```\n\n----\n\n\n Setup a preloader to fetch content for a model's view before it is bound.\n This can be called multiple times if you would like to add separate preloaders\n for different models or content types.\n\n Preloaders are automatically attached and run, and are updated if the adapter changes.\n\n @param maxPreloadDistance How many items to prefetch ahead of the last bound item\n @param errorHandler Called when the preloader encounters an exception. We recommend throwing an\n exception in debug builds, and logging an error in production.\n @param preloader Describes how view content for the EpoxyModel should be preloaded\n @param requestHolderFactory Should create and return a new [PreloadRequestHolder] each time it is invoked\n
         maxPreloadDistance: Int = 3,
 //      ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().(maxPreloadDistance)
+//                         display_name maxPreloadDistance
 //                         documentation ```kt\nvalue-parameter maxPreloadDistance: kotlin.Int = ...\n```
 //                          ^^^ reference semanticdb maven . . kotlin/Int#
         errorHandler: PreloadErrorHandler,
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().(errorHandler)
+//                   display_name errorHandler
 //                   documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                    ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
         preloader: EpoxyModelPreloader<T, U, P>,
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().(preloader)
+//                display_name preloader
 //                documentation ```kt\nvalue-parameter preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```
 //                 ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().[T]
@@ -313,6 +365,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().[P]
         requestHolderFactory: () -> P
 //      ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().(requestHolderFactory)
+//                           display_name requestHolderFactory
 //                           documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //                                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#addPreloader().[P]
     ) {
@@ -342,6 +395,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     fun clearPreloaders() {
 //      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#clearPreloaders().
+//                      display_name clearPreloaders
 //                      documentation ```kt\npublic final fun clearPreloaders()\n```\n\n----\n\n\n Clears all preloaders added with [addPreloader]\n
         preloadConfigs.clear()
 //      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getPreloadConfigs().
@@ -353,6 +407,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private fun updatePreloaders() {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#updatePreloaders().
+//                               display_name updatePreloaders
 //                               documentation ```kt\nprivate final fun updatePreloaders()\n```
         preloadScrollListeners.forEach { removeOnScrollListener(it) }
 //      ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getPreloadScrollListeners().
@@ -365,6 +420,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 //                             ^^^^^ reference semanticdb maven . . kotlin/collections/MutableList#clear().
         val currAdapter = adapter ?: return
 //          ^^^^^^^^^^^ definition local 1
+//                      display_name currAdapter
 //                      documentation ```kt\nval currAdapter: [Error type: Not found recorded type for adapter ?: return]\n```
 
         preloadConfigs.forEach { preloadConfig ->
@@ -372,6 +428,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 //      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#preloadConfigs.
 //                     ^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/collections/CollectionsKt#forEach(+10).
 //                               ^^^^^^^^^^^^^ definition local 2
+//                                             display_name preloadConfig
 //                                             documentation ```kt\nvalue-parameter preloadConfig: com.airbnb.epoxy.EpoxyRecyclerView.PreloadConfig<*, *, *>\n```
 
             if (currAdapter is EpoxyAdapter) {
@@ -451,8 +508,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     fun setRemoveAdapterWhenDetachedFromWindow(removeAdapterWhenDetachedFromWindow: Boolean) {
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setRemoveAdapterWhenDetachedFromWindow().
+//                                             display_name setRemoveAdapterWhenDetachedFromWindow
 //                                             documentation ```kt\npublic final fun setRemoveAdapterWhenDetachedFromWindow(removeAdapterWhenDetachedFromWindow: kotlin.Boolean)\n```\n\n----\n\n\n If set to true, any adapter set on this recyclerview will be removed when this view is detached\n from the window. This is useful to prevent leaking a reference to this RecyclerView. This is\n useful in cases where the same adapter can be used across multiple views (views which can be\n destroyed and recreated), such as with fragments. In that case the adapter is not necessarily\n cleared from previous RecyclerViews, so the adapter will continue to hold a reference to those\n views and leak them. More details at https://github.com/airbnb/epoxy/wiki/Avoiding-Memory-Leaks#parent-view\n\n The default is true, but you can disable this if you don't want your adapter detached\n automatically.\n\n If the adapter is removed via this setting, it will be re-set on the RecyclerView if the\n RecyclerView is re-attached to the window at a later point.\n
 //                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setRemoveAdapterWhenDetachedFromWindow().(removeAdapterWhenDetachedFromWindow)
+//                                                                                 display_name removeAdapterWhenDetachedFromWindow
 //                                                                                 documentation ```kt\nvalue-parameter removeAdapterWhenDetachedFromWindow: kotlin.Boolean\n```
 //                                                                                  ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         this.removeAdapterWhenDetachedFromWindow = removeAdapterWhenDetachedFromWindow
@@ -476,8 +535,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     fun setDelayMsWhenRemovingAdapterOnDetach(delayMsWhenRemovingAdapterOnDetach: Int) {
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setDelayMsWhenRemovingAdapterOnDetach().
+//                                            display_name setDelayMsWhenRemovingAdapterOnDetach
 //                                            documentation ```kt\npublic final fun setDelayMsWhenRemovingAdapterOnDetach(delayMsWhenRemovingAdapterOnDetach: kotlin.Int)\n```\n\n----\n\n\n If [.setRemoveAdapterWhenDetachedFromWindow] is set to true, this is the delay\n in milliseconds between when [.onDetachedFromWindow] is called and when the adapter is\n actually removed.\n\n By default a delay of {@value #DEFAULT_ADAPTER_REMOVAL_DELAY_MS} ms is used so that view\n transitions can complete before the adapter is removed. Otherwise if the adapter is removed\n before transitions finish it can clear the screen and break the transition. A notable case is\n fragment transitions, in which the fragment view is detached from window before the transition\n ends.\n
 //                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setDelayMsWhenRemovingAdapterOnDetach().(delayMsWhenRemovingAdapterOnDetach)
+//                                                                               display_name delayMsWhenRemovingAdapterOnDetach
 //                                                                               documentation ```kt\nvalue-parameter delayMsWhenRemovingAdapterOnDetach: kotlin.Int\n```
 //                                                                                ^^^ reference semanticdb maven . . kotlin/Int#
         this.delayMsWhenRemovingAdapterOnDetach = delayMsWhenRemovingAdapterOnDetach
@@ -494,6 +555,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 //          ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#`<init>`().(attrs)
             val a = context.obtainStyledAttributes(
 //              ^ definition local 3
+//                display_name a
 //                documentation ```kt\nval a: [Error type: Return type for function cannot be resolved]\n```
 //                  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#`<init>`().(context)
                 attrs, R.styleable.EpoxyRecyclerView,
@@ -521,6 +583,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 //   ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/CallSuper#`<init>`().
     protected open fun init() {
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#init().
+//                          display_name init
 //                          documentation ```kt\nprotected open fun init()\n```
         clipToPadding = false
         initViewPool()
@@ -536,6 +599,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     private fun initViewPool() {
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#initViewPool().
+//                           display_name initViewPool
 //                           documentation ```kt\nprivate final fun initViewPool()\n```\n\n----\n\n\n Get or create a view pool to use for this RecyclerView. By default the same pool is shared for\n all [EpoxyRecyclerView] usages in the same Activity.\n\n @see .createViewPool\n @see .shouldShareViewPoolAcrossContext\n
         if (!shouldShareViewPoolAcrossContext()) {
 //          ^ reference semanticdb maven . . kotlin/Boolean#not().
@@ -563,6 +627,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     protected open fun createViewPool(): RecyclerView.RecycledViewPool {
 //                     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#createViewPool().
+//                                    display_name createViewPool
 //                                    documentation ```kt\nprotected open fun createViewPool(): [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```\n\n----\n\n\n Create a new instance of a view pool to use with this recyclerview. By default a [ ] is used.\n
         return UnboundedViewPool()
 //             ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#`<init>`().
@@ -574,6 +639,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     open fun shouldShareViewPoolAcrossContext(): Boolean {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#shouldShareViewPoolAcrossContext().
+//                                            display_name shouldShareViewPoolAcrossContext
 //                                            documentation ```kt\npublic open fun shouldShareViewPoolAcrossContext(): kotlin.Boolean\n```\n\n----\n\n\n To maximize view recycling by default we share the same view pool across all instances in the same Activity. This behavior can be disabled by returning\n false here.\n
 //                                               ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         return true
@@ -581,11 +647,14 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     override fun setLayoutParams(params: ViewGroup.LayoutParams) {
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setLayoutParams().
+//                               display_name setLayoutParams
 //                               documentation ```kt\npublic open fun setLayoutParams(params: [Error type: Unresolved type for ViewGroup.LayoutParams])\n```
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setLayoutParams().(params)
+//                                      display_name params
 //                                      documentation ```kt\nvalue-parameter params: [Error type: Unresolved type for ViewGroup.LayoutParams]\n```
         val isFirstParams = layoutParams == null
 //          ^^^^^^^^^^^^^ definition local 4
+//                        display_name isFirstParams
 //                        documentation ```kt\nval isFirstParams: kotlin.Boolean\n```
         super.setLayoutParams(params)
 //      ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -617,9 +686,11 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     protected open fun createLayoutManager(): RecyclerView.LayoutManager {
 //                     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#createLayoutManager().
+//                                         display_name createLayoutManager
 //                                         documentation ```kt\nprotected open fun createLayoutManager(): [Error type: Unresolved type for RecyclerView.LayoutManager]\n```\n\n----\n\n\n Create a new [androidx.recyclerview.widget.RecyclerView.LayoutManager]\n instance to use for this RecyclerView.\n\n By default a LinearLayoutManager is used, and a reasonable default is chosen for scrolling\n direction based on layout params.\n\n If the RecyclerView is set to match parent size then the scrolling orientation is set to\n vertical and [.setHasFixedSize] is set to true.\n\n If the height is set to wrap_content then the scrolling orientation is set to horizontal, and\n [.setClipToPadding] is set to false.\n
         val layoutParams = layoutParams
 //          ^^^^^^^^^^^^ definition local 5
+//                       display_name layoutParams
 //                       documentation ```kt\nval layoutParams: [Error type: Not found recorded type for layoutParams]\n```
 
         // 0 represents matching constraints in a LinearLayout or ConstraintLayout
@@ -645,8 +716,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     override fun setLayoutManager(layout: RecyclerView.LayoutManager?) {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setLayoutManager().
+//                                display_name setLayoutManager
 //                                documentation ```kt\npublic open fun setLayoutManager(layout: [Error type: Unresolved type for RecyclerView.LayoutManager]?)\n```
 //                                ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setLayoutManager().(layout)
+//                                       display_name layout
 //                                       documentation ```kt\nvalue-parameter layout: [Error type: Unresolved type for RecyclerView.LayoutManager]?\n```
         super.setLayoutManager(layout)
 //      ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -661,12 +734,15 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     private fun syncSpanCount() {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#syncSpanCount().
+//                            display_name syncSpanCount
 //                            documentation ```kt\nprivate final fun syncSpanCount()\n```\n\n----\n\n\n If a grid layout manager is set we sync the span count between the layout and the epoxy\n adapter automatically.\n
         val layout = layoutManager
 //          ^^^^^^ definition local 6
+//                 display_name layout
 //                 documentation ```kt\nval layout: [Error type: Not found recorded type for layoutManager]\n```
         val controller = epoxyController
 //          ^^^^^^^^^^ definition local 7
+//                     display_name controller
 //                     documentation ```kt\nval controller: [Error type: Unresolved type for EpoxyController]?\n```
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#epoxyController.
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getEpoxyController().
@@ -692,6 +768,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     override fun requestLayout() {
 //               ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#requestLayout().
+//                             display_name requestLayout
 //                             documentation ```kt\npublic open fun requestLayout()\n```
         // Grid layout manager calls this when the span count is changed. Its the easiest way to
         // detect a span count change and update our controller accordingly.
@@ -703,9 +780,11 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     fun setItemSpacingRes(@DimenRes itemSpacingRes: Int) {
 //      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setItemSpacingRes().
+//                        display_name setItemSpacingRes
 //                        documentation ```kt\npublic final fun setItemSpacingRes(itemSpacingRes: kotlin.Int)\n```
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#`<init>`().
 //                                  ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setItemSpacingRes().(itemSpacingRes)
+//                                                 display_name itemSpacingRes
 //                                                 documentation ```kt\nvalue-parameter itemSpacingRes: kotlin.Int\n```
 //                                                  ^^^ reference semanticdb maven . . kotlin/Int#
         setItemSpacingPx(resToPx(itemSpacingRes))
@@ -716,12 +795,14 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     fun setItemSpacingDp(@Dimension(unit = Dimension.DP) dp: Int) {
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setItemSpacingDp().
+//                       display_name setItemSpacingDp
 //                       documentation ```kt\npublic final fun setItemSpacingDp(dp: kotlin.Int)\n```
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#`<init>`().
 //                                  ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#`<init>`().(unit)
 //                                         ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                                   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                                       ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setItemSpacingDp().(dp)
+//                                                          display_name dp
 //                                                          documentation ```kt\nvalue-parameter dp: kotlin.Int\n```
 //                                                           ^^^ reference semanticdb maven . . kotlin/Int#
         setItemSpacingPx(dpToPx(dp))
@@ -745,9 +826,11 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     open fun setItemSpacingPx(@Px spacingPx: Int) {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setItemSpacingPx().
+//                            display_name setItemSpacingPx
 //                            documentation ```kt\npublic open fun setItemSpacingPx(spacingPx: kotlin.Int)\n```\n\n----\n\n\n Set a pixel value to use as spacing between items. If this is a positive number an item\n decoration will be added to space all items this far apart from each other. If the value is 0\n or negative no extra spacing will be used, and any previous spacing will be removed.\n\n This only works if a [LinearLayoutManager] or [GridLayoutManager] is used with this\n RecyclerView.\n\n This can also be set via the `app:itemSpacing` styleable attribute.\n\n @see .setItemSpacingDp\n @see .setItemSpacingRes\n
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
 //                                ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setItemSpacingPx().(spacingPx)
+//                                          display_name spacingPx
 //                                          documentation ```kt\nvalue-parameter spacingPx: kotlin.Int\n```
 //                                           ^^^ reference semanticdb maven . . kotlin/Int#
         removeItemDecoration(spacingDecorator)
@@ -780,12 +863,15 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     open fun setModels(models: List<EpoxyModel<*>>) {
 //           ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setModels().
+//                     display_name setModels
 //                     documentation ```kt\npublic open fun setModels(models: kotlin.collections.List<[Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>>)\n```\n\n----\n\n\n Set a list of [EpoxyModel]'s to show in this RecyclerView.\n\n Alternatively you can set an [EpoxyController] to handle building models dynamically.\n\n @see withModels\n @see setController\n @see setControllerAndBuildModels\n @see buildModelsWith\n
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setModels().(models)
+//                            display_name models
 //                            documentation ```kt\nvalue-parameter models: kotlin.collections.List<[Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>>\n```
 //                             ^^^^ reference semanticdb maven . . kotlin/collections/List#
         val controller = (epoxyController as? SimpleEpoxyController)
 //          ^^^^^^^^^^ definition local 8
+//                     display_name controller
 //                     documentation ```kt\nval controller: ???\n```
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#epoxyController.
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getEpoxyController().
@@ -819,8 +905,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     fun setController(controller: EpoxyController) {
 //      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setController().
+//                    display_name setController
 //                    documentation ```kt\npublic final fun setController(controller: [Error type: Unresolved type for EpoxyController])\n```\n\n----\n\n\n Set an EpoxyController to populate this RecyclerView. This does not make the controller build\n its models, that must be done separately via [requestModelBuild].\n\n Use this if you don't want [requestModelBuild] called automatically. Common cases\n are if you are using [TypedEpoxyController] (in which case you must call setData on the\n controller), or if you have not otherwise populated your controller's data yet.\n\n Otherwise if you want models built automatically for you use [setControllerAndBuildModels]\n\n The controller can be cleared with [clear]\n\n @see .setControllerAndBuildModels\n @see .buildModelsWith\n @see .setModels\n
 //                    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setController().(controller)
+//                               display_name controller
 //                               documentation ```kt\nvalue-parameter controller: [Error type: Unresolved type for EpoxyController]\n```
         epoxyController = controller
 //      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#epoxyController.
@@ -845,8 +933,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     fun setControllerAndBuildModels(controller: EpoxyController) {
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setControllerAndBuildModels().
+//                                  display_name setControllerAndBuildModels
 //                                  documentation ```kt\npublic final fun setControllerAndBuildModels(controller: [Error type: Unresolved type for EpoxyController])\n```\n\n----\n\n\n Set an EpoxyController to populate this RecyclerView, and tell the controller to build\n models.\n\n The controller can be cleared with [clear]\n\n @see setController\n @see buildModelsWith\n @see setModels\n
 //                                  ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setControllerAndBuildModels().(controller)
+//                                             display_name controller
 //                                             documentation ```kt\nvalue-parameter controller: [Error type: Unresolved type for EpoxyController]\n```
         controller.requestModelBuild()
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setControllerAndBuildModels().(controller)
@@ -867,12 +957,15 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     fun withModels(buildModels: EpoxyController.() -> Unit) {
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#withModels().
+//                 display_name withModels
 //                 documentation ```kt\npublic final fun withModels(buildModels: [Error type: Unresolved type for EpoxyController].() -> kotlin.Unit)\n```\n\n----\n\n\n The simplest way to add models to the RecyclerView without needing to create an EpoxyController.\n This is intended for Kotlin usage, and has the EpoxyController as the lambda receiver so\n models can be added easily.\n\n Multiple calls to this will reuse the same underlying EpoxyController so views in the\n RecyclerView will be reused.\n\n The Java equivalent is [buildModelsWith].\n
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#withModels().(buildModels)
+//                             display_name buildModels
 //                             documentation ```kt\nvalue-parameter buildModels: [Error type: Unresolved type for EpoxyController].() -> kotlin.Unit\n```
 //                                                    ^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/Unit#
         val controller = (epoxyController as? WithModelsController)
 //          ^^^^^^^^^^ definition local 9
+//                     display_name controller
 //                     documentation ```kt\nval controller: com.airbnb.epoxy.EpoxyRecyclerView.WithModelsController\n```
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#epoxyController.
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getEpoxyController().
@@ -896,20 +989,26 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private class WithModelsController : EpoxyController() {
 //                ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#WithModelsController#
+//                                     display_name WithModelsController
 //                                     documentation ```kt\nprivate final class WithModelsController\n```
 //                ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#WithModelsController#`<init>`().
+//                                     display_name WithModelsController
 //                                     documentation ```kt\npublic constructor WithModelsController()\n```
         var callback: EpoxyController.() -> Unit = {}
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#WithModelsController#callback.
+//                   display_name callback
 //                   documentation ```kt\npublic final var callback: [Error type: Unresolved type for EpoxyController].() -> kotlin.Unit\n```
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#WithModelsController#getCallback().
+//                   display_name callback
 //                   documentation ```kt\npublic final var callback: [Error type: Unresolved type for EpoxyController].() -> kotlin.Unit\n```
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#WithModelsController#setCallback().
+//                   display_name callback
 //                   documentation ```kt\npublic final var callback: [Error type: Unresolved type for EpoxyController].() -> kotlin.Unit\n```
 //                                          ^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/Unit#
 
         override fun buildModels() {
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#WithModelsController#buildModels().
+//                               display_name buildModels
 //                               documentation ```kt\npublic open fun buildModels()\n```
             callback(this)
 //          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#WithModelsController#callback.
@@ -937,12 +1036,15 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     fun buildModelsWith(callback: ModelBuilderCallback) {
 //      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#buildModelsWith().
+//                      display_name buildModelsWith
 //                      documentation ```kt\npublic final fun buildModelsWith(callback: com.airbnb.epoxy.EpoxyRecyclerView.ModelBuilderCallback)\n```\n\n----\n\n\n Allows you to build models via a callback instead of needing to create a new EpoxyController\n class. This is useful if your models are simple and you would like to simply declare them in\n your activity/fragment.\n\n Multiple calls to this will reuse the same underlying EpoxyController so views in the\n RecyclerView will be reused.\n\n Another useful pattern is having your Activity or Fragment implement [ModelBuilderCallback].\n\n If you're using Kotlin, prefer [withModels].\n\n @see setController\n @see setControllerAndBuildModels\n @see setModels\n
 //                      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#buildModelsWith().(callback)
+//                               display_name callback
 //                               documentation ```kt\nvalue-parameter callback: com.airbnb.epoxy.EpoxyRecyclerView.ModelBuilderCallback\n```
 //                                ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallback#
         val controller = (epoxyController as? ModelBuilderCallbackController)
 //          ^^^^^^^^^^ definition local 11
+//                     display_name controller
 //                     documentation ```kt\nval controller: com.airbnb.epoxy.EpoxyRecyclerView.ModelBuilderCallbackController\n```
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#epoxyController.
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getEpoxyController().
@@ -966,29 +1068,37 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private class ModelBuilderCallbackController : EpoxyController() {
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallbackController#
+//                                               display_name ModelBuilderCallbackController
 //                                               documentation ```kt\nprivate final class ModelBuilderCallbackController\n```
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallbackController#`<init>`().
+//                                               display_name ModelBuilderCallbackController
 //                                               documentation ```kt\npublic constructor ModelBuilderCallbackController()\n```
         var callback: ModelBuilderCallback = object : ModelBuilderCallback {
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallbackController#callback.
+//                   display_name callback
 //                   documentation ```kt\npublic final var callback: com.airbnb.epoxy.EpoxyRecyclerView.ModelBuilderCallback\n```
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallbackController#getCallback().
+//                   display_name callback
 //                   documentation ```kt\npublic final var callback: com.airbnb.epoxy.EpoxyRecyclerView.ModelBuilderCallback\n```
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallbackController#setCallback().
+//                   display_name callback
 //                   documentation ```kt\npublic final var callback: com.airbnb.epoxy.EpoxyRecyclerView.ModelBuilderCallback\n```
 //                    ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallback#
 //                                                    ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallback#
             override fun buildModels(controller: EpoxyController) {
 //                       ^^^^^^^^^^^ definition local 13
+//                                   display_name buildModels
 //                                   documentation ```kt\npublic open fun buildModels(controller: [Error type: Unresolved type for EpoxyController])\n```
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallback#buildModels().
 //                                   ^^^^^^^^^^ definition local 14
+//                                              display_name controller
 //                                              documentation ```kt\nvalue-parameter controller: [Error type: Unresolved type for EpoxyController]\n```
             }
         }
 
         override fun buildModels() {
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallbackController#buildModels().
+//                               display_name buildModels
 //                               documentation ```kt\npublic open fun buildModels()\n```
             callback.buildModels(this)
 //          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallbackController#callback.
@@ -1004,6 +1114,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     interface ModelBuilderCallback {
 //            ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallback#
+//                                 display_name ModelBuilderCallback
 //                                 documentation ```kt\npublic interface ModelBuilderCallback\n```\n\n----\n\n\n A callback for creating models without needing a custom EpoxyController class. Used with [buildModelsWith]\n
         /**
          * Analagous to [EpoxyController.buildModels]. You should create new model instances and
@@ -1012,8 +1123,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
          */
         fun buildModels(controller: EpoxyController)
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallback#buildModels().
+//                      display_name buildModels
 //                      documentation ```kt\npublic abstract fun buildModels(controller: [Error type: Unresolved type for EpoxyController])\n```\n\n----\n\n\n Analagous to [EpoxyController.buildModels]. You should create new model instances and\n add them to the given controller. [AutoModel] cannot be used with models added this\n way.\n
 //                      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#ModelBuilderCallback#buildModels().(controller)
+//                                 display_name controller
 //                                 documentation ```kt\nvalue-parameter controller: [Error type: Unresolved type for EpoxyController]\n```
     }
 
@@ -1027,6 +1140,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     fun requestModelBuild() {
 //      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#requestModelBuild().
+//                        display_name requestModelBuild
 //                        documentation ```kt\npublic final fun requestModelBuild()\n```\n\n----\n\n\n Request that the currently set EpoxyController has its models rebuilt. You can use this to\n avoid saving your controller as a field.\n\n You cannot use this if your controller is a [TypedEpoxyController] or if you set\n models via [setModels]. In that case you must set data directly on the\n controller or set models again.\n
         if (epoxyController == null) {
 //          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#epoxyController.
@@ -1059,6 +1173,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
      */
     open fun clear() {
 //           ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#clear().
+//                 display_name clear
 //                 documentation ```kt\npublic open fun clear()\n```\n\n----\n\n\n Clear the currently set EpoxyController or Adapter as well as any models that are displayed.\n\n Any pending requests to the EpoxyController to build models are canceled.\n\n Any existing child views are recycled to the view pool.\n
         // The controller is cleared so the next time models are set we can create a fresh one.
         epoxyController?.cancelPendingModelBuild()
@@ -1081,12 +1196,14 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
     protected fun dpToPx(@Dimension(unit = Dimension.DP) dp: Int): Int {
 //                ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#dpToPx().
+//                       display_name dpToPx
 //                       documentation ```kt\nprotected final fun dpToPx(dp: kotlin.Int): kotlin.Int\n```
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#`<init>`().
 //                                  ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#`<init>`().(unit)
 //                                         ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                                   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                                       ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#dpToPx().(dp)
+//                                                          display_name dp
 //                                                          documentation ```kt\nvalue-parameter dp: kotlin.Int\n```
 //                                                           ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                 ^^^ reference semanticdb maven . . kotlin/Int#
@@ -1103,9 +1220,11 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
     protected fun resToPx(@DimenRes itemSpacingRes: Int): Int {
 //                ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#resToPx().
+//                        display_name resToPx
 //                        documentation ```kt\nprotected final fun resToPx(itemSpacingRes: kotlin.Int): kotlin.Int\n```
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#`<init>`().
 //                                  ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#resToPx().(itemSpacingRes)
+//                                                 display_name itemSpacingRes
 //                                                 documentation ```kt\nvalue-parameter itemSpacingRes: kotlin.Int\n```
 //                                                  ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                        ^^^ reference semanticdb maven . . kotlin/Int#
@@ -1115,8 +1234,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     override fun setAdapter(adapter: RecyclerView.Adapter<*>?) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setAdapter().
+//                          display_name setAdapter
 //                          documentation ```kt\npublic open fun setAdapter(adapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?)\n```
 //                          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#setAdapter().(adapter)
+//                                  display_name adapter
 //                                  documentation ```kt\nvalue-parameter adapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```
         super.setAdapter(adapter)
 //      ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -1130,12 +1251,15 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     override fun swapAdapter(
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#swapAdapter().
+//                           display_name swapAdapter
 //                           documentation ```kt\npublic open fun swapAdapter(adapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?, removeAndRecycleExistingViews: kotlin.Boolean)\n```
         adapter: RecyclerView.Adapter<*>?,
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#swapAdapter().(adapter)
+//              display_name adapter
 //              documentation ```kt\nvalue-parameter adapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```
         removeAndRecycleExistingViews: Boolean
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#swapAdapter().(removeAndRecycleExistingViews)
+//                                    display_name removeAndRecycleExistingViews
 //                                    documentation ```kt\nvalue-parameter removeAndRecycleExistingViews: kotlin.Boolean\n```
 //                                     ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
     ) {
@@ -1152,6 +1276,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     public override fun onAttachedToWindow() {
 //                      ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#onAttachedToWindow().
+//                                         display_name onAttachedToWindow
 //                                         documentation ```kt\npublic open fun onAttachedToWindow()\n```
         super.onAttachedToWindow()
 //      ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -1173,6 +1298,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     public override fun onDetachedFromWindow() {
 //                      ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#onDetachedFromWindow().
+//                                           display_name onDetachedFromWindow
 //                                           documentation ```kt\npublic open fun onDetachedFromWindow()\n```
         super.onDetachedFromWindow()
 //      ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -1215,9 +1341,11 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private fun removeAdapter() {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#removeAdapter().
+//                            display_name removeAdapter
 //                            documentation ```kt\nprivate final fun removeAdapter()\n```
         val currentAdapter = adapter
 //          ^^^^^^^^^^^^^^ definition local 16
+//                         display_name currentAdapter
 //                         documentation ```kt\nval currentAdapter: [Error type: Not found recorded type for adapter]\n```
         if (currentAdapter != null) {
 //          ^^^^^^^^^^^^^^ reference local 16
@@ -1242,6 +1370,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private fun clearRemovedAdapterAndCancelRunnable() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#clearRemovedAdapterAndCancelRunnable().
+//                                                   display_name clearRemovedAdapterAndCancelRunnable
 //                                                   documentation ```kt\nprivate final fun clearRemovedAdapterAndCancelRunnable()\n```
         removedAdapter = null
 //      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#getRemovedAdapter().
@@ -1263,6 +1392,7 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     private fun clearPoolIfActivityIsDestroyed() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#clearPoolIfActivityIsDestroyed().
+//                                             display_name clearPoolIfActivityIsDestroyed
 //                                             documentation ```kt\nprivate final fun clearPoolIfActivityIsDestroyed()\n```
         // Views in the pool hold context references which can keep the activity from being GC'd,
         // plus they can hold significant memory resources. We should clear it asap after the pool
@@ -1274,11 +1404,14 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
 
     companion object {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#Companion# 1:0
+//                     display_name Companion
 //                     documentation ```kt\npublic companion object\n```
         private const val DEFAULT_ADAPTER_REMOVAL_DELAY_MS = 2000
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#Companion#DEFAULT_ADAPTER_REMOVAL_DELAY_MS.
+//                                                         display_name DEFAULT_ADAPTER_REMOVAL_DELAY_MS
 //                                                         documentation ```kt\nprivate const final val DEFAULT_ADAPTER_REMOVAL_DELAY_MS: kotlin.Int\n```
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#Companion#getDEFAULT_ADAPTER_REMOVAL_DELAY_MS().
+//                                                         display_name DEFAULT_ADAPTER_REMOVAL_DELAY_MS
 //                                                         documentation ```kt\nprivate const final val DEFAULT_ADAPTER_REMOVAL_DELAY_MS: kotlin.Int\n```
 
         /**
@@ -1287,8 +1420,10 @@ open class EpoxyRecyclerView @JvmOverloads constructor(
          */
         private val ACTIVITY_RECYCLER_POOL = ActivityRecyclerPool()
 //                  ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#Companion#ACTIVITY_RECYCLER_POOL.
+//                                         display_name ACTIVITY_RECYCLER_POOL
 //                                         documentation ```kt\nprivate final val ACTIVITY_RECYCLER_POOL: com.airbnb.epoxy.ActivityRecyclerPool\n```\n\n----\n\n\n Store one unique pool per activity. They are cleared out when activities are destroyed, so this\n only needs to hold pools for active activities.\n
 //                  ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyRecyclerView#Companion#getACTIVITY_RECYCLER_POOL().
+//                                         display_name ACTIVITY_RECYCLER_POOL
 //                                         documentation ```kt\nprivate final val ACTIVITY_RECYCLER_POOL: com.airbnb.epoxy.ActivityRecyclerPool\n```\n\n----\n\n\n Store one unique pool per activity. They are cleared out when activities are destroyed, so this\n only needs to hold pools for active activities.\n
 //                                           ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ActivityRecyclerPool#`<init>`().
     }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
index c3da8ac17..ce50c1114 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
@@ -20,10 +20,12 @@
  */
 public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouchCallback<T> {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
+//                                  display_name EpoxySwipeCallback
 //                                  documentation ```java\npublic interface EpoxySwipeCallback<T extends EpoxyModel>\n```
 //                                  documentation  For use with {@link EpoxyModelTouchCallback}\n
 //                                  relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                  ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
+//                                    display_name T
 //                                    documentation ```java\nT extends EpoxyModel\n```
 //                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
@@ -42,17 +44,21 @@ public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouch
    */
   void onSwipeStarted(T model, View itemView, int adapterPosition);
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
+//                    display_name onSwipeStarted
 //                    documentation ```java\npublic abstract void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)\n```
 //                    documentation  Called when the view switches from an idle state to a swiped state, as the user begins a swipe\n interaction with it. You can use this callback to modify the view to indicate it is being\n swiped.\n <p>\n This is the first callback made in the lifecycle of a swipe event.\n\n @param model           The model representing the view that is being swiped\n @param itemView        The view that is being swiped\n @param adapterPosition The adapter position of the model\n
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                      ^^^^^ definition local 0
+//                            display_name model
 //                            documentation ```java\nT model\n```
 //                             ^^^^ reference semanticdb maven . . View#
 //                                  ^^^^^^^^ definition local 1
+//                                           display_name itemView
 //                                           documentation ```java\nunresolved_type itemView\n```
 //                                                ^^^^^^^^^^^^^^^ definition local 2
+//                                                                display_name adapterPosition
 //                                                                documentation ```java\nint adapterPosition\n```
 
   /**
@@ -71,21 +77,26 @@ public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouch
    */
   void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
+//                            display_name onSwipeProgressChanged
 //                            documentation ```java\npublic abstract void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)\n```
 //                            documentation  Once a view has begun swiping with {@link #onSwipeStarted(EpoxyModel, View, int)} it will\n receive this callback as the swipe distance changes. This can be called multiple times as the\n swipe interaction progresses.\n\n @param model         The model representing the view that is being swiped\n @param itemView      The view that is being swiped\n @param swipeProgress A float from -1 to 1 representing the percentage that the view has been\n                      swiped relative to its width. This will be positive if the view is being\n                      swiped to the right and negative if it is swiped to the left. For\n                      example,\n @param canvas        The canvas on which RecyclerView is drawing its children. You can draw to\n                      this to support custom swipe animations.\n
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                              ^^^^^ definition local 3
+//                                    display_name model
 //                                    documentation ```java\nT model\n```
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 4
+//                                                   display_name itemView
 //                                                   documentation ```java\nunresolved_type itemView\n```
 //                                                          ^^^^^^^^^^^^^ definition local 5
+//                                                                        display_name swipeProgress
 //                                                                        documentation ```java\nfloat swipeProgress\n```
       Canvas canvas);
 //    ^^^^^^ reference semanticdb maven . . Canvas#
 //           ^^^^^^ definition local 6
+//                  display_name canvas
 //                  documentation ```java\nunresolved_type canvas\n```
 
   /**
@@ -99,15 +110,18 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
    */
   void onSwipeReleased(T model, View itemView);
 //     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
+//                     display_name onSwipeReleased
 //                     documentation ```java\npublic abstract void onSwipeReleased(T model, unresolved_type itemView)\n```
 //                     documentation  Called when the user has released their touch on the view. If the displacement passed the swipe\n threshold then {@link #onSwipeCompleted(EpoxyModel, View, int, int)} will be called after this\n and the view will be animated off screen. Otherwise the view will animate back to its original\n position.\n\n @param model    The model representing the view that was being swiped\n @param itemView The view that was being swiped\n
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
 //                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                       ^^^^^ definition local 7
+//                             display_name model
 //                             documentation ```java\nT model\n```
 //                              ^^^^ reference semanticdb maven . . View#
 //                                   ^^^^^^^^ definition local 8
+//                                            display_name itemView
 //                                            documentation ```java\nunresolved_type itemView\n```
 
   /**
@@ -129,18 +143,23 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
    */
   void onSwipeCompleted(T model, View itemView, int position, int direction);
 //     ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
+//                      display_name onSwipeCompleted
 //                      documentation ```java\npublic abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)\n```
 //                      documentation  Called after {@link #onSwipeReleased(EpoxyModel, View)} if the swipe surpassed the threshold to\n be considered a full swipe. The view will now be animated off screen.\n <p>\n You MUST use this callback to remove this item from your backing data and request a model\n update.\n <p>\n {@link #clearView(EpoxyModel, View)} will be called after this.\n\n @param model     The model representing the view that was being swiped\n @param itemView  The view that was being swiped\n @param position  The adapter position of the model\n @param direction The direction that the view was swiped. Can be any of {@link\n                  ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n                  ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN} depending on what swipe\n                  directions were enabled.\n
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                        ^^^^^ definition local 9
+//                              display_name model
 //                              documentation ```java\nT model\n```
 //                               ^^^^ reference semanticdb maven . . View#
 //                                    ^^^^^^^^ definition local 10
+//                                             display_name itemView
 //                                             documentation ```java\nunresolved_type itemView\n```
 //                                                  ^^^^^^^^ definition local 11
+//                                                           display_name position
 //                                                           documentation ```java\nint position\n```
 //                                                                ^^^^^^^^^ definition local 12
+//                                                                          display_name direction
 //                                                                          documentation ```java\nint direction\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
index d2fc2af6c..2874ce046 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
@@ -64,9 +64,11 @@
  */
 public abstract class EpoxyTouchHelper {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#
+//                                     display_name EpoxyTouchHelper
 //                                     documentation ```java\npublic abstract class EpoxyTouchHelper\n```
 //                                     documentation  A simple way to set up drag or swipe interactions with Epoxy.\n <p>\n Drag events work with the EpoxyController and automatically update the controller and\n RecyclerView when an item is moved. You just need to implement a callback to update your data to\n reflect the change.\n <p>\n Both swipe and drag events implement a small lifecycle to help you style the views as they are\n moved. You can register callbacks for the lifecycle events you care about.\n <p>\n If you want to set up multiple drag and swipe rules for the same RecyclerView, you can use this\n class multiple times to specify different targets or swipe and drag directions and callbacks.\n <p>\n If you want more control over configuration and handling, you can opt to not use this class and\n instead you can implement {@link EpoxyModelTouchCallback} directly with your own {@link\n ItemTouchHelper}. That class provides an interface that makes it easier to work with Epoxy models\n and simplifies touch callbacks.\n <p>\n If you want even more control you can implement {@link EpoxyTouchHelperCallback}. This is just a\n light layer over the normal RecyclerView touch callbacks, but it converts all view holders to\n Epoxy view holders to remove some boilerplate for you.\n
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#`<init>`().
+//                                     display_name <init>
 //                                     documentation ```java\npublic EpoxyTouchHelper()\n```
 
   /**
@@ -79,10 +81,12 @@ public abstract class EpoxyTouchHelper {
   public static DragBuilder initDragging(EpoxyController controller) {
 //              ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#
 //                          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#initDragging().
+//                                       display_name initDragging
 //                                       documentation ```java\npublic static DragBuilder initDragging(EpoxyController controller)\n```
 //                                       documentation  The entry point for setting up drag support.\n\n @param controller The EpoxyController with the models that will be dragged. The controller will\n                   be updated for you when a model is dragged and moved by a user's touch\n                   interaction.\n
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                       ^^^^^^^^^^ definition local 0
+//                                                                  display_name controller
 //                                                                  documentation ```java\nEpoxyController controller\n```
     return new DragBuilder(controller);
 //             ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#`<init>`().
@@ -91,18 +95,22 @@ public static DragBuilder initDragging(EpoxyController controller) {
 
   public static class DragBuilder {
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#
+//                                display_name DragBuilder
 //                                documentation ```java\npublic static class DragBuilder\n```
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller.
+//                                           display_name controller
 //                                           documentation ```java\nprivate final EpoxyController controller\n```
 
     private DragBuilder(EpoxyController controller) {
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#`<init>`().
+//                      display_name <init>
 //                      documentation ```java\nprivate DragBuilder(EpoxyController controller)\n```
 //                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                      ^^^^^^^^^^ definition local 1
+//                                                 display_name controller
 //                                                 documentation ```java\nEpoxyController controller\n```
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller.
@@ -117,10 +125,12 @@ private DragBuilder(EpoxyController controller) {
     public DragBuilder2 withRecyclerView(RecyclerView recyclerView) {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#
 //                      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#withRecyclerView().
+//                                       display_name withRecyclerView
 //                                       documentation ```java\npublic DragBuilder2 withRecyclerView(unresolved_type recyclerView)\n```
 //                                       documentation  The recyclerview that the EpoxyController has its adapter added to. An {@link\n androidx.recyclerview.widget.ItemTouchHelper} will be created and configured for you, and\n attached to this RecyclerView.\n
 //                                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                    ^^^^^^^^^^^^ definition local 2
+//                                                                 display_name recyclerView
 //                                                                 documentation ```java\nunresolved_type recyclerView\n```
       return new DragBuilder2(controller, recyclerView);
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#`<init>`().
@@ -131,25 +141,31 @@ public DragBuilder2 withRecyclerView(RecyclerView recyclerView) {
 
   public static class DragBuilder2 {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#
+//                                 display_name DragBuilder2
 //                                 documentation ```java\npublic static class DragBuilder2\n```
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller.
+//                                           display_name controller
 //                                           documentation ```java\nprivate final EpoxyController controller\n```
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#recyclerView.
+//                                          display_name recyclerView
 //                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
 
     private DragBuilder2(EpoxyController controller, RecyclerView recyclerView) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\nprivate DragBuilder2(EpoxyController controller, unresolved_type recyclerView)\n```
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 3
+//                                                  display_name controller
 //                                                  documentation ```java\nEpoxyController controller\n```
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                ^^^^^^^^^^^^ definition local 4
+//                                                                             display_name recyclerView
 //                                                                             documentation ```java\nunresolved_type recyclerView\n```
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller.
@@ -163,6 +179,7 @@ private DragBuilder2(EpoxyController controller, RecyclerView recyclerView) {
     public DragBuilder3 forVerticalList() {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forVerticalList().
+//                                      display_name forVerticalList
 //                                      documentation ```java\npublic DragBuilder3 forVerticalList()\n```
 //                                      documentation Enable dragging vertically, up and down. 
       return withDirections(ItemTouchHelper.UP | ItemTouchHelper.DOWN);
@@ -177,6 +194,7 @@ public DragBuilder3 forVerticalList() {
     public DragBuilder3 forHorizontalList() {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forHorizontalList().
+//                                        display_name forHorizontalList
 //                                        documentation ```java\npublic DragBuilder3 forHorizontalList()\n```
 //                                        documentation Enable dragging horizontally, left and right. 
       return withDirections(ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
@@ -191,6 +209,7 @@ public DragBuilder3 forHorizontalList() {
     public DragBuilder3 forGrid() {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forGrid().
+//                              display_name forGrid
 //                              documentation ```java\npublic DragBuilder3 forGrid()\n```
 //                              documentation Enable dragging in all directions. 
       return withDirections(ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT
@@ -218,9 +237,11 @@ public DragBuilder3 forGrid() {
     public DragBuilder3 withDirections(int directionFlags) {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                      ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
+//                                     display_name withDirections
 //                                     documentation ```java\npublic DragBuilder3 withDirections(int directionFlags)\n```
 //                                     documentation  Set custom movement flags to dictate which drag directions should be allowed.\n <p>\n Can be any of {@link ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN}, {@link ItemTouchHelper#START}, {@link\n ItemTouchHelper#END}\n <p>\n Flags can be OR'd together to allow multiple directions.\n
 //                                         ^^^^^^^^^^^^^^ definition local 5
+//                                                        display_name directionFlags
 //                                                        documentation ```java\nint directionFlags\n```
       return new DragBuilder3(controller, recyclerView, makeMovementFlags(directionFlags, 0));
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
@@ -233,30 +254,38 @@ public DragBuilder3 withDirections(int directionFlags) {
 
   public static class DragBuilder3 {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
+//                                 display_name DragBuilder3
 //                                 documentation ```java\npublic static class DragBuilder3\n```
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller.
+//                                           display_name controller
 //                                           documentation ```java\nprivate final EpoxyController controller\n```
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#recyclerView.
+//                                          display_name recyclerView
 //                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#movementFlags.
+//                                  display_name movementFlags
 //                                  documentation ```java\nprivate final int movementFlags\n```
 
     private DragBuilder3(EpoxyController controller, RecyclerView recyclerView, int movementFlags) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\nprivate DragBuilder3(EpoxyController controller, unresolved_type recyclerView, int movementFlags)\n```
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 6
+//                                                  display_name controller
 //                                                  documentation ```java\nEpoxyController controller\n```
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                ^^^^^^^^^^^^ definition local 7
+//                                                                             display_name recyclerView
 //                                                                             documentation ```java\nunresolved_type recyclerView\n```
 //                                                                                  ^^^^^^^^^^^^^ definition local 8
+//                                                                                                display_name movementFlags
 //                                                                                                documentation ```java\nint movementFlags\n```
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller.
@@ -275,22 +304,26 @@ private DragBuilder3(EpoxyController controller, RecyclerView recyclerView, int
      */
     public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelClass) {
 //          ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
+//            display_name U
 //            documentation ```java\nU extends EpoxyModel\n```
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
 //                                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().
+//                                                           display_name withTarget
 //                                                           documentation ```java\npublic <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelClass)\n```
 //                                                           documentation  Set the type of Epoxy model that is draggable. This approach works well if you only have one\n draggable type.\n
 //                                                           ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                 ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
 //                                                                    ^^^^^^^^^^^^^^^^ definition local 9
+//                                                                                     display_name targetModelClass
 //                                                                                     documentation ```java\nClass<U> targetModelClass\n```
       List<Class<? extends EpoxyModel>> targetClasses = new ArrayList<>(1);
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^^^^ definition local 10
+//                                                    display_name targetClasses
 //                                                    documentation ```java\nList<Class<? extends EpoxyModel>> targetClasses\n```
 //                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
       targetClasses.add(targetModelClass);
@@ -318,11 +351,13 @@ public DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>... targe
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTargets().
+//                                              display_name withTargets
 //                                              documentation ```java\npublic DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)\n```
 //                                              documentation  Specify which Epoxy model types are draggable. Use this if you have more than one type that\n is draggable.\n <p>\n If you only have one draggable type you should use {@link #withTarget(Class)}\n
 //                                              ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                             ^^^^^^^^^^^^^^^^^^ definition local 11
+//                                                                                                display_name targetModelClasses
 //                                                                                                documentation ```java\nClass<? extends EpoxyModel>[] targetModelClasses\n```
       return new DragBuilder4<>(controller, recyclerView, movementFlags, EpoxyModel.class,
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
@@ -347,6 +382,7 @@ public DragBuilder4<EpoxyModel> forAllModels() {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#forAllModels().
+//                                               display_name forAllModels
 //                                               documentation ```java\npublic DragBuilder4<EpoxyModel> forAllModels()\n```
 //                                               documentation  Use this if all models in the controller should be draggable, and if there are multiple types\n of models in the controller.\n <p>\n If you only have one model type you should use {@link #withTarget(Class)}\n
       return withTarget(EpoxyModel.class);
@@ -358,55 +394,68 @@ public DragBuilder4<EpoxyModel> forAllModels() {
 
   public static class DragBuilder4<U extends EpoxyModel> {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
+//                                 display_name DragBuilder4
 //                                 documentation ```java\npublic static class DragBuilder4<U extends EpoxyModel>\n```
 //                                 ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
+//                                   display_name U
 //                                   documentation ```java\nU extends EpoxyModel\n```
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#controller.
+//                                           display_name controller
 //                                           documentation ```java\nprivate final EpoxyController controller\n```
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#recyclerView.
+//                                          display_name recyclerView
 //                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#movementFlags.
+//                                  display_name movementFlags
 //                                  documentation ```java\nprivate final int movementFlags\n```
     private final Class<U> targetModelClass;
 //                ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClass.
+//                                          display_name targetModelClass
 //                                          documentation ```java\nprivate final Class<U> targetModelClass\n```
     private final List<Class<? extends EpoxyModel>> targetModelClasses;
 //                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClasses.
+//                                                                     display_name targetModelClasses
 //                                                                     documentation ```java\nprivate final List<Class<? extends EpoxyModel>> targetModelClasses\n```
 
     private DragBuilder4(EpoxyController controller,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\nprivate DragBuilder4(EpoxyController controller, unresolved_type recyclerView, int movementFlags, Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses)\n```
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 12
+//                                                  display_name controller
 //                                                  documentation ```java\nEpoxyController controller\n```
         RecyclerView recyclerView, int movementFlags,
 //      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                   ^^^^^^^^^^^^ definition local 13
+//                                display_name recyclerView
 //                                documentation ```java\nunresolved_type recyclerView\n```
 //                                     ^^^^^^^^^^^^^ definition local 14
+//                                                   display_name movementFlags
 //                                                   documentation ```java\nint movementFlags\n```
         Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //               ^^^^^^^^^^^^^^^^ definition local 15
+//                                display_name targetModelClass
 //                                documentation ```java\nClass<U> targetModelClass\n```
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                   ^^^^^^^^^^^^^^^^^^ definition local 16
+//                                                                                      display_name targetModelClasses
 //                                                                                      documentation ```java\nList<Class<? extends EpoxyModel>> targetModelClasses\n```
 
       this.controller = controller;
@@ -443,15 +492,18 @@ private DragBuilder4(EpoxyController controller,
     public ItemTouchHelper andCallbacks(final DragCallbacks<U> callbacks) {
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                         ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#andCallbacks().
+//                                      display_name andCallbacks
 //                                      documentation ```java\npublic unresolved_type andCallbacks(DragCallbacks<U> callbacks)\n```
 //                                      documentation  Set callbacks to handle drag actions and lifecycle events.\n <p>\n You MUST implement {@link DragCallbacks#onModelMoved(int, int, EpoxyModel,\n View)} to update your data to reflect an item move.\n <p>\n You can optionally implement the other callbacks to modify the view being dragged. This is\n useful if you want to change things like the view background, size, color, etc\n\n @return An {@link ItemTouchHelper} instance that has been initialized and attached to a\n recyclerview. The touch helper has already been fully set up and can be ignored, but you may\n want to hold a reference to it if you need to later detach the recyclerview to disable touch\n events via setting null on {@link ItemTouchHelper#attachToRecyclerView(RecyclerView)}\n
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#
 //                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                             ^^^^^^^^^ definition local 17
+//                                                                       display_name callbacks
 //                                                                       documentation ```java\nfinal DragCallbacks<U> callbacks\n```
       ItemTouchHelper itemTouchHelper =
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                    ^^^^^^^^^^^^^^^ definition local 18
+//                                    display_name itemTouchHelper
 //                                    documentation ```java\nunresolved_type itemTouchHelper\n```
           new ItemTouchHelper(new EpoxyModelTouchCallback<U>(controller, targetModelClass) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
@@ -463,12 +515,15 @@ public ItemTouchHelper andCallbacks(final DragCallbacks<U> callbacks) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public int getMovementFlagsForModel(U model, int adapterPosition) {
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 23
+//                                              display_name getMovementFlagsForModel
 //                                              documentation ```java\n@Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)\n```
 //                                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                ^^^^^ definition local 24
+//                                                      display_name model
 //                                                      documentation ```java\nU model\n```
 //                                                           ^^^^^^^^^^^^^^^ definition local 25
+//                                                                           display_name adapterPosition
 //                                                                           documentation ```java\nint adapterPosition\n```
               return movementFlags;
 //                   ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#movementFlags.
@@ -478,13 +533,16 @@ public int getMovementFlagsForModel(U model, int adapterPosition) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                            ^^^^^^^^^^^^^^^^ definition local 26
+//                                             display_name isTouchableModel
 //                                             documentation ```java\n@Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)\n```
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 27
+//                                                                 display_name model
 //                                                                 documentation ```java\nEpoxyModel<?> model\n```
               boolean isTargetType = targetModelClasses.size() == 1
 //                    ^^^^^^^^^^^^ definition local 28
+//                                 display_name isTargetType
 //                                 documentation ```java\nboolean isTargetType\n```
 //                                   ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClasses.
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -511,16 +569,20 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void onDragStarted(U model, View itemView, int adapterPosition) {
 //                      ^^^^^^^^^^^^^ definition local 30
+//                                    display_name onDragStarted
 //                                    documentation ```java\n@Override\npublic void onDragStarted(U model, unresolved_type itemView, int adapterPosition)\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                      ^^^^^ definition local 31
+//                                            display_name model
 //                                            documentation ```java\nU model\n```
 //                                             ^^^^ reference semanticdb maven . . View#
 //                                                  ^^^^^^^^ definition local 32
+//                                                           display_name itemView
 //                                                           documentation ```java\nunresolved_type itemView\n```
 //                                                                ^^^^^^^^^^^^^^^ definition local 33
+//                                                                                display_name adapterPosition
 //                                                                                documentation ```java\nint adapterPosition\n```
               callbacks.onDragStarted(model, itemView, adapterPosition);
 //            ^^^^^^^^^ reference local 17
@@ -534,14 +596,17 @@ public void onDragStarted(U model, View itemView, int adapterPosition) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void onDragReleased(U model, View itemView) {
 //                      ^^^^^^^^^^^^^^ definition local 34
+//                                     display_name onDragReleased
 //                                     documentation ```java\n@Override\npublic void onDragReleased(U model, unresolved_type itemView)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                       ^^^^^ definition local 35
+//                                             display_name model
 //                                             documentation ```java\nU model\n```
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 36
+//                                                            display_name itemView
 //                                                            documentation ```java\nunresolved_type itemView\n```
               callbacks.onDragReleased(model, itemView);
 //            ^^^^^^^^^ reference local 17
@@ -554,19 +619,24 @@ public void onDragReleased(U model, View itemView) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved,
 //                      ^^^^^^^^^^^^ definition local 37
+//                                   display_name onModelMoved
 //                                   documentation ```java\n@Override\npublic void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, unresolved_type itemView)\n```
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                                       ^^^^^^^^^^^^ definition local 38
+//                                                    display_name fromPosition
 //                                                    documentation ```java\nint fromPosition\n```
 //                                                         ^^^^^^^^^^ definition local 39
+//                                                                    display_name toPosition
 //                                                                    documentation ```java\nint toPosition\n```
 //                                                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                                       ^^^^^^^^^^^^^^^ definition local 40
+//                                                                                       display_name modelBeingMoved
 //                                                                                       documentation ```java\nU modelBeingMoved\n```
                 View itemView) {
 //              ^^^^ reference semanticdb maven . . View#
 //                   ^^^^^^^^ definition local 41
+//                            display_name itemView
 //                            documentation ```java\nunresolved_type itemView\n```
               callbacks.onModelMoved(fromPosition, toPosition, modelBeingMoved, itemView);
 //            ^^^^^^^^^ reference local 17
@@ -581,6 +651,7 @@ public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved,
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void clearView(U model, View itemView) {
 //                      ^^^^^^^^^ definition local 42
+//                                display_name clearView
 //                                documentation ```java\n@Override\npublic void clearView(U model, unresolved_type itemView)\n```
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
@@ -589,9 +660,11 @@ public void clearView(U model, View itemView) {
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                                ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                  ^^^^^ definition local 43
+//                                        display_name model
 //                                        documentation ```java\nU model\n```
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^^^^^ definition local 44
+//                                                       display_name itemView
 //                                                       documentation ```java\nunresolved_type itemView\n```
               callbacks.clearView(model, itemView);
 //            ^^^^^^^^^ reference local 17
@@ -613,12 +686,15 @@ public void clearView(U model, View itemView) {
 
   public abstract static class DragCallbacks<T extends EpoxyModel>
 //                             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#
+//                                           display_name DragCallbacks
 //                                           documentation ```java\npublic abstract static class DragCallbacks<T extends EpoxyModel>\n```
 //                                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
 //                             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#`<init>`().
+//                                           display_name <init>
 //                                           documentation ```java\npublic DragCallbacks()\n```
 //                                           ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
+//                                             display_name T
 //                                             documentation ```java\nT extends EpoxyModel\n```
 //                                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
       implements EpoxyDragCallback<T> {
@@ -629,15 +705,19 @@ public abstract static class DragCallbacks<T extends EpoxyModel>
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onDragStarted(T model, View itemView, int adapterPosition) {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
+//                            display_name onDragStarted
 //                            documentation ```java\n@Override\npublic void onDragStarted(T model, unresolved_type itemView, int adapterPosition)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                              ^^^^^ definition local 45
+//                                    display_name model
 //                                    documentation ```java\nT model\n```
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 46
+//                                                   display_name itemView
 //                                                   documentation ```java\nunresolved_type itemView\n```
 //                                                        ^^^^^^^^^^^^^^^ definition local 47
+//                                                                        display_name adapterPosition
 //                                                                        documentation ```java\nint adapterPosition\n```
 
     }
@@ -646,13 +726,16 @@ public void onDragStarted(T model, View itemView, int adapterPosition) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onDragReleased(T model, View itemView) {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
+//                             display_name onDragReleased
 //                             documentation ```java\n@Override\npublic void onDragReleased(T model, unresolved_type itemView)\n```
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                               ^^^^^ definition local 48
+//                                     display_name model
 //                                     documentation ```java\nT model\n```
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 49
+//                                                    display_name itemView
 //                                                    documentation ```java\nunresolved_type itemView\n```
 
     }
@@ -661,31 +744,39 @@ public void onDragReleased(T model, View itemView) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved,
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
+//                                    display_name onModelMoved
 //                                    documentation ```java\n@Override\npublic abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                        ^^^^^^^^^^^^ definition local 50
+//                                                     display_name fromPosition
 //                                                     documentation ```java\nint fromPosition\n```
 //                                                          ^^^^^^^^^^ definition local 51
+//                                                                     display_name toPosition
 //                                                                     documentation ```java\nint toPosition\n```
 //                                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                                                        ^^^^^^^^^^^^^^^ definition local 52
+//                                                                                        display_name modelBeingMoved
 //                                                                                        documentation ```java\nT modelBeingMoved\n```
         View itemView);
 //      ^^^^ reference semanticdb maven . . View#
 //           ^^^^^^^^ definition local 53
+//                    display_name itemView
 //                    documentation ```java\nunresolved_type itemView\n```
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void clearView(T model, View itemView) {
 //              ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView().
+//                        display_name clearView
 //                        documentation ```java\n@Override\npublic void clearView(T model, unresolved_type itemView)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                          ^^^^^ definition local 54
+//                                display_name model
 //                                documentation ```java\nT model\n```
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^^^^^ definition local 55
+//                                               display_name itemView
 //                                               documentation ```java\nunresolved_type itemView\n```
 
     }
@@ -697,10 +788,12 @@ public void clearView(T model, View itemView) {
      */
     public boolean isDragEnabledForModel(T model) {
 //                 ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#isDragEnabledForModel().
+//                                       display_name isDragEnabledForModel
 //                                       documentation ```java\npublic boolean isDragEnabledForModel(T model)\n```
 //                                       documentation  Whether the given model should be draggable.\n <p>\n True by default. You may override this to toggle draggability for a model.\n
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                         ^^^^^ definition local 56
+//                                               display_name model
 //                                               documentation ```java\nT model\n```
       return true;
     }
@@ -709,12 +802,15 @@ public boolean isDragEnabledForModel(T model) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel().
+//                                            display_name getMovementFlagsForModel
 //                                            documentation ```java\n@Override\npublic final int getMovementFlagsForModel(T model, int adapterPosition)\n```
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                              ^^^^^ definition local 57
+//                                                    display_name model
 //                                                    documentation ```java\nT model\n```
 //                                                         ^^^^^^^^^^^^^^^ definition local 58
+//                                                                         display_name adapterPosition
 //                                                                         documentation ```java\nint adapterPosition\n```
       // No-Op this is not used
       return 0;
@@ -725,15 +821,18 @@ public final int getMovementFlagsForModel(T model, int adapterPosition) {
    * The entry point for setting up swipe support for a RecyclerView. The RecyclerView must be set
    * with an Epoxy adapter or controller.
 //                            ^^^^^^^^^^ definition local 19
+//                                       display_name controller
 //                                       documentation ```java\nEpoxyController controller\n```
    */
   public static SwipeBuilder initSwiping(RecyclerView recyclerView) {
 //              ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#initSwiping().
+//                                       display_name initSwiping
 //                                       documentation ```java\npublic static SwipeBuilder initSwiping(unresolved_type recyclerView)\n```
 //                                       documentation  The entry point for setting up swipe support for a RecyclerView. The RecyclerView must be set\n with an Epoxy adapter or controller.\n
 //                                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                    ^^^^^^^^^^^^ definition local 59
+//                                                                 display_name recyclerView
 //                                                                 documentation ```java\nunresolved_type recyclerView\n```
     return new SwipeBuilder(recyclerView);
 //             ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#`<init>`().
@@ -742,18 +841,22 @@ public static SwipeBuilder initSwiping(RecyclerView recyclerView) {
 
   public static class SwipeBuilder {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#
+//                                 display_name SwipeBuilder
 //                                 documentation ```java\npublic static class SwipeBuilder\n```
 
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView.
+//                                          display_name recyclerView
 //                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
 
     private SwipeBuilder(RecyclerView recyclerView) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\nprivate SwipeBuilder(unresolved_type recyclerView)\n```
 //                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                    ^^^^^^^^^^^^ definition local 60
+//                                                 display_name recyclerView
 //                                                 documentation ```java\nunresolved_type recyclerView\n```
       this.recyclerView = recyclerView;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView.
@@ -764,6 +867,7 @@ private SwipeBuilder(RecyclerView recyclerView) {
     public SwipeBuilder2 right() {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                       ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#right().
+//                             display_name right
 //                             documentation ```java\npublic SwipeBuilder2 right()\n```
 //                             documentation Enable swiping right. 
       return withDirections(ItemTouchHelper.RIGHT);
@@ -776,6 +880,7 @@ public SwipeBuilder2 right() {
     public SwipeBuilder2 left() {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#left().
+//                            display_name left
 //                            documentation ```java\npublic SwipeBuilder2 left()\n```
 //                            documentation Enable swiping left. 
       return withDirections(ItemTouchHelper.LEFT);
@@ -788,6 +893,7 @@ public SwipeBuilder2 left() {
     public SwipeBuilder2 leftAndRight() {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#leftAndRight().
+//                                    display_name leftAndRight
 //                                    documentation ```java\npublic SwipeBuilder2 leftAndRight()\n```
 //                                    documentation Enable swiping horizontally, left and right. 
       return withDirections(ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
@@ -810,9 +916,11 @@ public SwipeBuilder2 leftAndRight() {
     public SwipeBuilder2 withDirections(int directionFlags) {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                       ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
+//                                      display_name withDirections
 //                                      documentation ```java\npublic SwipeBuilder2 withDirections(int directionFlags)\n```
 //                                      documentation  Set custom movement flags to dictate which swipe directions should be allowed.\n <p>\n Can be any of {@link ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN}, {@link ItemTouchHelper#START}, {@link\n ItemTouchHelper#END}\n <p>\n Flags can be OR'd together to allow multiple directions.\n
 //                                          ^^^^^^^^^^^^^^ definition local 61
+//                                                         display_name directionFlags
 //                                                         documentation ```java\nint directionFlags\n```
       return new SwipeBuilder2(recyclerView, makeMovementFlags(0, directionFlags));
 //               ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#`<init>`().
@@ -824,24 +932,30 @@ public SwipeBuilder2 withDirections(int directionFlags) {
 
   public static class SwipeBuilder2 {
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
+//                                  display_name SwipeBuilder2
 //                                  documentation ```java\npublic static class SwipeBuilder2\n```
 
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView.
+//                                          display_name recyclerView
 //                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#movementFlags.
+//                                  display_name movementFlags
 //                                  documentation ```java\nprivate final int movementFlags\n```
 
     private SwipeBuilder2(RecyclerView recyclerView,
 //          ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#`<init>`().
+//                        display_name <init>
 //                        documentation ```java\nprivate SwipeBuilder2(unresolved_type recyclerView, int movementFlags)\n```
 //                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                     ^^^^^^^^^^^^ definition local 62
+//                                                  display_name recyclerView
 //                                                  documentation ```java\nunresolved_type recyclerView\n```
         int movementFlags) {
 //          ^^^^^^^^^^^^^ definition local 63
+//                        display_name movementFlags
 //                        documentation ```java\nint movementFlags\n```
       this.recyclerView = recyclerView;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView.
@@ -857,24 +971,29 @@ private SwipeBuilder2(RecyclerView recyclerView,
      */
     public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelClass) {
 //          ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
+//            display_name U
 //            documentation ```java\nU extends EpoxyModel\n```
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
 //                                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().
+//                                                            display_name withTarget
 //                                                            documentation ```java\npublic <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelClass)\n```
 //                                                            documentation  Set the type of Epoxy model that is swipable. Use this if you only have one\n swipable type.\n
 //                                                            ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
 //                                                                     ^^^^^^^^^^^^^^^^ definition local 22
+//                                                                                      display_name targetModelClass
 //                                                                                      documentation ```java\nClass<U> targetModelClass\n```
 //                                                                     ^^^^^^^^^^^^^^^^ definition local 64
+//                                                                                      display_name targetModelClass
 //                                                                                      documentation ```java\nClass<U> targetModelClass\n```
       List<Class<? extends EpoxyModel>> targetClasses = new ArrayList<>(1);
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^^^^ definition local 65
+//                                                    display_name targetClasses
 //                                                    documentation ```java\nList<Class<? extends EpoxyModel>> targetClasses\n```
 //                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
       targetClasses.add(targetModelClass);
@@ -901,12 +1020,14 @@ public SwipeBuilder3<EpoxyModel> withTargets(
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTargets().
+//                                               display_name withTargets
 //                                               documentation ```java\npublic SwipeBuilder3<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)\n```
 //                                               documentation  Specify which Epoxy model types are swipable. Use this if you have more than one type that\n is swipable.\n <p>\n If you only have one swipable type you should use {@link #withTarget(Class)}\n
         Class<? extends EpoxyModel>... targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^^^^^^^^^^^^^^ definition local 66
+//                                                        display_name targetModelClasses
 //                                                        documentation ```java\nClass<? extends EpoxyModel>[] targetModelClasses\n```
       return new SwipeBuilder3<>(recyclerView, movementFlags, EpoxyModel.class,
 //               ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
@@ -930,6 +1051,7 @@ public SwipeBuilder3<EpoxyModel> forAllModels() {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#forAllModels().
+//                                                display_name forAllModels
 //                                                documentation ```java\npublic SwipeBuilder3<EpoxyModel> forAllModels()\n```
 //                                                documentation  Use this if all models in the controller should be swipable, and if there are multiple types\n of models in the controller.\n <p>\n If you only have one model type you should use {@link #withTarget(Class)}\n
       return withTarget(EpoxyModel.class);
@@ -941,48 +1063,59 @@ public SwipeBuilder3<EpoxyModel> forAllModels() {
 
   public static class SwipeBuilder3<U extends EpoxyModel> {
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
+//                                  display_name SwipeBuilder3
 //                                  documentation ```java\npublic static class SwipeBuilder3<U extends EpoxyModel>\n```
 //                                  ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
+//                                    display_name U
 //                                    documentation ```java\nU extends EpoxyModel\n```
 //                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#recyclerView.
+//                                          display_name recyclerView
 //                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#movementFlags.
+//                                  display_name movementFlags
 //                                  documentation ```java\nprivate final int movementFlags\n```
     private final Class<U> targetModelClass;
 //                ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClass.
+//                                          display_name targetModelClass
 //                                          documentation ```java\nprivate final Class<U> targetModelClass\n```
     private final List<Class<? extends EpoxyModel>> targetModelClasses;
 //                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClasses.
+//                                                                     display_name targetModelClasses
 //                                                                     documentation ```java\nprivate final List<Class<? extends EpoxyModel>> targetModelClasses\n```
 
     private SwipeBuilder3(
 //          ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
+//                        display_name <init>
 //                        documentation ```java\nprivate SwipeBuilder3(unresolved_type recyclerView, int movementFlags, Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses)\n```
         RecyclerView recyclerView, int movementFlags,
 //      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                   ^^^^^^^^^^^^ definition local 67
+//                                display_name recyclerView
 //                                documentation ```java\nunresolved_type recyclerView\n```
 //                                     ^^^^^^^^^^^^^ definition local 68
+//                                                   display_name movementFlags
 //                                                   documentation ```java\nint movementFlags\n```
         Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //               ^^^^^^^^^^^^^^^^ definition local 69
+//                                display_name targetModelClass
 //                                documentation ```java\nClass<U> targetModelClass\n```
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                   ^^^^^^^^^^^^^^^^^^ definition local 70
+//                                                                                      display_name targetModelClasses
 //                                                                                      documentation ```java\nList<Class<? extends EpoxyModel>> targetModelClasses\n```
 
       this.recyclerView = recyclerView;
@@ -1015,15 +1148,18 @@ private SwipeBuilder3(
     public ItemTouchHelper andCallbacks(final SwipeCallbacks<U> callbacks) {
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                         ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#andCallbacks().
+//                                      display_name andCallbacks
 //                                      documentation ```java\npublic unresolved_type andCallbacks(SwipeCallbacks<U> callbacks)\n```
 //                                      documentation  Set callbacks to handle swipe actions and lifecycle events.\n <p>\n You MUST implement {@link SwipeCallbacks#onSwipeCompleted(EpoxyModel, View, int, int)} to\n remove the swiped item from your data and request a model build.\n <p>\n You can optionally implement the other callbacks to modify the view as it is being swiped.\n\n @return An {@link ItemTouchHelper} instance that has been initialized and attached to a\n recyclerview. The touch helper has already been fully set up and can be ignored, but you may\n want to hold a reference to it if you need to later detach the recyclerview to disable touch\n events via setting null on {@link ItemTouchHelper#attachToRecyclerView(RecyclerView)}\n
 //                                            ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                                              ^^^^^^^^^ definition local 71
+//                                                                        display_name callbacks
 //                                                                        documentation ```java\nfinal SwipeCallbacks<U> callbacks\n```
       ItemTouchHelper itemTouchHelper =
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                    ^^^^^^^^^^^^^^^ definition local 72
+//                                    display_name itemTouchHelper
 //                                    documentation ```java\nunresolved_type itemTouchHelper\n```
           new ItemTouchHelper(new EpoxyModelTouchCallback<U>(null, targetModelClass) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
@@ -1034,12 +1170,15 @@ public ItemTouchHelper andCallbacks(final SwipeCallbacks<U> callbacks) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public int getMovementFlagsForModel(U model, int adapterPosition) {
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 77
+//                                              display_name getMovementFlagsForModel
 //                                              documentation ```java\n@Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)\n```
 //                                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                                ^^^^^ definition local 78
+//                                                      display_name model
 //                                                      documentation ```java\nU model\n```
 //                                                           ^^^^^^^^^^^^^^^ definition local 79
+//                                                                           display_name adapterPosition
 //                                                                           documentation ```java\nint adapterPosition\n```
               return movementFlags;
 //                   ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#movementFlags.
@@ -1049,13 +1188,16 @@ public int getMovementFlagsForModel(U model, int adapterPosition) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                            ^^^^^^^^^^^^^^^^ definition local 80
+//                                             display_name isTouchableModel
 //                                             documentation ```java\n@Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)\n```
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 81
+//                                                                 display_name model
 //                                                                 documentation ```java\nEpoxyModel<?> model\n```
               boolean isTargetType = targetModelClasses.size() == 1
 //                    ^^^^^^^^^^^^ definition local 82
+//                                 display_name isTargetType
 //                                 documentation ```java\nboolean isTargetType\n```
 //                                   ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClasses.
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -1082,16 +1224,20 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void onSwipeStarted(U model, View itemView, int adapterPosition) {
 //                      ^^^^^^^^^^^^^^ definition local 84
+//                                     display_name onSwipeStarted
 //                                     documentation ```java\n@Override\npublic void onSwipeStarted(U model, unresolved_type itemView, int adapterPosition)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                       ^^^^^ definition local 85
+//                                             display_name model
 //                                             documentation ```java\nU model\n```
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 86
+//                                                            display_name itemView
 //                                                            documentation ```java\nunresolved_type itemView\n```
 //                                                                 ^^^^^^^^^^^^^^^ definition local 87
+//                                                                                 display_name adapterPosition
 //                                                                                 documentation ```java\nint adapterPosition\n```
               callbacks.onSwipeStarted(model, itemView, adapterPosition);
 //            ^^^^^^^^^ reference local 71
@@ -1105,20 +1251,25 @@ public void onSwipeStarted(U model, View itemView, int adapterPosition) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void onSwipeProgressChanged(U model, View itemView, float swipeProgress,
 //                      ^^^^^^^^^^^^^^^^^^^^^^ definition local 88
+//                                             display_name onSwipeProgressChanged
 //                                             documentation ```java\n@Override\npublic void onSwipeProgressChanged(U model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)\n```
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                               ^^^^^ definition local 89
+//                                                     display_name model
 //                                                     documentation ```java\nU model\n```
 //                                                      ^^^^ reference semanticdb maven . . View#
 //                                                           ^^^^^^^^ definition local 90
+//                                                                    display_name itemView
 //                                                                    documentation ```java\nunresolved_type itemView\n```
 //                                                                           ^^^^^^^^^^^^^ definition local 91
+//                                                                                         display_name swipeProgress
 //                                                                                         documentation ```java\nfloat swipeProgress\n```
                 Canvas canvas) {
 //              ^^^^^^ reference semanticdb maven . . Canvas#
 //                     ^^^^^^ definition local 92
+//                            display_name canvas
 //                            documentation ```java\nunresolved_type canvas\n```
               callbacks.onSwipeProgressChanged(model, itemView, swipeProgress, canvas);
 //            ^^^^^^^^^ reference local 71
@@ -1133,18 +1284,23 @@ public void onSwipeProgressChanged(U model, View itemView, float swipeProgress,
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void onSwipeCompleted(U model, View itemView, int position, int direction) {
 //                      ^^^^^^^^^^^^^^^^ definition local 93
+//                                       display_name onSwipeCompleted
 //                                       documentation ```java\n@Override\npublic void onSwipeCompleted(U model, unresolved_type itemView, int position, int direction)\n```
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                         ^^^^^ definition local 94
+//                                               display_name model
 //                                               documentation ```java\nU model\n```
 //                                                ^^^^ reference semanticdb maven . . View#
 //                                                     ^^^^^^^^ definition local 95
+//                                                              display_name itemView
 //                                                              documentation ```java\nunresolved_type itemView\n```
 //                                                                   ^^^^^^^^ definition local 96
+//                                                                            display_name position
 //                                                                            documentation ```java\nint position\n```
 //                                                                                 ^^^^^^^^^ definition local 97
+//                                                                                           display_name direction
 //                                                                                           documentation ```java\nint direction\n```
               callbacks.onSwipeCompleted(model, itemView, position, direction);
 //            ^^^^^^^^^ reference local 71
@@ -1159,14 +1315,17 @@ public void onSwipeCompleted(U model, View itemView, int position, int direction
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void onSwipeReleased(U model, View itemView) {
 //                      ^^^^^^^^^^^^^^^ definition local 98
+//                                      display_name onSwipeReleased
 //                                      documentation ```java\n@Override\npublic void onSwipeReleased(U model, unresolved_type itemView)\n```
 //                                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                        ^^^^^ definition local 99
+//                                              display_name model
 //                                              documentation ```java\nU model\n```
 //                                               ^^^^ reference semanticdb maven . . View#
 //                                                    ^^^^^^^^ definition local 100
+//                                                             display_name itemView
 //                                                             documentation ```java\nunresolved_type itemView\n```
               callbacks.onSwipeReleased(model, itemView);
 //            ^^^^^^^^^ reference local 71
@@ -1179,6 +1338,7 @@ public void onSwipeReleased(U model, View itemView) {
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
             public void clearView(U model, View itemView) {
 //                      ^^^^^^^^^ definition local 101
+//                                display_name clearView
 //                                documentation ```java\n@Override\npublic void clearView(U model, unresolved_type itemView)\n```
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
@@ -1187,9 +1347,11 @@ public void clearView(U model, View itemView) {
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                                ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                  ^^^^^ definition local 102
+//                                        display_name model
 //                                        documentation ```java\nU model\n```
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^^^^^ definition local 103
+//                                                       display_name itemView
 //                                                       documentation ```java\nunresolved_type itemView\n```
               callbacks.clearView(model, itemView);
 //            ^^^^^^^^^ reference local 71
@@ -1211,12 +1373,15 @@ public void clearView(U model, View itemView) {
 
   public abstract static class SwipeCallbacks<T extends EpoxyModel>
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#
+//                                            display_name SwipeCallbacks
 //                                            documentation ```java\npublic abstract static class SwipeCallbacks<T extends EpoxyModel>\n```
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#`<init>`().
+//                                            display_name <init>
 //                                            documentation ```java\npublic SwipeCallbacks()\n```
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
+//                                              display_name T
 //                                              documentation ```java\nT extends EpoxyModel\n```
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
       implements EpoxySwipeCallback<T> {
@@ -1227,15 +1392,19 @@ public abstract static class SwipeCallbacks<T extends EpoxyModel>
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
+//                             display_name onSwipeStarted
 //                             documentation ```java\n@Override\npublic void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)\n```
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                               ^^^^^ definition local 104
+//                                     display_name model
 //                                     documentation ```java\nT model\n```
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 105
+//                                                    display_name itemView
 //                                                    documentation ```java\nunresolved_type itemView\n```
 //                                                         ^^^^^^^^^^^^^^^ definition local 106
+//                                                                         display_name adapterPosition
 //                                                                         documentation ```java\nint adapterPosition\n```
 
     }
@@ -1244,19 +1413,24 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
+//                                     display_name onSwipeProgressChanged
 //                                     documentation ```java\n@Override\npublic void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                       ^^^^^ definition local 107
+//                                             display_name model
 //                                             documentation ```java\nT model\n```
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 108
+//                                                            display_name itemView
 //                                                            documentation ```java\nunresolved_type itemView\n```
 //                                                                   ^^^^^^^^^^^^^ definition local 109
+//                                                                                 display_name swipeProgress
 //                                                                                 documentation ```java\nfloat swipeProgress\n```
         Canvas canvas) {
 //      ^^^^^^ reference semanticdb maven . . Canvas#
 //             ^^^^^^ definition local 110
+//                    display_name canvas
 //                    documentation ```java\nunresolved_type canvas\n```
 
     }
@@ -1265,30 +1439,38 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public abstract void onSwipeCompleted(T model, View itemView, int position, int direction);
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
+//                                        display_name onSwipeCompleted
 //                                        documentation ```java\n@Override\npublic abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)\n```
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                          ^^^^^ definition local 111
+//                                                display_name model
 //                                                documentation ```java\nT model\n```
 //                                                 ^^^^ reference semanticdb maven . . View#
 //                                                      ^^^^^^^^ definition local 112
+//                                                               display_name itemView
 //                                                               documentation ```java\nunresolved_type itemView\n```
 //                                                                    ^^^^^^^^ definition local 113
+//                                                                             display_name position
 //                                                                             documentation ```java\nint position\n```
 //                                                                                  ^^^^^^^^^ definition local 114
+//                                                                                            display_name direction
 //                                                                                            documentation ```java\nint direction\n```
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onSwipeReleased(T model, View itemView) {
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
+//                              display_name onSwipeReleased
 //                              documentation ```java\n@Override\npublic void onSwipeReleased(T model, unresolved_type itemView)\n```
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                ^^^^^ definition local 115
+//                                      display_name model
 //                                      documentation ```java\nT model\n```
 //                                       ^^^^ reference semanticdb maven . . View#
 //                                            ^^^^^^^^ definition local 116
+//                                                     display_name itemView
 //                                                     documentation ```java\nunresolved_type itemView\n```
 
     }
@@ -1297,13 +1479,16 @@ public void onSwipeReleased(T model, View itemView) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void clearView(T model, View itemView) {
 //              ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView().
+//                        display_name clearView
 //                        documentation ```java\n@Override\npublic void clearView(T model, unresolved_type itemView)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                          ^^^^^ definition local 117
+//                                display_name model
 //                                documentation ```java\nT model\n```
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^^^^^ definition local 118
+//                                               display_name itemView
 //                                               documentation ```java\nunresolved_type itemView\n```
 
     }
@@ -1315,10 +1500,12 @@ public void clearView(T model, View itemView) {
      */
     public boolean isSwipeEnabledForModel(T model) {
 //                 ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#isSwipeEnabledForModel().
+//                                        display_name isSwipeEnabledForModel
 //                                        documentation ```java\npublic boolean isSwipeEnabledForModel(T model)\n```
 //                                        documentation  Whether the given model should be swipable.\n <p>\n True by default. You may override this to toggle swipabaility for a model.\n
 //                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                          ^^^^^ definition local 119
+//                                                display_name model
 //                                                documentation ```java\nT model\n```
       return true;
     }
@@ -1327,12 +1514,15 @@ public boolean isSwipeEnabledForModel(T model) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel().
+//                                            display_name getMovementFlagsForModel
 //                                            documentation ```java\n@Override\npublic final int getMovementFlagsForModel(T model, int adapterPosition)\n```
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                              ^^^^^ definition local 120
+//                                                    display_name model
 //                                                    documentation ```java\nT model\n```
 //                                                         ^^^^^^^^^^^^^^^ definition local 121
+//                                                                         display_name adapterPosition
 //                                                                         documentation ```java\nint adapterPosition\n```
       // Not used
       return 0;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
index b4fda9700..f6f1dc692 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
@@ -33,10 +33,12 @@
  */
 public abstract class EpoxyTouchHelperCallback extends ItemTouchHelper.Callback {
 //                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#
+//                                             display_name EpoxyTouchHelperCallback
 //                                             documentation ```java\npublic abstract class EpoxyTouchHelperCallback\n```
 //                                             documentation  A wrapper around {@link androidx.recyclerview.widget.ItemTouchHelper.Callback} to cast all\n view holders to {@link com.airbnb.epoxy.EpoxyViewHolder} for simpler use with Epoxy.\n
 //                                             relationship is_implementation semanticdb maven . . ItemTouchHelper/Callback#
 //                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#`<init>`().
+//                                             display_name <init>
 //                                             documentation ```java\npublic EpoxyTouchHelperCallback()\n```
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper/
 //                                                                     ^^^^^^^^ reference semanticdb maven . . ItemTouchHelper/Callback#
@@ -45,13 +47,16 @@ public abstract class EpoxyTouchHelperCallback extends ItemTouchHelper.Callback
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHolder) {
 //                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
+//                                  display_name getMovementFlags
 //                                  documentation ```java\n@Override\npublic final int getMovementFlags(unresolved_type recyclerView, unresolved_type viewHolder)\n```
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                               ^^^^^^^^^^^^ definition local 0
+//                                                            display_name recyclerView
 //                                                            documentation ```java\nunresolved_type recyclerView\n```
 //                                                             ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                        ^^^^^^^^^^ definition local 1
+//                                                                                   display_name viewHolder
 //                                                                                   documentation ```java\nunresolved_type viewHolder\n```
     return getMovementFlags(recyclerView, (EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
@@ -65,30 +70,37 @@ public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHold
    */
   protected abstract int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHolder);
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(+1).
+//                                        display_name getMovementFlags
 //                                        documentation ```java\nprotected abstract int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder)\n```
 //                                        documentation  @see #getMovementFlags(RecyclerView, ViewHolder)\n
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                     ^^^^^^^^^^^^ definition local 2
+//                                                                  display_name recyclerView
 //                                                                  documentation ```java\nunresolved_type recyclerView\n```
 //                                                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                   ^^^^^^^^^^ definition local 3
+//                                                                                              display_name viewHolder
 //                                                                                              documentation ```java\nEpoxyViewHolder viewHolder\n```
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder, ViewHolder target) {
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
+//                            display_name onMove
 //                            documentation ```java\n@Override\npublic final boolean onMove(unresolved_type recyclerView, unresolved_type viewHolder, unresolved_type target)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                         ^^^^^^^^^^^^ definition local 4
+//                                                      display_name recyclerView
 //                                                      documentation ```java\nunresolved_type recyclerView\n```
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 5
+//                                                                             display_name viewHolder
 //                                                                             documentation ```java\nunresolved_type viewHolder\n```
 //                                                                              ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                                         ^^^^^^ definition local 6
+//                                                                                                display_name target
 //                                                                                                documentation ```java\nunresolved_type target\n```
     return onMove(recyclerView, (EpoxyViewHolder) viewHolder, (EpoxyViewHolder) target);
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
@@ -104,30 +116,37 @@ public final boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder, Vi
    */
   protected abstract boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                           ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
+//                                  display_name onMove
 //                                  documentation ```java\nprotected abstract boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target)\n```
 //                                  documentation  @see #onMove(RecyclerView, ViewHolder, ViewHolder)\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                               ^^^^^^^^^^^^ definition local 7
+//                                                            display_name recyclerView
 //                                                            documentation ```java\nunresolved_type recyclerView\n```
 //                                                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                             ^^^^^^^^^^ definition local 8
+//                                                                                        display_name viewHolder
 //                                                                                        documentation ```java\nEpoxyViewHolder viewHolder\n```
       EpoxyViewHolder target);
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 9
+//                           display_name target
 //                           documentation ```java\nEpoxyViewHolder target\n```
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void onSwiped(ViewHolder viewHolder, int direction) {
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
+//                           display_name onSwiped
 //                           documentation ```java\n@Override\npublic final void onSwiped(unresolved_type viewHolder, int direction)\n```
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //                           ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                      ^^^^^^^^^^ definition local 10
+//                                                 display_name viewHolder
 //                                                 documentation ```java\nunresolved_type viewHolder\n```
 //                                                      ^^^^^^^^^ definition local 11
+//                                                                display_name direction
 //                                                                documentation ```java\nint direction\n```
     onSwiped((EpoxyViewHolder) viewHolder, direction);
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
@@ -141,29 +160,36 @@ public final void onSwiped(ViewHolder viewHolder, int direction) {
    */
   protected abstract void onSwiped(EpoxyViewHolder viewHolder, int direction);
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped(+-1).
+//                                 display_name onSwiped
 //                                 documentation ```java\nprotected abstract void onSwiped(EpoxyViewHolder viewHolder, int direction)\n```
 //                                 documentation  @see #onSwiped(ViewHolder, int)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 12
+//                                                            display_name viewHolder
 //                                                            documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                 ^^^^^^^^^ definition local 13
+//                                                                           display_name direction
 //                                                                           documentation ```java\nint direction\n```
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final boolean canDropOver(RecyclerView recyclerView, ViewHolder current,
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
+//                                 display_name canDropOver
 //                                 documentation ```java\n@Override\npublic final boolean canDropOver(unresolved_type recyclerView, unresolved_type current, unresolved_type target)\n```
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                                 ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                              ^^^^^^^^^^^^ definition local 14
+//                                                           display_name recyclerView
 //                                                           documentation ```java\nunresolved_type recyclerView\n```
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                       ^^^^^^^ definition local 15
+//                                                                               display_name current
 //                                                                               documentation ```java\nunresolved_type current\n```
       ViewHolder target) {
 //    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //               ^^^^^^ definition local 16
+//                      display_name target
 //                      documentation ```java\nunresolved_type target\n```
     return canDropOver(recyclerView, (EpoxyViewHolder) current, (EpoxyViewHolder) target);
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
@@ -179,18 +205,22 @@ public final boolean canDropOver(RecyclerView recyclerView, ViewHolder current,
    */
   protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current,
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
+//                              display_name canDropOver
 //                              documentation ```java\nprotected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target)\n```
 //                              documentation  @see #canDropOver(RecyclerView, ViewHolder, ViewHolder)\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                           ^^^^^^^^^^^^ definition local 17
+//                                                        display_name recyclerView
 //                                                        documentation ```java\nunresolved_type recyclerView\n```
 //                                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                         ^^^^^^^ definition local 18
+//                                                                                 display_name current
 //                                                                                 documentation ```java\nEpoxyViewHolder current\n```
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 19
+//                           display_name target
 //                           documentation ```java\nEpoxyViewHolder target\n```
     return super.canDropOver(recyclerView, current, target);
 //         ^^^^^ reference semanticdb maven . . super#
@@ -204,9 +234,11 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final float getSwipeThreshold(ViewHolder viewHolder) {
 //                   ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold().
+//                                     display_name getSwipeThreshold
 //                                     documentation ```java\n@Override\npublic final float getSwipeThreshold(unresolved_type viewHolder)\n```
 //                                     ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                ^^^^^^^^^^ definition local 20
+//                                                           display_name viewHolder
 //                                                           documentation ```java\nunresolved_type viewHolder\n```
     return getSwipeThreshold((EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold().
@@ -219,10 +251,12 @@ public final float getSwipeThreshold(ViewHolder viewHolder) {
    */
   protected float getSwipeThreshold(EpoxyViewHolder viewHolder) {
 //                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold(+-1).
+//                                  display_name getSwipeThreshold
 //                                  documentation ```java\nprotected float getSwipeThreshold(EpoxyViewHolder viewHolder)\n```
 //                                  documentation  @see #getSwipeThreshold(ViewHolder)\n
 //                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                  ^^^^^^^^^^ definition local 21
+//                                                             display_name viewHolder
 //                                                             documentation ```java\nEpoxyViewHolder viewHolder\n```
     return super.getSwipeThreshold(viewHolder);
 //         ^^^^^ reference semanticdb maven . . super#
@@ -234,9 +268,11 @@ protected float getSwipeThreshold(EpoxyViewHolder viewHolder) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final float getMoveThreshold(ViewHolder viewHolder) {
 //                   ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold().
+//                                    display_name getMoveThreshold
 //                                    documentation ```java\n@Override\npublic final float getMoveThreshold(unresolved_type viewHolder)\n```
 //                                    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                               ^^^^^^^^^^ definition local 22
+//                                                          display_name viewHolder
 //                                                          documentation ```java\nunresolved_type viewHolder\n```
     return getMoveThreshold((EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold().
@@ -249,10 +285,12 @@ public final float getMoveThreshold(ViewHolder viewHolder) {
    */
   protected float getMoveThreshold(EpoxyViewHolder viewHolder) {
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold(+-1).
+//                                 display_name getMoveThreshold
 //                                 documentation ```java\nprotected float getMoveThreshold(EpoxyViewHolder viewHolder)\n```
 //                                 documentation  @see #getMoveThreshold(ViewHolder)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 23
+//                                                            display_name viewHolder
 //                                                            documentation ```java\nEpoxyViewHolder viewHolder\n```
     return super.getMoveThreshold(viewHolder);
 //         ^^^^^ reference semanticdb maven . . super#
@@ -265,17 +303,22 @@ protected float getMoveThreshold(EpoxyViewHolder viewHolder) {
   public final ViewHolder chooseDropTarget(ViewHolder selected, List dropTargets, int curX,
 //             ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                        ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget().
+//                                         display_name chooseDropTarget
 //                                         documentation ```java\n@Override\npublic final unresolved_type chooseDropTarget(unresolved_type selected, List dropTargets, int curX, int curY)\n```
 //                                         ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                    ^^^^^^^^ definition local 24
+//                                                             display_name selected
 //                                                             documentation ```java\nunresolved_type selected\n```
 //                                                              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                   ^^^^^^^^^^^ definition local 25
+//                                                                               display_name dropTargets
 //                                                                               documentation ```java\nList dropTargets\n```
 //                                                                                    ^^^^ definition local 26
+//                                                                                         display_name curX
 //                                                                                         documentation ```java\nint curX\n```
       int curY) {
 //        ^^^^ definition local 27
+//             display_name curY
 //             documentation ```java\nint curY\n```
     //noinspection unchecked
     return chooseDropTarget((EpoxyViewHolder) selected, (List<EpoxyViewHolder>) dropTargets, curX,
@@ -296,19 +339,24 @@ public final ViewHolder chooseDropTarget(ViewHolder selected, List dropTargets,
   protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected,
 //          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
+//                                           display_name chooseDropTarget
 //                                           documentation ```java\nprotected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected, List<EpoxyViewHolder> dropTargets, int curX, int curY)\n```
 //                                           documentation  @see #chooseDropTarget(ViewHolder, List, int, int)\n
 //                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                           ^^^^^^^^ definition local 28
+//                                                                    display_name selected
 //                                                                    documentation ```java\nEpoxyViewHolder selected\n```
       List<EpoxyViewHolder> dropTargets, int curX, int curY) {
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                          ^^^^^^^^^^^ definition local 29
+//                                      display_name dropTargets
 //                                      documentation ```java\nList<EpoxyViewHolder> dropTargets\n```
 //                                           ^^^^ definition local 30
+//                                                display_name curX
 //                                                documentation ```java\nint curX\n```
 //                                                     ^^^^ definition local 31
+//                                                          display_name curY
 //                                                          documentation ```java\nint curY\n```
 
     //noinspection unchecked
@@ -327,12 +375,15 @@ protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected,
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void onSelectedChanged(ViewHolder viewHolder, int actionState) {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
+//                                    display_name onSelectedChanged
 //                                    documentation ```java\n@Override\npublic final void onSelectedChanged(unresolved_type viewHolder, int actionState)\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
 //                                    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                               ^^^^^^^^^^ definition local 32
+//                                                          display_name viewHolder
 //                                                          documentation ```java\nunresolved_type viewHolder\n```
 //                                                               ^^^^^^^^^^^ definition local 33
+//                                                                           display_name actionState
 //                                                                           documentation ```java\nint actionState\n```
     onSelectedChanged((EpoxyViewHolder) viewHolder, actionState);
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
@@ -346,12 +397,15 @@ public final void onSelectedChanged(ViewHolder viewHolder, int actionState) {
    */
   protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged(+-1).
+//                                 display_name onSelectedChanged
 //                                 documentation ```java\nprotected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState)\n```
 //                                 documentation  @see #onSelectedChanged(ViewHolder, int)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 34
+//                                                            display_name viewHolder
 //                                                            documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                 ^^^^^^^^^^^ definition local 35
+//                                                                             display_name actionState
 //                                                                             documentation ```java\nint actionState\n```
     super.onSelectedChanged(viewHolder, actionState);
 //  ^^^^^ reference semanticdb maven . . super#
@@ -364,24 +418,32 @@ protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void onMoved(RecyclerView recyclerView, ViewHolder viewHolder, int fromPos,
 //                  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
+//                          display_name onMoved
 //                          documentation ```java\n@Override\npublic final void onMoved(unresolved_type recyclerView, unresolved_type viewHolder, int fromPos, unresolved_type target, int toPos, int x, int y)\n```
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                       ^^^^^^^^^^^^ definition local 36
+//                                                    display_name recyclerView
 //                                                    documentation ```java\nunresolved_type recyclerView\n```
 //                                                     ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                ^^^^^^^^^^ definition local 37
+//                                                                           display_name viewHolder
 //                                                                           documentation ```java\nunresolved_type viewHolder\n```
 //                                                                                ^^^^^^^ definition local 38
+//                                                                                        display_name fromPos
 //                                                                                        documentation ```java\nint fromPos\n```
       ViewHolder target, int toPos, int x, int y) {
 //    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //               ^^^^^^ definition local 39
+//                      display_name target
 //                      documentation ```java\nunresolved_type target\n```
 //                           ^^^^^ definition local 40
+//                                 display_name toPos
 //                                 documentation ```java\nint toPos\n```
 //                                      ^ definition local 41
+//                                        display_name x
 //                                        documentation ```java\nint x\n```
 //                                             ^ definition local 42
+//                                               display_name y
 //                                               documentation ```java\nint y\n```
 
     onMoved(recyclerView, (EpoxyViewHolder) viewHolder, fromPos, (EpoxyViewHolder) target, toPos, x,
@@ -403,25 +465,33 @@ public final void onMoved(RecyclerView recyclerView, ViewHolder viewHolder, int
    */
   protected void onMoved(RecyclerView recyclerView, EpoxyViewHolder viewHolder, int fromPos,
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
+//                       display_name onMoved
 //                       documentation ```java\nprotected void onMoved(unresolved_type recyclerView, EpoxyViewHolder viewHolder, int fromPos, EpoxyViewHolder target, int toPos, int x, int y)\n```
 //                       documentation  @see #onMoved(RecyclerView, ViewHolder, int, ViewHolder, int, int, int)\n
 //                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                    ^^^^^^^^^^^^ definition local 43
+//                                                 display_name recyclerView
 //                                                 documentation ```java\nunresolved_type recyclerView\n```
 //                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 44
+//                                                                             display_name viewHolder
 //                                                                             documentation ```java\nEpoxyViewHolder viewHolder\n```
 //                                                                                  ^^^^^^^ definition local 45
+//                                                                                          display_name fromPos
 //                                                                                          documentation ```java\nint fromPos\n```
       EpoxyViewHolder target, int toPos, int x, int y) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 46
+//                           display_name target
 //                           documentation ```java\nEpoxyViewHolder target\n```
 //                                ^^^^^ definition local 47
+//                                      display_name toPos
 //                                      documentation ```java\nint toPos\n```
 //                                           ^ definition local 48
+//                                             display_name x
 //                                             documentation ```java\nint x\n```
 //                                                  ^ definition local 49
+//                                                    display_name y
 //                                                    documentation ```java\nint y\n```
     super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
 //  ^^^^^ reference semanticdb maven . . super#
@@ -439,14 +509,17 @@ protected void onMoved(RecyclerView recyclerView, EpoxyViewHolder viewHolder, in
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void clearView(RecyclerView recyclerView, ViewHolder viewHolder) {
 //                  ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
+//                            display_name clearView
 //                            documentation ```java\n@Override\npublic final void clearView(unresolved_type recyclerView, unresolved_type viewHolder)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 //                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                         ^^^^^^^^^^^^ definition local 50
+//                                                      display_name recyclerView
 //                                                      documentation ```java\nunresolved_type recyclerView\n```
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 51
+//                                                                             display_name viewHolder
 //                                                                             documentation ```java\nunresolved_type viewHolder\n```
     clearView(recyclerView, (EpoxyViewHolder) viewHolder);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
@@ -460,15 +533,18 @@ public final void clearView(RecyclerView recyclerView, ViewHolder viewHolder) {
    */
   protected void clearView(RecyclerView recyclerView, EpoxyViewHolder viewHolder) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
+//                         display_name clearView
 //                         documentation ```java\nprotected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder)\n```
 //                         documentation  @see #clearView(RecyclerView, ViewHolder)\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                      ^^^^^^^^^^^^ definition local 52
+//                                                   display_name recyclerView
 //                                                   documentation ```java\nunresolved_type recyclerView\n```
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                    ^^^^^^^^^^ definition local 53
+//                                                                               display_name viewHolder
 //                                                                               documentation ```java\nEpoxyViewHolder viewHolder\n```
     super.clearView(recyclerView, viewHolder);
 //  ^^^^^ reference semanticdb maven . . super#
@@ -481,26 +557,34 @@ protected void clearView(RecyclerView recyclerView, EpoxyViewHolder viewHolder)
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void onChildDraw(Canvas c, RecyclerView recyclerView, ViewHolder viewHolder,
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
+//                              display_name onChildDraw
 //                              documentation ```java\n@Override\npublic final void onChildDraw(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                              ^^^^^^ reference semanticdb maven . . Canvas#
 //                                     ^ definition local 54
+//                                       display_name c
 //                                       documentation ```java\nunresolved_type c\n```
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                     ^^^^^^^^^^^^ definition local 55
+//                                                                  display_name recyclerView
 //                                                                  documentation ```java\nunresolved_type recyclerView\n```
 //                                                                   ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                              ^^^^^^^^^^ definition local 56
+//                                                                                         display_name viewHolder
 //                                                                                         documentation ```java\nunresolved_type viewHolder\n```
       float dX,
 //          ^^ definition local 57
+//             display_name dX
 //             documentation ```java\nfloat dX\n```
       float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 58
+//             display_name dY
 //             documentation ```java\nfloat dY\n```
 //                  ^^^^^^^^^^^ definition local 59
+//                              display_name actionState
 //                              documentation ```java\nint actionState\n```
 //                                       ^^^^^^^^^^^^^^^^^ definition local 60
+//                                                         display_name isCurrentlyActive
 //                                                         documentation ```java\nboolean isCurrentlyActive\n```
 
     onChildDraw(c, recyclerView, (EpoxyViewHolder) viewHolder, dX, dY, actionState,
@@ -521,26 +605,34 @@ public final void onChildDraw(Canvas c, RecyclerView recyclerView, ViewHolder vi
    */
   protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
+//                           display_name onChildDraw
 //                           documentation ```java\nprotected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
 //                           documentation  @see #onChildDraw(Canvas, RecyclerView, ViewHolder, float, float, int, boolean)\n
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                           ^^^^^^ reference semanticdb maven . . Canvas#
 //                                  ^ definition local 61
+//                                    display_name c
 //                                    documentation ```java\nunresolved_type c\n```
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                  ^^^^^^^^^^^^ definition local 62
+//                                                               display_name recyclerView
 //                                                               documentation ```java\nunresolved_type recyclerView\n```
 //                                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                ^^^^^^^^^^ definition local 63
+//                                                                                           display_name viewHolder
 //                                                                                           documentation ```java\nEpoxyViewHolder viewHolder\n```
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 64
+//             display_name dX
 //             documentation ```java\nfloat dX\n```
 //                    ^^ definition local 65
+//                       display_name dY
 //                       documentation ```java\nfloat dY\n```
 //                            ^^^^^^^^^^^ definition local 66
+//                                        display_name actionState
 //                                        documentation ```java\nint actionState\n```
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 67
+//                                                                   display_name isCurrentlyActive
 //                                                                   documentation ```java\nboolean isCurrentlyActive\n```
     super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
 //  ^^^^^ reference semanticdb maven . . super#
@@ -558,25 +650,33 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void onChildDrawOver(Canvas c, RecyclerView recyclerView, ViewHolder viewHolder,
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
+//                                  display_name onChildDrawOver
 //                                  documentation ```java\n@Override\npublic final void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
 //                                  ^^^^^^ reference semanticdb maven . . Canvas#
 //                                         ^ definition local 68
+//                                           display_name c
 //                                           documentation ```java\nunresolved_type c\n```
 //                                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                         ^^^^^^^^^^^^ definition local 69
+//                                                                      display_name recyclerView
 //                                                                      documentation ```java\nunresolved_type recyclerView\n```
 //                                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                                  ^^^^^^^^^^ definition local 70
+//                                                                                             display_name viewHolder
 //                                                                                             documentation ```java\nunresolved_type viewHolder\n```
       float dX,
 //          ^^ definition local 71
+//             display_name dX
 //             documentation ```java\nfloat dX\n```
       float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 72
+//             display_name dY
 //             documentation ```java\nfloat dY\n```
 //                  ^^^^^^^^^^^ definition local 73
+//                              display_name actionState
 //                              documentation ```java\nint actionState\n```
 //                                       ^^^^^^^^^^^^^^^^^ definition local 74
+//                                                         display_name isCurrentlyActive
 //                                                         documentation ```java\nboolean isCurrentlyActive\n```
 
     onChildDrawOver(c, recyclerView, (EpoxyViewHolder) viewHolder, dX, dY, actionState,
@@ -597,25 +697,33 @@ public final void onChildDrawOver(Canvas c, RecyclerView recyclerView, ViewHolde
    */
   protected void onChildDrawOver(Canvas c, RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
+//                               display_name onChildDrawOver
 //                               documentation ```java\nprotected void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
 //                               documentation  @see #onChildDrawOver(Canvas, RecyclerView, ViewHolder, float, float, int, boolean)\n
 //                               ^^^^^^ reference semanticdb maven . . Canvas#
 //                                      ^ definition local 75
+//                                        display_name c
 //                                        documentation ```java\nunresolved_type c\n```
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                      ^^^^^^^^^^^^ definition local 76
+//                                                                   display_name recyclerView
 //                                                                   documentation ```java\nunresolved_type recyclerView\n```
 //                                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                    ^^^^^^^^^^ definition local 77
+//                                                                                               display_name viewHolder
 //                                                                                               documentation ```java\nEpoxyViewHolder viewHolder\n```
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 78
+//             display_name dX
 //             documentation ```java\nfloat dX\n```
 //                    ^^ definition local 79
+//                       display_name dY
 //                       documentation ```java\nfloat dY\n```
 //                            ^^^^^^^^^^^ definition local 80
+//                                        display_name actionState
 //                                        documentation ```java\nint actionState\n```
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 81
+//                                                                   display_name isCurrentlyActive
 //                                                                   documentation ```java\nboolean isCurrentlyActive\n```
 
     super.onChildDrawOver(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
index cbfd48e1d..8e392d608 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
@@ -53,6 +53,7 @@
 //^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 public class EpoxyViewHolder extends RecyclerView.ViewHolder {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
+//                           display_name EpoxyViewHolder
 //                           documentation ```java\n@SuppressWarnings("WeakerAccess")\npublic class EpoxyViewHolder\n```
 //                           relationship is_implementation semanticdb maven . . RecyclerView/ViewHolder#
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
@@ -61,39 +62,48 @@ public class EpoxyViewHolder extends RecyclerView.ViewHolder {
 // ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyModel.
+//                                                            display_name epoxyModel
 //                                                            documentation ```java\n@SuppressWarnings("rawtypes")\nprivate EpoxyModel epoxyModel\n```
   private List<Object> payloads;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //             ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#payloads.
+//                              display_name payloads
 //                              documentation ```java\nprivate List<Object> payloads\n```
   private EpoxyHolder epoxyHolder;
 //        ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder.
+//                                display_name epoxyHolder
 //                                documentation ```java\nprivate EpoxyHolder epoxyHolder\n```
   @Nullable ViewHolderState.ViewState initialViewState;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 //                          ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //                                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#initialViewState.
+//                                                     display_name initialViewState
 //                                                     documentation ```java\n@Nullable\nViewState initialViewState\n```
 
   // Once the EpoxyHolder is created parent will be set to null.
   private ViewParent parent;
 //        ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                   ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#parent.
+//                          display_name parent
 //                          documentation ```java\nprivate unresolved_type parent\n```
 
   public EpoxyViewHolder(ViewParent parent, View view, boolean saveInitialState) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\npublic EpoxyViewHolder(unresolved_type parent, unresolved_type view, boolean saveInitialState)\n```
 //                       ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                  ^^^^^^ definition local 0
+//                                         display_name parent
 //                                         documentation ```java\nunresolved_type parent\n```
 //                                          ^^^^ reference semanticdb maven . . View#
 //                                               ^^^^ definition local 1
+//                                                    display_name view
 //                                                    documentation ```java\nunresolved_type view\n```
 //                                                             ^^^^^^^^^^^^^^^^ definition local 2
+//                                                                              display_name saveInitialState
 //                                                                              documentation ```java\nboolean saveInitialState\n```
     super(view);
 //        ^^^^ reference local 1
@@ -118,6 +128,7 @@ public EpoxyViewHolder(ViewParent parent, View view, boolean saveInitialState) {
 
   void restoreInitialViewState() {
 //     ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#restoreInitialViewState().
+//                             display_name restoreInitialViewState
 //                             documentation ```java\nvoid restoreInitialViewState()\n```
     if (initialViewState != null) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#initialViewState.
@@ -130,21 +141,26 @@ void restoreInitialViewState() {
 
   public void bind(@SuppressWarnings("rawtypes") EpoxyModel model,
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#bind().
+//                 display_name bind
 //                 documentation ```java\npublic void bind(EpoxyModel model, EpoxyModel<?> previouslyBoundModel, List<Object> payloads, int position)\n```
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 //                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^ definition local 3
+//                                                                display_name model
 //                                                                documentation ```java\n@SuppressWarnings("rawtypes")\nEpoxyModel model\n```
       @Nullable EpoxyModel<?> previouslyBoundModel, List<Object> payloads, int position) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 4
+//                                                 display_name previouslyBoundModel
 //                                                 documentation ```java\n@Nullable\nEpoxyModel<?> previouslyBoundModel\n```
 //                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                               ^^^^^^^^ definition local 5
+//                                                                        display_name payloads
 //                                                                        documentation ```java\nList<Object> payloads\n```
 //                                                                             ^^^^^^^^ definition local 6
+//                                                                                      display_name position
 //                                                                                      documentation ```java\nint position\n```
     this.payloads = payloads;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#payloads.
@@ -230,6 +246,7 @@ public void bind(@SuppressWarnings("rawtypes") EpoxyModel model,
   Object objectToBind() {
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#objectToBind().
+//                    display_name objectToBind
 //                    documentation ```java\n@NonNull\nObject objectToBind()\n```
     return epoxyHolder != null ? epoxyHolder : itemView;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder.
@@ -239,6 +256,7 @@ Object objectToBind() {
 
   public void unbind() {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#unbind().
+//                   display_name unbind
 //                   documentation ```java\npublic void unbind()\n```
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
@@ -256,9 +274,11 @@ public void unbind() {
 
   public void visibilityStateChanged(@Visibility int visibilityState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityStateChanged().
+//                                   display_name visibilityStateChanged
 //                                   documentation ```java\npublic void visibilityStateChanged(int visibilityState)\n```
 //                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                   ^^^^^^^^^^^^^^^ definition local 7
+//                                                                   display_name visibilityState
 //                                                                   documentation ```java\n@Visibility\nint visibilityState\n```
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
@@ -272,26 +292,31 @@ public void visibilityStateChanged(@Visibility int visibilityState) {
 
   public void visibilityChanged(
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityChanged().
+//                              display_name visibilityChanged
 //                              documentation ```java\npublic void visibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth)\n```
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleHeight,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                                ^^^^^^^^^^^^^^^^^^^^ definition local 8
+//                                                                     display_name percentVisibleHeight
 //                                                                     documentation ```java\n@FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleHeight\n```
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                                ^^^^^^^^^^^^^^^^^^^ definition local 9
+//                                                                    display_name percentVisibleWidth
 //                                                                    documentation ```java\n@FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleWidth\n```
       @Px int visibleHeight,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 10
+//                          display_name visibleHeight
 //                          documentation ```java\n@Px\nint visibleHeight\n```
       @Px int visibleWidth
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^ definition local 11
+//                         display_name visibleWidth
 //                         documentation ```java\n@Px\nint visibleWidth\n```
   ) {
     assertBound();
@@ -312,6 +337,7 @@ public List<Object> getPayloads() {
 //       ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //            ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getPayloads().
+//                                display_name getPayloads
 //                                documentation ```java\npublic List<Object> getPayloads()\n```
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
@@ -322,6 +348,7 @@ public List<Object> getPayloads() {
   public EpoxyModel<?> getModel() {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
+//                              display_name getModel
 //                              documentation ```java\npublic EpoxyModel<?> getModel()\n```
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
@@ -332,6 +359,7 @@ public EpoxyModel<?> getModel() {
   public EpoxyHolder getHolder() {
 //       ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                   ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getHolder().
+//                             display_name getHolder
 //                             documentation ```java\npublic EpoxyHolder getHolder()\n```
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
@@ -341,6 +369,7 @@ public EpoxyHolder getHolder() {
 
   private void assertBound() {
 //             ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
+//                         display_name assertBound
 //                         documentation ```java\nprivate void assertBound()\n```
     if (epoxyModel == null) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyModel.
@@ -354,6 +383,7 @@ private void assertBound() {
   public String toString() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#toString().
+//                       display_name toString
 //                       documentation ```java\n@Override\npublic String toString()\n```
     return "EpoxyViewHolder{"
         + "epoxyModel=" + epoxyModel
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyVisibilityItem.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyVisibilityItem.kt
index 5f99cd22d..8169210d4 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyVisibilityItem.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyVisibilityItem.kt
@@ -39,146 +39,196 @@ import androidx.recyclerview.widget.RecyclerView
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/VisibleForTesting#PACKAGE_PRIVATE.
 class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#
+//                        display_name EpoxyVisibilityItem
 //                        documentation ```kt\npublic final class EpoxyVisibilityItem\n```\n\n----\n\n\n This class represent an item in a [android.view.ViewGroup] and it is\n being reused with multiple model via the update method. There is 1:1 relationship between an\n EpoxyVisibilityItem and a child within the [android.view.ViewGroup].\n\n It contains the logic to compute the visibility state of an item. It will also invoke the\n visibility callbacks on [com.airbnb.epoxy.EpoxyViewHolder]\n\n This class should remain non-public and is intended to be used by [EpoxyVisibilityTracker]\n only.\n
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#`<init>`().
+//                        display_name EpoxyVisibilityItem
 //                        documentation ```kt\npublic constructor EpoxyVisibilityItem(adapterPosition: kotlin.Int? = ...)\n```
 //                        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#`<init>`().(adapterPosition)
+//                                        display_name adapterPosition
 //                                        documentation ```kt\nvalue-parameter adapterPosition: kotlin.Int? = ...\n```
 //                                         ^^^ reference semanticdb maven . . kotlin/Int#
 
     private val localVisibleRect = Rect()
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getLocalVisibleRect().
+//                               display_name localVisibleRect
 //                               documentation ```kt\nprivate final val localVisibleRect: [Error type: Not found recorded type for Rect()]\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#localVisibleRect.
+//                               display_name localVisibleRect
 //                               documentation ```kt\nprivate final val localVisibleRect: [Error type: Not found recorded type for Rect()]\n```
 
     var adapterPosition = RecyclerView.NO_POSITION
 //      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#adapterPosition.
+//                      display_name adapterPosition
 //                      documentation ```kt\npublic final var adapterPosition: [Error type: Error property type]\n```
 //      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getAdapterPosition().
+//                      display_name adapterPosition
 //                      documentation ```kt\npublic final var adapterPosition: [Error type: Error property type]\n```
         private set
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setAdapterPosition().
+//                  display_name set
 //                  documentation ```kt\nprivate final fun `<set-adapterPosition>`(`<set-?>`: [Error type: Error property type])\n```
 
     @Px
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
     private var height = 0
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getHeight().
+//                     display_name height
 //                     documentation ```kt\nprivate final var height: kotlin.Int\n```
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#height.
+//                     display_name height
 //                     documentation ```kt\nprivate final var height: kotlin.Int\n```
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setHeight().
+//                     display_name height
 //                     documentation ```kt\nprivate final var height: kotlin.Int\n```
 
     @Px
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
     private var width = 0
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getWidth().
+//                    display_name width
 //                    documentation ```kt\nprivate final var width: kotlin.Int\n```
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setWidth().
+//                    display_name width
 //                    documentation ```kt\nprivate final var width: kotlin.Int\n```
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#width.
+//                    display_name width
 //                    documentation ```kt\nprivate final var width: kotlin.Int\n```
 
     @Px
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
     private var visibleHeight = 0
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getVisibleHeight().
+//                            display_name visibleHeight
 //                            documentation ```kt\nprivate final var visibleHeight: kotlin.Int\n```
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setVisibleHeight().
+//                            display_name visibleHeight
 //                            documentation ```kt\nprivate final var visibleHeight: kotlin.Int\n```
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#visibleHeight.
+//                            display_name visibleHeight
 //                            documentation ```kt\nprivate final var visibleHeight: kotlin.Int\n```
 
     @Px
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
     private var visibleWidth = 0
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getVisibleWidth().
+//                           display_name visibleWidth
 //                           documentation ```kt\nprivate final var visibleWidth: kotlin.Int\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setVisibleWidth().
+//                           display_name visibleWidth
 //                           documentation ```kt\nprivate final var visibleWidth: kotlin.Int\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#visibleWidth.
+//                           display_name visibleWidth
 //                           documentation ```kt\nprivate final var visibleWidth: kotlin.Int\n```
 
     @Px
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
     private var viewportHeight = 0
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getViewportHeight().
+//                             display_name viewportHeight
 //                             documentation ```kt\nprivate final var viewportHeight: kotlin.Int\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setViewportHeight().
+//                             display_name viewportHeight
 //                             documentation ```kt\nprivate final var viewportHeight: kotlin.Int\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#viewportHeight.
+//                             display_name viewportHeight
 //                             documentation ```kt\nprivate final var viewportHeight: kotlin.Int\n```
 
     @Px
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
     private var viewportWidth = 0
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getViewportWidth().
+//                            display_name viewportWidth
 //                            documentation ```kt\nprivate final var viewportWidth: kotlin.Int\n```
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setViewportWidth().
+//                            display_name viewportWidth
 //                            documentation ```kt\nprivate final var viewportWidth: kotlin.Int\n```
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#viewportWidth.
+//                            display_name viewportWidth
 //                            documentation ```kt\nprivate final var viewportWidth: kotlin.Int\n```
     private var partiallyVisible = false
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getPartiallyVisible().
+//                               display_name partiallyVisible
 //                               documentation ```kt\nprivate final var partiallyVisible: kotlin.Boolean\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#partiallyVisible.
+//                               display_name partiallyVisible
 //                               documentation ```kt\nprivate final var partiallyVisible: kotlin.Boolean\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setPartiallyVisible().
+//                               display_name partiallyVisible
 //                               documentation ```kt\nprivate final var partiallyVisible: kotlin.Boolean\n```
     private var fullyVisible = false
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#fullyVisible.
+//                           display_name fullyVisible
 //                           documentation ```kt\nprivate final var fullyVisible: kotlin.Boolean\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getFullyVisible().
+//                           display_name fullyVisible
 //                           documentation ```kt\nprivate final var fullyVisible: kotlin.Boolean\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setFullyVisible().
+//                           display_name fullyVisible
 //                           documentation ```kt\nprivate final var fullyVisible: kotlin.Boolean\n```
     private var visible = false
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getVisible().
+//                      display_name visible
 //                      documentation ```kt\nprivate final var visible: kotlin.Boolean\n```
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setVisible().
+//                      display_name visible
 //                      documentation ```kt\nprivate final var visible: kotlin.Boolean\n```
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#visible.
+//                      display_name visible
 //                      documentation ```kt\nprivate final var visible: kotlin.Boolean\n```
     private var focusedVisible = false
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#focusedVisible.
+//                             display_name focusedVisible
 //                             documentation ```kt\nprivate final var focusedVisible: kotlin.Boolean\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getFocusedVisible().
+//                             display_name focusedVisible
 //                             documentation ```kt\nprivate final var focusedVisible: kotlin.Boolean\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setFocusedVisible().
+//                             display_name focusedVisible
 //                             documentation ```kt\nprivate final var focusedVisible: kotlin.Boolean\n```
     private var viewVisibility = View.GONE
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getViewVisibility().
+//                             display_name viewVisibility
 //                             documentation ```kt\nprivate final var viewVisibility: [Error type: Error property type]\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setViewVisibility().
+//                             display_name viewVisibility
 //                             documentation ```kt\nprivate final var viewVisibility: [Error type: Error property type]\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#viewVisibility.
+//                             display_name viewVisibility
 //                             documentation ```kt\nprivate final var viewVisibility: [Error type: Error property type]\n```
 
     /** Store last value for de-duping  */
     private var lastVisibleHeightNotified: Int? = null
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getLastVisibleHeightNotified().
+//                                        display_name lastVisibleHeightNotified
 //                                        documentation ```kt\nprivate final var lastVisibleHeightNotified: kotlin.Int?\n```\n\n----\n\n Store last value for de-duping
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#lastVisibleHeightNotified.
+//                                        display_name lastVisibleHeightNotified
 //                                        documentation ```kt\nprivate final var lastVisibleHeightNotified: kotlin.Int?\n```\n\n----\n\n Store last value for de-duping
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setLastVisibleHeightNotified().
+//                                        display_name lastVisibleHeightNotified
 //                                        documentation ```kt\nprivate final var lastVisibleHeightNotified: kotlin.Int?\n```\n\n----\n\n Store last value for de-duping
 //                                         ^^^ reference semanticdb maven . . kotlin/Int#
     private var lastVisibleWidthNotified: Int? = null
 //              ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getLastVisibleWidthNotified().
+//                                       display_name lastVisibleWidthNotified
 //                                       documentation ```kt\nprivate final var lastVisibleWidthNotified: kotlin.Int?\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#lastVisibleWidthNotified.
+//                                       display_name lastVisibleWidthNotified
 //                                       documentation ```kt\nprivate final var lastVisibleWidthNotified: kotlin.Int?\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setLastVisibleWidthNotified().
+//                                       display_name lastVisibleWidthNotified
 //                                       documentation ```kt\nprivate final var lastVisibleWidthNotified: kotlin.Int?\n```
 //                                        ^^^ reference semanticdb maven . . kotlin/Int#
     private var lastVisibilityNotified: Int? = null
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getLastVisibilityNotified().
+//                                     display_name lastVisibilityNotified
 //                                     documentation ```kt\nprivate final var lastVisibilityNotified: kotlin.Int?\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#lastVisibilityNotified.
+//                                     display_name lastVisibilityNotified
 //                                     documentation ```kt\nprivate final var lastVisibilityNotified: kotlin.Int?\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setLastVisibilityNotified().
+//                                     display_name lastVisibilityNotified
 //                                     documentation ```kt\nprivate final var lastVisibilityNotified: kotlin.Int?\n```
 //                                      ^^^ reference semanticdb maven . . kotlin/Int#
 
@@ -201,12 +251,16 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
      */
     fun update(view: View, parent: ViewGroup, detachEvent: Boolean): Boolean {
 //      ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#update().
+//             display_name update
 //             documentation ```kt\npublic final fun update(view: [Error type: Unresolved type for View], parent: [Error type: Unresolved type for ViewGroup], detachEvent: kotlin.Boolean): kotlin.Boolean\n```\n\n----\n\n\n Update the visibility item according the current layout.\n\n @param view        the current [com.airbnb.epoxy.EpoxyViewHolder]'s itemView\n @param parent      the [android.view.ViewGroup]\n @return true if the view has been measured\n
 //             ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#update().(view)
+//                  display_name view
 //                  documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                         ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#update().(parent)
+//                                display_name parent
 //                                documentation ```kt\nvalue-parameter parent: [Error type: Unresolved type for ViewGroup]\n```
 //                                            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#update().(detachEvent)
+//                                                        display_name detachEvent
 //                                                        documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                                                         ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
 //                                                                   ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
@@ -216,6 +270,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#localVisibleRect.
         val viewDrawn = view.getLocalVisibleRect(localVisibleRect) && !detachEvent
 //          ^^^^^^^^^ definition local 1
+//                    display_name viewDrawn
 //                    documentation ```kt\nval viewDrawn: kotlin.Boolean\n```
 //                      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#update().(view)
 //                                               ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getLocalVisibleRect().
@@ -274,8 +329,10 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     fun reset(newAdapterPosition: Int) {
 //      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#reset().
+//            display_name reset
 //            documentation ```kt\npublic final fun reset(newAdapterPosition: kotlin.Int)\n```
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#reset().(newAdapterPosition)
+//                               display_name newAdapterPosition
 //                               documentation ```kt\nvalue-parameter newAdapterPosition: kotlin.Int\n```
 //                                ^^^ reference semanticdb maven . . kotlin/Int#
         fullyVisible = false
@@ -310,14 +367,18 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     fun handleVisible(epoxyHolder: EpoxyViewHolder, detachEvent: Boolean) {
 //      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleVisible().
+//                    display_name handleVisible
 //                    documentation ```kt\npublic final fun handleVisible(epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder], detachEvent: kotlin.Boolean)\n```
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleVisible().(epoxyHolder)
+//                                display_name epoxyHolder
 //                                documentation ```kt\nvalue-parameter epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                                                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleVisible().(detachEvent)
+//                                                              display_name detachEvent
 //                                                              documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                                                               ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         val previousVisible = visible
 //          ^^^^^^^^^^^^^^^ definition local 2
+//                          display_name previousVisible
 //                          documentation ```kt\nval previousVisible: kotlin.Boolean\n```
 //                            ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getVisible().
 //                            ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setVisible().
@@ -350,14 +411,18 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     fun handleFocus(epoxyHolder: EpoxyViewHolder, detachEvent: Boolean) {
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleFocus().
+//                  display_name handleFocus
 //                  documentation ```kt\npublic final fun handleFocus(epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder], detachEvent: kotlin.Boolean)\n```
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleFocus().(epoxyHolder)
+//                              display_name epoxyHolder
 //                              documentation ```kt\nvalue-parameter epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                                                ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleFocus().(detachEvent)
+//                                                            display_name detachEvent
 //                                                            documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                                                             ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         val previousFocusedVisible = focusedVisible
 //          ^^^^^^^^^^^^^^^^^^^^^^ definition local 3
+//                                 display_name previousFocusedVisible
 //                                 documentation ```kt\nval previousFocusedVisible: kotlin.Boolean\n```
 //                                   ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#focusedVisible.
 //                                   ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getFocusedVisible().
@@ -390,12 +455,15 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     fun handlePartialImpressionVisible(
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handlePartialImpressionVisible().
+//                                     display_name handlePartialImpressionVisible
 //                                     documentation ```kt\npublic final fun handlePartialImpressionVisible(epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder], detachEvent: kotlin.Boolean, thresholdPercentage: kotlin.Int)\n```
         epoxyHolder: EpoxyViewHolder,
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handlePartialImpressionVisible().(epoxyHolder)
+//                  display_name epoxyHolder
 //                  documentation ```kt\nvalue-parameter epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder]\n```
         detachEvent: Boolean,
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handlePartialImpressionVisible().(detachEvent)
+//                  display_name detachEvent
 //                  documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                   ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         @IntRange(from = 0, to = 100) thresholdPercentage: Int
@@ -403,11 +471,13 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IntRange#`<init>`().(from)
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IntRange#`<init>`().(to)
 //                                    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handlePartialImpressionVisible().(thresholdPercentage)
+//                                                        display_name thresholdPercentage
 //                                                        documentation ```kt\nvalue-parameter thresholdPercentage: kotlin.Int\n```
 //                                                         ^^^ reference semanticdb maven . . kotlin/Int#
     ) {
         val previousPartiallyVisible = partiallyVisible
 //          ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 4
+//                                   display_name previousPartiallyVisible
 //                                   documentation ```kt\nval previousPartiallyVisible: kotlin.Boolean\n```
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getPartiallyVisible().
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#partiallyVisible.
@@ -441,14 +511,18 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     fun handleFullImpressionVisible(epoxyHolder: EpoxyViewHolder, detachEvent: Boolean) {
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleFullImpressionVisible().
+//                                  display_name handleFullImpressionVisible
 //                                  documentation ```kt\npublic final fun handleFullImpressionVisible(epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder], detachEvent: kotlin.Boolean)\n```
 //                                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleFullImpressionVisible().(epoxyHolder)
+//                                              display_name epoxyHolder
 //                                              documentation ```kt\nvalue-parameter epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                                                                ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleFullImpressionVisible().(detachEvent)
+//                                                                            display_name detachEvent
 //                                                                            documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                                                                             ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         val previousFullyVisible = fullyVisible
 //          ^^^^^^^^^^^^^^^^^^^^ definition local 5
+//                               display_name previousFullyVisible
 //                               documentation ```kt\nval previousFullyVisible: kotlin.Boolean\n```
 //                                 ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#fullyVisible.
 //                                 ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getFullyVisible().
@@ -478,15 +552,19 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     fun handleChanged(epoxyHolder: EpoxyViewHolder, visibilityChangedEnabled: Boolean): Boolean {
 //      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleChanged().
+//                    display_name handleChanged
 //                    documentation ```kt\npublic final fun handleChanged(epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder], visibilityChangedEnabled: kotlin.Boolean): kotlin.Boolean\n```
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleChanged().(epoxyHolder)
+//                                display_name epoxyHolder
 //                                documentation ```kt\nvalue-parameter epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                                                  ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#handleChanged().(visibilityChangedEnabled)
+//                                                                           display_name visibilityChangedEnabled
 //                                                                           documentation ```kt\nvalue-parameter visibilityChangedEnabled: kotlin.Boolean\n```
 //                                                                            ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
 //                                                                                      ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         var changed = false
 //          ^^^^^^^ definition local 6
+//                  display_name changed
 //                  documentation ```kt\nvar changed: kotlin.Boolean\n```
         if (visibleHeight != lastVisibleHeightNotified || visibleWidth != lastVisibleWidthNotified || viewVisibility != lastVisibilityNotified) {
 //          ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getVisibleHeight().
@@ -578,6 +656,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     private fun isVisible(): Boolean {
 //              ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#isVisible().
+//                        display_name isVisible
 //                        documentation ```kt\nprivate final fun isVisible(): kotlin.Boolean\n```
 //                           ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         return viewVisibility == View.VISIBLE && visibleHeight > 0 && visibleWidth > 0
@@ -596,10 +675,12 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     private fun isInFocusVisible(): Boolean {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#isInFocusVisible().
+//                               display_name isInFocusVisible
 //                               documentation ```kt\nprivate final fun isInFocusVisible(): kotlin.Boolean\n```
 //                                  ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         val halfViewportArea = viewportHeight * viewportWidth / 2
 //          ^^^^^^^^^^^^^^^^ definition local 7
+//                           display_name halfViewportArea
 //                           documentation ```kt\nval halfViewportArea: kotlin.Int\n```
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getViewportHeight().
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setViewportHeight().
@@ -611,6 +692,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //                                                            ^ reference semanticdb maven . . kotlin/Int#div(+3).
         val totalArea = height * width
 //          ^^^^^^^^^ definition local 8
+//                    display_name totalArea
 //                    documentation ```kt\nval totalArea: kotlin.Int\n```
 //                      ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getHeight().
 //                      ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#height.
@@ -621,6 +703,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //                               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#width.
         val visibleArea = visibleHeight * visibleWidth
 //          ^^^^^^^^^^^ definition local 9
+//                      display_name visibleArea
 //                      documentation ```kt\nval visibleArea: kotlin.Int\n```
 //                        ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getVisibleHeight().
 //                        ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setVisibleHeight().
@@ -650,6 +733,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     private fun isPartiallyVisible(
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#isPartiallyVisible().
+//                                 display_name isPartiallyVisible
 //                                 documentation ```kt\nprivate final fun isPartiallyVisible(thresholdPercentage: kotlin.Int): kotlin.Boolean\n```
         @IntRange(
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IntRange#`<init>`().
@@ -659,6 +743,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IntRange#`<init>`().(to)
         ) thresholdPercentage: Int
 //        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#isPartiallyVisible().(thresholdPercentage)
+//                            display_name thresholdPercentage
 //                            documentation ```kt\nvalue-parameter thresholdPercentage: kotlin.Int\n```
 //                             ^^^ reference semanticdb maven . . kotlin/Int#
     ): Boolean {
@@ -670,6 +755,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //                                           ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#isVisible().
         val totalArea = height * width
 //          ^^^^^^^^^ definition local 10
+//                    display_name totalArea
 //                    documentation ```kt\nval totalArea: kotlin.Int\n```
 //                      ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getHeight().
 //                      ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#height.
@@ -680,6 +766,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //                               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#width.
         val visibleArea = visibleHeight * visibleWidth
 //          ^^^^^^^^^^^ definition local 11
+//                      display_name visibleArea
 //                      documentation ```kt\nval visibleArea: kotlin.Int\n```
 //                        ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#getVisibleHeight().
 //                        ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#setVisibleHeight().
@@ -690,6 +777,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#visibleWidth.
         val visibleAreaPercentage = visibleArea / totalArea.toFloat() * 100
 //          ^^^^^^^^^^^^^^^^^^^^^ definition local 12
+//                                display_name visibleAreaPercentage
 //                                documentation ```kt\nval visibleAreaPercentage: kotlin.Float\n```
 //                                  ^^^^^^^^^^^ reference local 11
 //                                              ^ reference semanticdb maven . . kotlin/Int#div(+2).
@@ -707,6 +795,7 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     private fun isFullyVisible(): Boolean {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#isFullyVisible().
+//                             display_name isFullyVisible
 //                             documentation ```kt\nprivate final fun isFullyVisible(): kotlin.Boolean\n```
 //                                ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         return viewVisibility == View.VISIBLE && visibleHeight == height && visibleWidth == width
@@ -731,8 +820,10 @@ class EpoxyVisibilityItem(adapterPosition: Int? = null) {
 
     fun shiftBy(offsetPosition: Int) {
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#shiftBy().
+//              display_name shiftBy
 //              documentation ```kt\npublic final fun shiftBy(offsetPosition: kotlin.Int)\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#shiftBy().(offsetPosition)
+//                             display_name offsetPosition
 //                             documentation ```kt\nvalue-parameter offsetPosition: kotlin.Int\n```
 //                              ^^^ reference semanticdb maven . . kotlin/Int#
         adapterPosition += offsetPosition
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyVisibilityTracker.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyVisibilityTracker.kt
index a5aa363a7..5aca36bc0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyVisibilityTracker.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyVisibilityTracker.kt
@@ -50,8 +50,10 @@ import java.util.HashMap
  */
 class EpoxyVisibilityTracker {
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#
+//                           display_name EpoxyVisibilityTracker
 //                           documentation ```kt\npublic final class EpoxyVisibilityTracker\n```\n\n----\n\n\n A simple way to track visibility events on [com.airbnb.epoxy.EpoxyModel].\n\n [EpoxyVisibilityTracker] works with any [androidx.recyclerview.widget.RecyclerView]\n backed by an Epoxy controller. Once attached the events will be forwarded to the Epoxy model (or\n to the Epoxy view when using annotations).\n\n Note that support for visibility events on an [EpoxyModelGroup] is somewhat limited. Only model\n additions will receive visibility events. Models that are removed from the group will not receive\n events (e.g. [VisibilityState.INVISIBLE]) because the model group does not keep a reference,\n nor does it get notified of model removals.\n\n @see OnVisibilityChanged\n\n @see OnVisibilityStateChanged\n\n @see OnModelVisibilityChangedListener\n\n @see OnModelVisibilityStateChangedListener\n
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#`<init>`().
+//                           display_name EpoxyVisibilityTracker
 //                           documentation ```kt\npublic constructor EpoxyVisibilityTracker()\n```\n\n----\n\n\n A simple way to track visibility events on [com.airbnb.epoxy.EpoxyModel].\n\n [EpoxyVisibilityTracker] works with any [androidx.recyclerview.widget.RecyclerView]\n backed by an Epoxy controller. Once attached the events will be forwarded to the Epoxy model (or\n to the Epoxy view when using annotations).\n\n Note that support for visibility events on an [EpoxyModelGroup] is somewhat limited. Only model\n additions will receive visibility events. Models that are removed from the group will not receive\n events (e.g. [VisibilityState.INVISIBLE]) because the model group does not keep a reference,\n nor does it get notified of model removals.\n\n @see OnVisibilityChanged\n\n @see OnVisibilityStateChanged\n\n @see OnModelVisibilityChangedListener\n\n @see OnModelVisibilityStateChangedListener\n
 
     /**
@@ -59,8 +61,10 @@ class EpoxyVisibilityTracker {
      */
     private val itemAnimatorFinishedListener =
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getItemAnimatorFinishedListener().
+//                                           display_name itemAnimatorFinishedListener
 //                                           documentation ```kt\nprivate final val itemAnimatorFinishedListener: [Error type: Return type for function cannot be resolved]\n```\n\n----\n\n\n Used to listen to [RecyclerView.ItemAnimator] ending animations.\n
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#itemAnimatorFinishedListener.
+//                                           display_name itemAnimatorFinishedListener
 //                                           documentation ```kt\nprivate final val itemAnimatorFinishedListener: [Error type: Return type for function cannot be resolved]\n```\n\n----\n\n\n Used to listen to [RecyclerView.ItemAnimator] ending animations.\n
         RecyclerView.ItemAnimator.ItemAnimatorFinishedListener {
             processChangeEvent(
@@ -73,14 +77,18 @@ class EpoxyVisibilityTracker {
     /** Maintain visibility item indexed by view id (identity hashcode)  */
     private val visibilityIdToItemMap = SparseArray<EpoxyVisibilityItem>()
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getVisibilityIdToItemMap().
+//                                    display_name visibilityIdToItemMap
 //                                    documentation ```kt\nprivate final val visibilityIdToItemMap: [Error type: Not found recorded type for SparseArray<EpoxyVisibilityItem>()]\n```\n\n----\n\n Maintain visibility item indexed by view id (identity hashcode)
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#visibilityIdToItemMap.
+//                                    display_name visibilityIdToItemMap
 //                                    documentation ```kt\nprivate final val visibilityIdToItemMap: [Error type: Not found recorded type for SparseArray<EpoxyVisibilityItem>()]\n```\n\n----\n\n Maintain visibility item indexed by view id (identity hashcode)
 //                                                  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#
     private val visibilityIdToItems: MutableList<EpoxyVisibilityItem> = ArrayList()
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getVisibilityIdToItems().
+//                                  display_name visibilityIdToItems
 //                                  documentation ```kt\nprivate final val visibilityIdToItems: kotlin.collections.MutableList<com.airbnb.epoxy.EpoxyVisibilityItem>\n```
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#visibilityIdToItems.
+//                                  display_name visibilityIdToItems
 //                                  documentation ```kt\nprivate final val visibilityIdToItems: kotlin.collections.MutableList<com.airbnb.epoxy.EpoxyVisibilityItem>\n```
 //                                   ^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/MutableList#
 //                                               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#
@@ -89,40 +97,52 @@ class EpoxyVisibilityTracker {
     /** listener used to process scroll, layout and attach events  */
     private val listener = Listener()
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getListener().
+//                       display_name listener
 //                       documentation ```kt\nprivate final val listener: com.airbnb.epoxy.EpoxyVisibilityTracker.Listener\n```\n\n----\n\n listener used to process scroll, layout and attach events
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#listener.
+//                       display_name listener
 //                       documentation ```kt\nprivate final val listener: com.airbnb.epoxy.EpoxyVisibilityTracker.Listener\n```\n\n----\n\n listener used to process scroll, layout and attach events
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#`<init>`().
 
     /** listener used to process data events  */
     private val observer = DataObserver()
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getObserver().
+//                       display_name observer
 //                       documentation ```kt\nprivate final val observer: com.airbnb.epoxy.EpoxyVisibilityTracker.DataObserver\n```\n\n----\n\n listener used to process data events
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#observer.
+//                       display_name observer
 //                       documentation ```kt\nprivate final val observer: com.airbnb.epoxy.EpoxyVisibilityTracker.DataObserver\n```\n\n----\n\n listener used to process data events
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#`<init>`().
 
     private var attachedRecyclerView: RecyclerView? = null
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#attachedRecyclerView.
+//                                   display_name attachedRecyclerView
 //                                   documentation ```kt\nprivate final var attachedRecyclerView: [Error type: Unresolved type for RecyclerView]?\n```
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getAttachedRecyclerView().
+//                                   display_name attachedRecyclerView
 //                                   documentation ```kt\nprivate final var attachedRecyclerView: [Error type: Unresolved type for RecyclerView]?\n```
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#setAttachedRecyclerView().
+//                                   display_name attachedRecyclerView
 //                                   documentation ```kt\nprivate final var attachedRecyclerView: [Error type: Unresolved type for RecyclerView]?\n```
 
     private var lastAdapterSeen: RecyclerView.Adapter<*>? = null
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getLastAdapterSeen().
+//                              display_name lastAdapterSeen
 //                              documentation ```kt\nprivate final var lastAdapterSeen: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#lastAdapterSeen.
+//                              display_name lastAdapterSeen
 //                              documentation ```kt\nprivate final var lastAdapterSeen: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#setLastAdapterSeen().
+//                              display_name lastAdapterSeen
 //                              documentation ```kt\nprivate final var lastAdapterSeen: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```
 
     /** All nested visibility trackers  */
     private val nestedTrackers: MutableMap<RecyclerView, EpoxyVisibilityTracker> = HashMap()
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getNestedTrackers().
+//                             display_name nestedTrackers
 //                             documentation ```kt\nprivate final val nestedTrackers: kotlin.collections.MutableMap<[Error type: Unresolved type for RecyclerView], com.airbnb.epoxy.EpoxyVisibilityTracker>\n```\n\n----\n\n All nested visibility trackers
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#nestedTrackers.
+//                             display_name nestedTrackers
 //                             documentation ```kt\nprivate final val nestedTrackers: kotlin.collections.MutableMap<[Error type: Unresolved type for RecyclerView], com.airbnb.epoxy.EpoxyVisibilityTracker>\n```\n\n----\n\n All nested visibility trackers
 //                              ^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/MutableMap#
 //                                                       ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#
@@ -132,10 +152,13 @@ class EpoxyVisibilityTracker {
      * need to re-process all views, else no need (ex: scroll). */
     private var visibleDataChanged = false
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getVisibleDataChanged().
+//                                 display_name visibleDataChanged
 //                                 documentation ```kt\nprivate final var visibleDataChanged: kotlin.Boolean\n```\n\n----\n\n This flag is for optimizing the process on detach. If detach is from data changed then it\n need to re-process all views, else no need (ex: scroll).
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#setVisibleDataChanged().
+//                                 display_name visibleDataChanged
 //                                 documentation ```kt\nprivate final var visibleDataChanged: kotlin.Boolean\n```\n\n----\n\n This flag is for optimizing the process on detach. If detach is from data changed then it\n need to re-process all views, else no need (ex: scroll).
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#visibleDataChanged.
+//                                 display_name visibleDataChanged
 //                                 documentation ```kt\nprivate final var visibleDataChanged: kotlin.Boolean\n```\n\n----\n\n This flag is for optimizing the process on detach. If detach is from data changed then it\n need to re-process all views, else no need (ex: scroll).
 
     /**
@@ -148,10 +171,13 @@ class EpoxyVisibilityTracker {
      */
     var onChangedEnabled = true
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getOnChangedEnabled().
+//                       display_name onChangedEnabled
 //                       documentation ```kt\npublic final var onChangedEnabled: kotlin.Boolean\n```\n\n----\n\n\n Enable or disable visibility changed event. Default is `true`, disable it if you don't need\n (triggered by every pixel scrolled).\n\n @see OnVisibilityChanged\n\n @see OnModelVisibilityChangedListener\n
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#onChangedEnabled.
+//                       display_name onChangedEnabled
 //                       documentation ```kt\npublic final var onChangedEnabled: kotlin.Boolean\n```\n\n----\n\n\n Enable or disable visibility changed event. Default is `true`, disable it if you don't need\n (triggered by every pixel scrolled).\n\n @see OnVisibilityChanged\n\n @see OnModelVisibilityChangedListener\n
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#setOnChangedEnabled().
+//                       display_name onChangedEnabled
 //                       documentation ```kt\npublic final var onChangedEnabled: kotlin.Boolean\n```\n\n----\n\n\n Enable or disable visibility changed event. Default is `true`, disable it if you don't need\n (triggered by every pixel scrolled).\n\n @see OnVisibilityChanged\n\n @see OnModelVisibilityChangedListener\n
 
     /**
@@ -168,10 +194,13 @@ class EpoxyVisibilityTracker {
 //                      ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IntRange#`<init>`().(to)
     var partialImpressionThresholdPercentage: Int? = null
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getPartialImpressionThresholdPercentage().
+//                                           display_name partialImpressionThresholdPercentage
 //                                           documentation ```kt\npublic final var partialImpressionThresholdPercentage: kotlin.Int?\n```\n\n----\n\n\n Set the threshold of percentage visible area to identify the partial impression view state.\n\n @param thresholdPercentage Percentage of visible area of an element in the range [0..100].\n Defaults to `null`, which disables\n [VisibilityState.PARTIAL_IMPRESSION_VISIBLE] and\n [VisibilityState.PARTIAL_IMPRESSION_INVISIBLE] events.\n
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#partialImpressionThresholdPercentage.
+//                                           display_name partialImpressionThresholdPercentage
 //                                           documentation ```kt\npublic final var partialImpressionThresholdPercentage: kotlin.Int?\n```\n\n----\n\n\n Set the threshold of percentage visible area to identify the partial impression view state.\n\n @param thresholdPercentage Percentage of visible area of an element in the range [0..100].\n Defaults to `null`, which disables\n [VisibilityState.PARTIAL_IMPRESSION_VISIBLE] and\n [VisibilityState.PARTIAL_IMPRESSION_INVISIBLE] events.\n
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#setPartialImpressionThresholdPercentage().
+//                                           display_name partialImpressionThresholdPercentage
 //                                           documentation ```kt\npublic final var partialImpressionThresholdPercentage: kotlin.Int?\n```\n\n----\n\n\n Set the threshold of percentage visible area to identify the partial impression view state.\n\n @param thresholdPercentage Percentage of visible area of an element in the range [0..100].\n Defaults to `null`, which disables\n [VisibilityState.PARTIAL_IMPRESSION_VISIBLE] and\n [VisibilityState.PARTIAL_IMPRESSION_INVISIBLE] events.\n
 //                                            ^^^ reference semanticdb maven . . kotlin/Int#
 
@@ -182,8 +211,10 @@ class EpoxyVisibilityTracker {
      */
     fun attach(recyclerView: RecyclerView) {
 //      ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#attach().
+//             display_name attach
 //             documentation ```kt\npublic final fun attach(recyclerView: [Error type: Unresolved type for RecyclerView])\n```\n\n----\n\n\n Attach the tracker.\n\n @param recyclerView The recyclerview that the EpoxyController has its adapter added to.\n
 //             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#attach().(recyclerView)
+//                          display_name recyclerView
 //                          documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
         attachedRecyclerView = recyclerView
 //      ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#attachedRecyclerView.
@@ -215,8 +246,10 @@ class EpoxyVisibilityTracker {
      */
     fun detach(recyclerView: RecyclerView) {
 //      ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#detach().
+//             display_name detach
 //             documentation ```kt\npublic final fun detach(recyclerView: [Error type: Unresolved type for RecyclerView])\n```\n\n----\n\n\n Detach the tracker\n\n @param recyclerView The recycler view that the EpoxyController has its adapter added to.\n
 //             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#detach().(recyclerView)
+//                          display_name recyclerView
 //                          documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
         recyclerView.removeOnScrollListener(listener)
 //      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#detach().(recyclerView)
@@ -246,6 +279,7 @@ class EpoxyVisibilityTracker {
      */
     fun clearVisibilityStates() {
 //      ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#clearVisibilityStates().
+//                            display_name clearVisibilityStates
 //                            documentation ```kt\npublic final fun clearVisibilityStates()\n```\n\n----\n\n\n The tracker is storing visibility states internally and is using if to send events, only the\n difference is sent. Use this method to clear the states and thus regenerate the visibility\n events. This may be useful when you change the adapter on the [RecyclerView].\n
         // Clear our visibility items
         visibilityIdToItemMap.clear()
@@ -268,6 +302,7 @@ class EpoxyVisibilityTracker {
      */
     fun requestVisibilityCheck() {
 //      ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#requestVisibilityCheck().
+//                             display_name requestVisibilityCheck
 //                             documentation ```kt\npublic final fun requestVisibilityCheck()\n```\n\n----\n\n\n Calling this method will make the visibility tracking check and trigger events if necessary. It\n is particularly useful when the visibility of an Epoxy model is changed outside of an Epoxy\n RecyclerView.\n\n An example is when you nest an horizontal Epoxy backed RecyclerView in a non Epoxy vertical\n RecyclerView. When the vertical RecyclerView scroll you want to notify the visibility tracker\n attached on the horizontal RecyclerView.\n
         processChangeEvent("requestVisibilityCheck")
 //      ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChangeEvent().
@@ -280,17 +315,21 @@ class EpoxyVisibilityTracker {
      */
     private fun processChangeEvent(debug: String, checkItemAnimator: Boolean = true) {
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChangeEvent().
+//                                 display_name processChangeEvent
 //                                 documentation ```kt\nprivate final fun processChangeEvent(debug: kotlin.String, checkItemAnimator: kotlin.Boolean = ...)\n```\n\n----\n\n\n Process a change event.\n @param debug: string for debug usually the source of the call\n @param checkItemAnimator: true if it need to check if ItemAnimator is running\n
 //                                 ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChangeEvent().(debug)
+//                                       display_name debug
 //                                       documentation ```kt\nvalue-parameter debug: kotlin.String\n```
 //                                        ^^^^^^ reference semanticdb maven . . kotlin/String#
 //                                                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChangeEvent().(checkItemAnimator)
+//                                                                  display_name checkItemAnimator
 //                                                                  documentation ```kt\nvalue-parameter checkItemAnimator: kotlin.Boolean = ...\n```
 //                                                                   ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
 
         // Only if attached
         val recyclerView = attachedRecyclerView ?: return
 //          ^^^^^^^^^^^^ definition local 0
+//                       display_name recyclerView
 //                       documentation ```kt\nval recyclerView: kotlin.Nothing\n```
 //                         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#attachedRecyclerView.
 //                         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getAttachedRecyclerView().
@@ -298,6 +337,7 @@ class EpoxyVisibilityTracker {
 
         val itemAnimator = recyclerView.itemAnimator
 //          ^^^^^^^^^^^^ definition local 1
+//                       display_name itemAnimator
 //                       documentation ```kt\nval itemAnimator: [Error type: Not found recorded type for recyclerView.itemAnimator]\n```
 //                         ^^^^^^^^^^^^ reference local 0
         if (checkItemAnimator && itemAnimator != null) {
@@ -324,16 +364,20 @@ class EpoxyVisibilityTracker {
 
     private fun processChangeEventWithDetachedView(detachedView: View?, debug: String) {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChangeEventWithDetachedView().
+//                                                 display_name processChangeEventWithDetachedView
 //                                                 documentation ```kt\nprivate final fun processChangeEventWithDetachedView(detachedView: [Error type: Unresolved type for View]?, debug: kotlin.String)\n```
 //                                                 ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChangeEventWithDetachedView().(detachedView)
+//                                                              display_name detachedView
 //                                                              documentation ```kt\nvalue-parameter detachedView: [Error type: Unresolved type for View]?\n```
 //                                                                      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChangeEventWithDetachedView().(debug)
+//                                                                            display_name debug
 //                                                                            documentation ```kt\nvalue-parameter debug: kotlin.String\n```
 //                                                                             ^^^^^^ reference semanticdb maven . . kotlin/String#
 
         // Only if attached
         val recyclerView = attachedRecyclerView ?: return
 //          ^^^^^^^^^^^^ definition local 2
+//                       display_name recyclerView
 //                       documentation ```kt\nval recyclerView: kotlin.Nothing\n```
 //                         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#attachedRecyclerView.
 //                         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getAttachedRecyclerView().
@@ -352,11 +396,13 @@ class EpoxyVisibilityTracker {
         // Process all attached children
         for (i in 0 until recyclerView.childCount) {
 //           ^ definition local 3
+//             display_name i
 //             documentation ```kt\nval i: kotlin.Int\n```
 //                  ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/RangesKt#until(+6).
 //                        ^^^^^^^^^^^^ reference local 2
             val child = recyclerView.getChildAt(i)
 //              ^^^^^ definition local 4
+//                    display_name child
 //                    documentation ```kt\nval child: [Error type: Not found recorded type for recyclerView.getChildAt(i)]\n```
 //                      ^^^^^^^^^^^^ reference local 2
 //                                              ^ reference local 3
@@ -380,12 +426,14 @@ class EpoxyVisibilityTracker {
      */
     private fun processNewAdapterIfNecessary() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processNewAdapterIfNecessary().
+//                                           display_name processNewAdapterIfNecessary
 //                                           documentation ```kt\nprivate final fun processNewAdapterIfNecessary()\n```\n\n----\n\n\n If there is a new adapter on the attached RecyclerView it will register the data observer and\n clear the current visibility states\n
         attachedRecyclerView?.adapter?.let { adapter ->
 //      ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#attachedRecyclerView.
 //      ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getAttachedRecyclerView().
 //      ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#setAttachedRecyclerView().
 //                                           ^^^^^^^ definition local 5
+//                                                   display_name adapter
 //                                                   documentation ```kt\nvalue-parameter adapter: [Error type: Cannot infer a lambda parameter type]\n```
             if (lastAdapterSeen != adapter) {
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getLastAdapterSeen().
@@ -423,19 +471,24 @@ class EpoxyVisibilityTracker {
      */
     private fun processChild(child: View, detachEvent: Boolean, eventOriginForDebug: String) {
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild().
+//                           display_name processChild
 //                           documentation ```kt\nprivate final fun processChild(child: [Error type: Unresolved type for View], detachEvent: kotlin.Boolean, eventOriginForDebug: kotlin.String)\n```\n\n----\n\n\n Don't call this method directly, it is called from\n [EpoxyVisibilityTracker.processVisibilityEvents]\n\n @param child               the view to process for visibility event\n @param detachEvent         true if the child was just detached\n @param eventOriginForDebug a debug strings used for logs\n
 //                           ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild().(child)
+//                                 display_name child
 //                                 documentation ```kt\nvalue-parameter child: [Error type: Unresolved type for View]\n```
 //                                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild().(detachEvent)
+//                                                    display_name detachEvent
 //                                                    documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                                                     ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
 //                                                              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild().(eventOriginForDebug)
+//                                                                                  display_name eventOriginForDebug
 //                                                                                  documentation ```kt\nvalue-parameter eventOriginForDebug: kotlin.String\n```
 //                                                                                   ^^^^^^ reference semanticdb maven . . kotlin/String#
 
         // Only if attached
         val recyclerView = attachedRecyclerView ?: return
 //          ^^^^^^^^^^^^ definition local 6
+//                       display_name recyclerView
 //                       documentation ```kt\nval recyclerView: kotlin.Nothing\n```
 //                         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#attachedRecyclerView.
 //                         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getAttachedRecyclerView().
@@ -445,12 +498,14 @@ class EpoxyVisibilityTracker {
         // `getChildViewHolder`.
         val isParentValid = child.parent == null || child.parent === recyclerView
 //          ^^^^^^^^^^^^^ definition local 7
+//                        display_name isParentValid
 //                        documentation ```kt\nval isParentValid: kotlin.Boolean\n```
 //                          ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild().(child)
 //                                                  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild().(child)
 //                                                                   ^^^^^^^^^^^^ reference local 6
         val viewHolder = if (isParentValid) recyclerView.getChildViewHolder(child) else null
 //          ^^^^^^^^^^ definition local 8
+//                     display_name viewHolder
 //                     documentation ```kt\nval viewHolder: kotlin.Nothing?\n```
 //                           ^^^^^^^^^^^^^ reference local 7
 //                                          ^^^^^^^^^^^^ reference local 6
@@ -459,6 +514,7 @@ class EpoxyVisibilityTracker {
 //          ^^^^^^^^^^ reference local 8
             val epoxyHolder = viewHolder.holder
 //              ^^^^^^^^^^^ definition local 9
+//                          display_name epoxyHolder
 //                          documentation ```kt\nval epoxyHolder: [Error type: Not found recorded type for viewHolder.holder]\n```
 //                            ^^^^^^^^^^ reference local 8
             processChild(recyclerView, child, detachEvent, eventOriginForDebug, viewHolder)
@@ -492,26 +548,32 @@ class EpoxyVisibilityTracker {
      */
     private fun processModelGroupChildren(
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processModelGroupChildren().
+//                                        display_name processModelGroupChildren
 //                                        documentation ```kt\nprivate final fun processModelGroupChildren(recyclerView: [Error type: Unresolved type for RecyclerView], epoxyHolder: com.airbnb.epoxy.ModelGroupHolder, detachEvent: kotlin.Boolean, eventOriginForDebug: kotlin.String)\n```\n\n----\n\n\n Loop through the children of the model group and process visibility events on each one in\n relation to the model group's layout. This will attach or detach trackers to any nested\n [RecyclerView]s.\n\n @param epoxyHolder         the [ModelGroupHolder] with children to process\n @param detachEvent         true if the child was just detached\n @param eventOriginForDebug a debug strings used for logs\n
         recyclerView: RecyclerView,
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processModelGroupChildren().(recyclerView)
+//                   display_name recyclerView
 //                   documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
         epoxyHolder: ModelGroupHolder,
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processModelGroupChildren().(epoxyHolder)
+//                  display_name epoxyHolder
 //                  documentation ```kt\nvalue-parameter epoxyHolder: com.airbnb.epoxy.ModelGroupHolder\n```
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#
         detachEvent: Boolean,
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processModelGroupChildren().(detachEvent)
+//                  display_name detachEvent
 //                  documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                   ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         eventOriginForDebug: String
 //      ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processModelGroupChildren().(eventOriginForDebug)
+//                          display_name eventOriginForDebug
 //                          documentation ```kt\nvalue-parameter eventOriginForDebug: kotlin.String\n```
 //                           ^^^^^^ reference semanticdb maven . . kotlin/String#
     ) {
         // Iterate through models in the group and process each of them instead of the group
         for (groupChildHolder in epoxyHolder.viewHolders) {
 //           ^^^^^^^^^^^^^^^^ definition local 10
+//                            display_name groupChildHolder
 //                            documentation ```kt\nval groupChildHolder: [Error type: Return type for function cannot be resolved]\n```
 //                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processModelGroupChildren().(epoxyHolder)
 //                                           ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewHolders().
@@ -559,27 +621,34 @@ class EpoxyVisibilityTracker {
      */
     private fun processChild(
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild(+1).
+//                           display_name processChild
 //                           documentation ```kt\nprivate final fun processChild(recyclerView: [Error type: Unresolved type for RecyclerView], child: [Error type: Unresolved type for View], detachEvent: kotlin.Boolean, eventOriginForDebug: kotlin.String, viewHolder: [Error type: Unresolved type for EpoxyViewHolder])\n```\n\n----\n\n\n Process visibility events for a view and propagate to a nested tracker if the view is a\n [RecyclerView].\n\n @param child               the view to process for visibility event\n @param detachEvent         true if the child was just detached\n @param eventOriginForDebug a debug strings used for logs\n @param viewHolder          the view holder for the child view\n
         recyclerView: RecyclerView,
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild(+1).(recyclerView)
+//                   display_name recyclerView
 //                   documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
         child: View,
 //      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild(+1).(child)
+//            display_name child
 //            documentation ```kt\nvalue-parameter child: [Error type: Unresolved type for View]\n```
         detachEvent: Boolean,
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild(+1).(detachEvent)
+//                  display_name detachEvent
 //                  documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                   ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         eventOriginForDebug: String,
 //      ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild(+1).(eventOriginForDebug)
+//                          display_name eventOriginForDebug
 //                          documentation ```kt\nvalue-parameter eventOriginForDebug: kotlin.String\n```
 //                           ^^^^^^ reference semanticdb maven . . kotlin/String#
         viewHolder: EpoxyViewHolder
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChild(+1).(viewHolder)
+//                 display_name viewHolder
 //                 documentation ```kt\nvalue-parameter viewHolder: [Error type: Unresolved type for EpoxyViewHolder]\n```
     ) {
         val changed = processVisibilityEvents(
 //          ^^^^^^^ definition local 11
+//                  display_name changed
 //                  documentation ```kt\nval changed: kotlin.Boolean\n```
 //                    ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processVisibilityEvents().
             recyclerView,
@@ -615,19 +684,24 @@ class EpoxyVisibilityTracker {
      */
     private fun processVisibilityEvents(
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processVisibilityEvents().
+//                                      display_name processVisibilityEvents
 //                                      documentation ```kt\nprivate final fun processVisibilityEvents(recyclerView: [Error type: Unresolved type for RecyclerView], epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder], detachEvent: kotlin.Boolean, eventOriginForDebug: kotlin.String): kotlin.Boolean\n```\n\n----\n\n\n Call this methods every time something related to ui (scroll, layout, ...) or something related\n to data changed.\n\n @param recyclerView        the recycler view\n @param epoxyHolder         the [RecyclerView]\n @param detachEvent         true if the event originated from a view detached from the\n recycler view\n @param eventOriginForDebug a debug strings used for logs\n @return true if changed\n
         recyclerView: RecyclerView,
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processVisibilityEvents().(recyclerView)
+//                   display_name recyclerView
 //                   documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
         epoxyHolder: EpoxyViewHolder,
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processVisibilityEvents().(epoxyHolder)
+//                  display_name epoxyHolder
 //                  documentation ```kt\nvalue-parameter epoxyHolder: [Error type: Unresolved type for EpoxyViewHolder]\n```
         detachEvent: Boolean,
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processVisibilityEvents().(detachEvent)
+//                  display_name detachEvent
 //                  documentation ```kt\nvalue-parameter detachEvent: kotlin.Boolean\n```
 //                   ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         eventOriginForDebug: String
 //      ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processVisibilityEvents().(eventOriginForDebug)
+//                          display_name eventOriginForDebug
 //                          documentation ```kt\nvalue-parameter eventOriginForDebug: kotlin.String\n```
 //                           ^^^^^^ reference semanticdb maven . . kotlin/String#
     ): Boolean {
@@ -654,16 +728,19 @@ class EpoxyVisibilityTracker {
         }
         val itemView = epoxyHolder.itemView
 //          ^^^^^^^^ definition local 12
+//                   display_name itemView
 //                   documentation ```kt\nval itemView: [Error type: Error property type]\n```
 //                     ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processVisibilityEvents().(epoxyHolder)
         val id = System.identityHashCode(itemView)
 //          ^^ definition local 13
+//             display_name id
 //             documentation ```kt\nval id: kotlin.Int\n```
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //                      ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#identityHashCode().
 //                                       ^^^^^^^^ reference local 12
         var vi = visibilityIdToItemMap[id]
 //          ^^ definition local 14
+//             display_name vi
 //             documentation ```kt\nvar vi: [Error type: Return type for function cannot be resolved]\n```
 //               ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getVisibilityIdToItemMap().
 //               ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#visibilityIdToItemMap.
@@ -698,6 +775,7 @@ class EpoxyVisibilityTracker {
         }
         var changed = false
 //          ^^^^^^^ definition local 15
+//                  display_name changed
 //                  documentation ```kt\nvar changed: kotlin.Boolean\n```
         if (vi.update(itemView, recyclerView, detachEvent)) {
 //          ^^ reference local 14
@@ -715,6 +793,7 @@ class EpoxyVisibilityTracker {
 //          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#setPartialImpressionThresholdPercentage().
 //                                                ^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/StandardKt#let().
 //                                                      ^^^^^^^^^^ definition local 16
+//                                                                 display_name percentage
 //                                                                 documentation ```kt\nvalue-parameter percentage: kotlin.Int\n```
                 vi.handlePartialImpressionVisible(
 //              ^^ reference local 14
@@ -747,19 +826,23 @@ class EpoxyVisibilityTracker {
 
     private fun processChildRecyclerViewAttached(childRecyclerView: RecyclerView) {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChildRecyclerViewAttached().
+//                                               display_name processChildRecyclerViewAttached
 //                                               documentation ```kt\nprivate final fun processChildRecyclerViewAttached(childRecyclerView: [Error type: Unresolved type for RecyclerView])\n```
 //                                               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChildRecyclerViewAttached().(childRecyclerView)
+//                                                                 display_name childRecyclerView
 //                                                                 documentation ```kt\nvalue-parameter childRecyclerView: [Error type: Unresolved type for RecyclerView]\n```
         // Register itself in the EpoxyVisibilityTracker. This will take care of nested list
         // tracking (ex: carousel)
         val tracker = getTracker(childRecyclerView) ?: EpoxyVisibilityTracker().let { nested ->
 //          ^^^^^^^ definition local 17
+//                  display_name tracker
 //                  documentation ```kt\nval tracker: com.airbnb.epoxy.EpoxyVisibilityTracker\n```
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#getTracker().
 //                               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChildRecyclerViewAttached().(childRecyclerView)
 //                                                     ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#`<init>`().
 //                                                                              ^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/StandardKt#let().
 //                                                                                    ^^^^^^ definition local 18
+//                                                                                           display_name nested
 //                                                                                           documentation ```kt\nvalue-parameter nested: com.airbnb.epoxy.EpoxyVisibilityTracker\n```
             nested.partialImpressionThresholdPercentage = partialImpressionThresholdPercentage
 //          ^^^^^^ reference local 18
@@ -785,8 +868,10 @@ class EpoxyVisibilityTracker {
 
     private fun processChildRecyclerViewDetached(childRecyclerView: RecyclerView) {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChildRecyclerViewDetached().
+//                                               display_name processChildRecyclerViewDetached
 //                                               documentation ```kt\nprivate final fun processChildRecyclerViewDetached(childRecyclerView: [Error type: Unresolved type for RecyclerView])\n```
 //                                               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#processChildRecyclerViewDetached().(childRecyclerView)
+//                                                                 display_name childRecyclerView
 //                                                                 documentation ```kt\nvalue-parameter childRecyclerView: [Error type: Unresolved type for RecyclerView]\n```
         nestedTrackers.remove(childRecyclerView)
 //      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getNestedTrackers().
@@ -801,48 +886,60 @@ class EpoxyVisibilityTracker {
      */
     private inner class Listener :
 //                      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#
+//                               display_name Listener
 //                               documentation ```kt\nprivate final inner class Listener\n```\n\n----\n\n\n Helper class that host the [androidx.recyclerview.widget.RecyclerView] listener\n implementations\n
 //                      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#`<init>`().
+//                               display_name Listener
 //                               documentation ```kt\npublic constructor Listener()\n```\n\n----\n\n\n Helper class that host the [androidx.recyclerview.widget.RecyclerView] listener\n implementations\n
         RecyclerView.OnScrollListener(),
         View.OnLayoutChangeListener,
         RecyclerView.OnChildAttachStateChangeListener {
         override fun onLayoutChange(
 //                   ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().
+//                                  display_name onLayoutChange
 //                                  documentation ```kt\npublic open fun onLayoutChange(recyclerView: [Error type: Unresolved type for View], left: kotlin.Int, top: kotlin.Int, right: kotlin.Int, bottom: kotlin.Int, oldLeft: kotlin.Int, oldTop: kotlin.Int, oldRight: kotlin.Int, oldBottom: kotlin.Int)\n```
             recyclerView: View,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(recyclerView)
+//                       display_name recyclerView
 //                       documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for View]\n```
             left: Int,
 //          ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(left)
+//               display_name left
 //               documentation ```kt\nvalue-parameter left: kotlin.Int\n```
 //                ^^^ reference semanticdb maven . . kotlin/Int#
             top: Int,
 //          ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(top)
+//              display_name top
 //              documentation ```kt\nvalue-parameter top: kotlin.Int\n```
 //               ^^^ reference semanticdb maven . . kotlin/Int#
             right: Int,
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(right)
+//                display_name right
 //                documentation ```kt\nvalue-parameter right: kotlin.Int\n```
 //                 ^^^ reference semanticdb maven . . kotlin/Int#
             bottom: Int,
 //          ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(bottom)
+//                 display_name bottom
 //                 documentation ```kt\nvalue-parameter bottom: kotlin.Int\n```
 //                  ^^^ reference semanticdb maven . . kotlin/Int#
             oldLeft: Int,
 //          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(oldLeft)
+//                  display_name oldLeft
 //                  documentation ```kt\nvalue-parameter oldLeft: kotlin.Int\n```
 //                   ^^^ reference semanticdb maven . . kotlin/Int#
             oldTop: Int,
 //          ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(oldTop)
+//                 display_name oldTop
 //                 documentation ```kt\nvalue-parameter oldTop: kotlin.Int\n```
 //                  ^^^ reference semanticdb maven . . kotlin/Int#
             oldRight: Int,
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(oldRight)
+//                   display_name oldRight
 //                   documentation ```kt\nvalue-parameter oldRight: kotlin.Int\n```
 //                    ^^^ reference semanticdb maven . . kotlin/Int#
             oldBottom: Int
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onLayoutChange().(oldBottom)
+//                    display_name oldBottom
 //                    documentation ```kt\nvalue-parameter oldBottom: kotlin.Int\n```
 //                     ^^^ reference semanticdb maven . . kotlin/Int#
         ) {
@@ -852,13 +949,17 @@ class EpoxyVisibilityTracker {
 
         override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
 //                   ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onScrolled().
+//                              display_name onScrolled
 //                              documentation ```kt\npublic open fun onScrolled(recyclerView: [Error type: Unresolved type for RecyclerView], dx: kotlin.Int, dy: kotlin.Int)\n```
 //                              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onScrolled().(recyclerView)
+//                                           display_name recyclerView
 //                                           documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
 //                                                          ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onScrolled().(dx)
+//                                                             display_name dx
 //                                                             documentation ```kt\nvalue-parameter dx: kotlin.Int\n```
 //                                                              ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                   ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onScrolled().(dy)
+//                                                                      display_name dy
 //                                                                      documentation ```kt\nvalue-parameter dy: kotlin.Int\n```
 //                                                                       ^^^ reference semanticdb maven . . kotlin/Int#
             processChangeEvent("onScrolled")
@@ -867,8 +968,10 @@ class EpoxyVisibilityTracker {
 
         override fun onChildViewAttachedToWindow(child: View) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onChildViewAttachedToWindow().
+//                                               display_name onChildViewAttachedToWindow
 //                                               documentation ```kt\npublic open fun onChildViewAttachedToWindow(child: [Error type: Unresolved type for View])\n```
 //                                               ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onChildViewAttachedToWindow().(child)
+//                                                     display_name child
 //                                                     documentation ```kt\nvalue-parameter child: [Error type: Unresolved type for View]\n```
             if (child is RecyclerView) {
 //              ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onChildViewAttachedToWindow().(child)
@@ -883,8 +986,10 @@ class EpoxyVisibilityTracker {
 
         override fun onChildViewDetachedFromWindow(child: View) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onChildViewDetachedFromWindow().
+//                                                 display_name onChildViewDetachedFromWindow
 //                                                 documentation ```kt\npublic open fun onChildViewDetachedFromWindow(child: [Error type: Unresolved type for View])\n```
 //                                                 ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onChildViewDetachedFromWindow().(child)
+//                                                       display_name child
 //                                                       documentation ```kt\nvalue-parameter child: [Error type: Unresolved type for View]\n```
             if (child is RecyclerView) {
 //              ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Listener#onChildViewDetachedFromWindow().(child)
@@ -919,14 +1024,17 @@ class EpoxyVisibilityTracker {
      */
     internal inner class DataObserver : RecyclerView.AdapterDataObserver() {
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#
+//                                    display_name DataObserver
 //                                    documentation ```kt\ninternal final inner class DataObserver\n```\n\n----\n\n\n The layout/scroll events are not enough to detect all sort of visibility changes. We also\n need to look at the data events from the adapter.\n
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#`<init>`().
+//                                    display_name DataObserver
 //                                    documentation ```kt\npublic constructor DataObserver()\n```\n\n----\n\n\n The layout/scroll events are not enough to detect all sort of visibility changes. We also\n need to look at the data events from the adapter.\n
         /**
          * Clear the current visibility statues
          */
         override fun onChanged() {
 //                   ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onChanged().
+//                             display_name onChanged
 //                             documentation ```kt\npublic open fun onChanged()\n```\n\n----\n\n\n Clear the current visibility statues\n
             if (notEpoxyManaged(attachedRecyclerView)) {
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#notEpoxyManaged().
@@ -961,11 +1069,14 @@ class EpoxyVisibilityTracker {
          */
         override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
 //                   ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeInserted().
+//                                       display_name onItemRangeInserted
 //                                       documentation ```kt\npublic open fun onItemRangeInserted(positionStart: kotlin.Int, itemCount: kotlin.Int)\n```\n\n----\n\n\n For all items after the inserted range shift each [EpoxyVisibilityTracker] adapter\n position by inserted item count.\n
 //                                       ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeInserted().(positionStart)
+//                                                     display_name positionStart
 //                                                     documentation ```kt\nvalue-parameter positionStart: kotlin.Int\n```
 //                                                      ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                           ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeInserted().(itemCount)
+//                                                                     display_name itemCount
 //                                                                     documentation ```kt\nvalue-parameter itemCount: kotlin.Int\n```
 //                                                                      ^^^ reference semanticdb maven . . kotlin/Int#
             if (notEpoxyManaged(attachedRecyclerView)) {
@@ -986,6 +1097,7 @@ class EpoxyVisibilityTracker {
             }
             for (item in visibilityIdToItems) {
 //               ^^^^ definition local 19
+//                    display_name item
 //                    documentation ```kt\nval item: com.airbnb.epoxy.EpoxyVisibilityItem\n```
 //                       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getVisibilityIdToItems().
 //                       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#visibilityIdToItems.
@@ -1012,11 +1124,14 @@ class EpoxyVisibilityTracker {
          */
         override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
 //                   ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeRemoved().
+//                                      display_name onItemRangeRemoved
 //                                      documentation ```kt\npublic open fun onItemRangeRemoved(positionStart: kotlin.Int, itemCount: kotlin.Int)\n```\n\n----\n\n\n For all items after the removed range reverse-shift each [EpoxyVisibilityTracker]\n adapter position by removed item count\n
 //                                      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeRemoved().(positionStart)
+//                                                    display_name positionStart
 //                                                    documentation ```kt\nvalue-parameter positionStart: kotlin.Int\n```
 //                                                     ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeRemoved().(itemCount)
+//                                                                    display_name itemCount
 //                                                                    documentation ```kt\nvalue-parameter itemCount: kotlin.Int\n```
 //                                                                     ^^^ reference semanticdb maven . . kotlin/Int#
             if (notEpoxyManaged(attachedRecyclerView)) {
@@ -1037,6 +1152,7 @@ class EpoxyVisibilityTracker {
             }
             for (item in visibilityIdToItems) {
 //               ^^^^ definition local 20
+//                    display_name item
 //                    documentation ```kt\nval item: com.airbnb.epoxy.EpoxyVisibilityItem\n```
 //                       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getVisibilityIdToItems().
 //                       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#visibilityIdToItems.
@@ -1067,14 +1183,18 @@ class EpoxyVisibilityTracker {
          */
         override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
 //                   ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeMoved().
+//                                    display_name onItemRangeMoved
 //                                    documentation ```kt\npublic open fun onItemRangeMoved(fromPosition: kotlin.Int, toPosition: kotlin.Int, itemCount: kotlin.Int)\n```\n\n----\n\n\n This is a bit more complex, for move we need to first swap the moved position then shift the\n items between the swap. To simplify we split any range passed to individual item moved.\n\n ps: anyway [androidx.recyclerview.widget.AdapterListUpdateCallback]\n does not seem to use range for moved items.\n
 //                                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeMoved().(fromPosition)
+//                                                 display_name fromPosition
 //                                                 documentation ```kt\nvalue-parameter fromPosition: kotlin.Int\n```
 //                                                  ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                       ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeMoved().(toPosition)
+//                                                                  display_name toPosition
 //                                                                  documentation ```kt\nvalue-parameter toPosition: kotlin.Int\n```
 //                                                                   ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                        ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeMoved().(itemCount)
+//                                                                                  display_name itemCount
 //                                                                                  documentation ```kt\nvalue-parameter itemCount: kotlin.Int\n```
 //                                                                                   ^^^ reference semanticdb maven . . kotlin/Int#
             if (notEpoxyManaged(attachedRecyclerView)) {
@@ -1086,6 +1206,7 @@ class EpoxyVisibilityTracker {
             }
             for (i in 0 until itemCount) {
 //               ^ definition local 21
+//                 display_name i
 //                 documentation ```kt\nval i: kotlin.Int\n```
 //                      ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/RangesKt#until(+6).
 //                            ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemRangeMoved().(itemCount)
@@ -1102,11 +1223,14 @@ class EpoxyVisibilityTracker {
 
         private fun onItemMoved(fromPosition: Int, toPosition: Int) {
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemMoved().
+//                              display_name onItemMoved
 //                              documentation ```kt\nprivate final fun onItemMoved(fromPosition: kotlin.Int, toPosition: kotlin.Int)\n```
 //                              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemMoved().(fromPosition)
+//                                           display_name fromPosition
 //                                           documentation ```kt\nvalue-parameter fromPosition: kotlin.Int\n```
 //                                            ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#onItemMoved().(toPosition)
+//                                                            display_name toPosition
 //                                                            documentation ```kt\nvalue-parameter toPosition: kotlin.Int\n```
 //                                                             ^^^ reference semanticdb maven . . kotlin/Int#
             if (notEpoxyManaged(attachedRecyclerView)) {
@@ -1127,11 +1251,13 @@ class EpoxyVisibilityTracker {
             }
             for (item in visibilityIdToItems) {
 //               ^^^^ definition local 22
+//                    display_name item
 //                    documentation ```kt\nval item: com.airbnb.epoxy.EpoxyVisibilityItem\n```
 //                       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#getVisibilityIdToItems().
 //                       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#visibilityIdToItems.
                 val position = item.adapterPosition
 //                  ^^^^^^^^ definition local 23
+//                           display_name position
 //                           documentation ```kt\nval position: [Error type: Error property type]\n```
 //                             ^^^^ reference local 22
 //                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityItem#adapterPosition.
@@ -1202,8 +1328,10 @@ class EpoxyVisibilityTracker {
          */
         private fun notEpoxyManaged(recyclerView: RecyclerView?): Boolean {
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#notEpoxyManaged().
+//                                  display_name notEpoxyManaged
 //                                  documentation ```kt\nprivate final fun notEpoxyManaged(recyclerView: [Error type: Unresolved type for RecyclerView]?): kotlin.Boolean\n```\n\n----\n\n\n @param recyclerView the recycler view\n @return true if managed by an [BaseEpoxyAdapter]\n
 //                                  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#DataObserver#notEpoxyManaged().(recyclerView)
+//                                               display_name recyclerView
 //                                               documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]?\n```
 //                                                                ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
             return recyclerView == null || recyclerView.adapter !is BaseEpoxyAdapter
@@ -1214,19 +1342,24 @@ class EpoxyVisibilityTracker {
 
     companion object {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion# 1:0
+//                     display_name Companion
 //                     documentation ```kt\npublic companion object\n```
         private const val TAG = "EpoxyVisibilityTracker"
 //                        ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#TAG.
+//                            display_name TAG
 //                            documentation ```kt\nprivate const final val TAG: kotlin.String\n```
 //                        ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#getTAG().
+//                            display_name TAG
 //                            documentation ```kt\nprivate const final val TAG: kotlin.String\n```
 
         @IdRes
 //       ^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IdRes#`<init>`().
         private val TAG_ID = R.id.epoxy_visibility_tracker
 //                  ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#TAG_ID.
+//                         display_name TAG_ID
 //                         documentation ```kt\nprivate final val TAG_ID: [Error type: Error property type]\n```
 //                  ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#getTAG_ID().
+//                         display_name TAG_ID
 //                         documentation ```kt\nprivate final val TAG_ID: [Error type: Error property type]\n```
 
         /**
@@ -1235,8 +1368,10 @@ class EpoxyVisibilityTracker {
          */
         private fun getTracker(recyclerView: RecyclerView): EpoxyVisibilityTracker? {
 //                  ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#getTracker().
+//                             display_name getTracker
 //                             documentation ```kt\nprivate final fun getTracker(recyclerView: [Error type: Unresolved type for RecyclerView]): com.airbnb.epoxy.EpoxyVisibilityTracker?\n```\n\n----\n\n\n @param recyclerView the view.\n @return the tracker for the given [RecyclerView]. Null if no tracker was attached.\n
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#getTracker().(recyclerView)
+//                                          display_name recyclerView
 //                                          documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
 //                                                          ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#
             return recyclerView.getTag(TAG_ID) as EpoxyVisibilityTracker?
@@ -1253,12 +1388,15 @@ class EpoxyVisibilityTracker {
          */
         private fun setTracker(
 //                  ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#setTracker().
+//                             display_name setTracker
 //                             documentation ```kt\nprivate final fun setTracker(recyclerView: [Error type: Unresolved type for RecyclerView], tracker: com.airbnb.epoxy.EpoxyVisibilityTracker?)\n```\n\n----\n\n\n Store the tracker for the given [RecyclerView].\n @param recyclerView the view\n @param tracker the tracker\n
             recyclerView: RecyclerView,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#setTracker().(recyclerView)
+//                       display_name recyclerView
 //                       documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
             tracker: EpoxyVisibilityTracker?
 //          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#setTracker().(tracker)
+//                  display_name tracker
 //                  documentation ```kt\nvalue-parameter tracker: com.airbnb.epoxy.EpoxyVisibilityTracker?\n```
 //                   ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#
         ) {
@@ -1272,8 +1410,10 @@ class EpoxyVisibilityTracker {
         // Not actionable at runtime. It is only useful for internal test-troubleshooting.
         const val DEBUG_LOG = false
 //                ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#DEBUG_LOG.
+//                          display_name DEBUG_LOG
 //                          documentation ```kt\npublic const final val DEBUG_LOG: kotlin.Boolean\n```
 //                ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyVisibilityTracker#Companion#getDEBUG_LOG().
+//                          display_name DEBUG_LOG
 //                          documentation ```kt\npublic const final val DEBUG_LOG: kotlin.Boolean\n```
     }
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
index 3669423da..a9646f761 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
@@ -3,9 +3,11 @@
 /** Interface applied to generated models to allow the base adapter to interact with them. */
 public interface GeneratedModel<T> {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#
+//                              display_name GeneratedModel
 //                              documentation ```java\npublic interface GeneratedModel<T>\n```
 //                              documentation Interface applied to generated models to allow the base adapter to interact with them. 
 //                              ^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
+//                                display_name T
 //                                documentation ```java\nT\n```
   /**
    * Called on the generated model immediately before the main model onBind method has been called.
@@ -15,15 +17,19 @@ public interface GeneratedModel<T> {
    */
   void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position);
 //     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePreBind().
+//                   display_name handlePreBind
 //                   documentation ```java\npublic abstract void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position)\n```
 //                   documentation  Called on the generated model immediately before the main model onBind method has been called.\n This let's the generated model handle binding setup of its own\n <p>\n The ViewHolder is needed to get the model's adapter position when clicked.\n
 //                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                   ^^^^^^ definition local 0
+//                                          display_name holder
 //                                          documentation ```java\nEpoxyViewHolder holder\n```
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
 //                                             ^^^^^^^^^^^^ definition local 1
+//                                                          display_name objectToBind
 //                                                          documentation ```java\nT objectToBind\n```
 //                                                               ^^^^^^^^ definition local 2
+//                                                                        display_name position
 //                                                                        documentation ```java\nint position\n```
   /**
    * Called on the generated model immediately after the main model onBind method has been called.
@@ -36,11 +42,14 @@ public interface GeneratedModel<T> {
    */
   void handlePostBind(T objectToBind, int position);
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePostBind().
+//                    display_name handlePostBind
 //                    documentation ```java\npublic abstract void handlePostBind(T objectToBind, int position)\n```
 //                    documentation  Called on the generated model immediately after the main model onBind method has been called.\n This let's the generated model handle binding of its own and dispatch calls to its onBind\n listener.\n <p>\n We don't want to rely on the main onBind method to dispatch the onBind listener call because\n there are two onBind methods (one for payloads and one for no payloads), and one can call into\n the other. We don't want to dispatch two onBind listener calls in that case.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
 //                      ^^^^^^^^^^^^ definition local 3
+//                                   display_name objectToBind
 //                                   documentation ```java\nT objectToBind\n```
 //                                        ^^^^^^^^ definition local 4
+//                                                 display_name position
 //                                                 documentation ```java\nint position\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GroupModel.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GroupModel.kt
index d36a47f8c..3541493d9 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GroupModel.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GroupModel.kt
@@ -31,26 +31,32 @@ import androidx.annotation.LayoutRes
 //^^^^^^^^^^^^^^ reference semanticdb maven maven/com.airbnb.android/epoxy-annotations 4.3.1 com/airbnb/epoxy/EpoxyModelClass#`<init>`().
 abstract class GroupModel : EpoxyModelGroup, ModelCollector {
 //             ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#
+//                        display_name GroupModel
 //                        documentation ```kt\npublic abstract class GroupModel : com.airbnb.epoxy.ModelCollector\n```\n\n----\n\n\n An [EpoxyModelGroup] usable in a DSL manner via the [group] extension.\n <p>\n Example:\n ```\n group {\n   id("photos")\n   layout(R.layout.photo_grid)\n\n   // add your models here, example:\n   for (photo in photos) {\n     imageView {\n       id(photo.id)\n       url(photo.url)\n     }\n   }\n }\n ```\n
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelCollector#
 //                                           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelCollector#
     constructor() : super()
 //  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#`<init>`().
+//              display_name GroupModel
 //              documentation ```kt\npublic constructor GroupModel()\n```
     constructor(@LayoutRes layoutRes: Int) : super(layoutRes)
 //  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#`<init>`(+1).
+//              display_name GroupModel
 //              documentation ```kt\npublic constructor GroupModel(layoutRes: kotlin.Int)\n```
 //               ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#`<init>`().
 //                         ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#`<init>`(+1).(layoutRes)
+//                                   display_name layoutRes
 //                                   documentation ```kt\nvalue-parameter layoutRes: kotlin.Int\n```
 //                                    ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                 ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/GroupModel#`<init>`(+1).(layoutRes)
 
     override fun add(model: EpoxyModel<*>) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#add().
+//                   display_name add
 //                   documentation ```kt\npublic open fun add(model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>)\n```
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelCollector#add().
 //                   ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GroupModel#add().(model)
+//                         display_name model
 //                         documentation ```kt\nvalue-parameter model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>\n```
         super.addModel(model)
 //      ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelCollector#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
index 6856550ed..f5f5b46ac 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
@@ -28,6 +28,7 @@
  */
 class HandlerExecutor implements Executor {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#
+//                    display_name HandlerExecutor
 //                    documentation ```java\nclass HandlerExecutor\n```
 //                    documentation  An executor that does it's work via posting to a Handler.\n <p>\n A key feature of this is the runnable is executed synchronously if the current thread is the\n same as the handler's thread.\n
 //                    relationship is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#
@@ -35,13 +36,16 @@ class HandlerExecutor implements Executor {
   final Handler handler;
 //      ^^^^^^^ reference semanticdb maven . . Handler#
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
+//                      display_name handler
 //                      documentation ```java\nfinal unresolved_type handler\n```
 
   HandlerExecutor(Handler handler) {
 //^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#`<init>`().
+//                display_name <init>
 //                documentation ```java\nHandlerExecutor(unresolved_type handler)\n```
 //                ^^^^^^^ reference semanticdb maven . . Handler#
 //                        ^^^^^^^ definition local 0
+//                                display_name handler
 //                                documentation ```java\nunresolved_type handler\n```
     this.handler = handler;
 //       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
@@ -52,11 +56,13 @@ class HandlerExecutor implements Executor {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void execute(@NonNull Runnable command) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#execute().
+//                    display_name execute
 //                    documentation ```java\n@Override\npublic void execute(Runnable command)\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#execute().
 //                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
 //                                      ^^^^^^^ definition local 1
+//                                              display_name command
 //                                              documentation ```java\n@NonNull\nRunnable command\n```
     // If we're already on the same thread then we can execute this synchronously
     if (Looper.myLooper() == handler.getLooper()) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
index 62390223a..f6de05754 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
@@ -19,10 +19,12 @@
  */
 class HiddenEpoxyModel extends EpoxyModel<Space> {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#
+//                     display_name HiddenEpoxyModel
 //                     documentation ```java\nclass HiddenEpoxyModel\n```
 //                     documentation  Used by the {@link EpoxyAdapter} as a placeholder for when {@link EpoxyModel#isShown()} is false.\n Using a zero height and width {@link Space} view, as well as 0 span size, to exclude itself from\n view.\n
 //                     relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
+//                     display_name <init>
 //                     documentation ```java\nHiddenEpoxyModel()\n```
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^ reference semanticdb maven . . Space#
@@ -30,6 +32,7 @@ class HiddenEpoxyModel extends EpoxyModel<Space> {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getDefaultLayout() {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getDefaultLayout().
+//                            display_name getDefaultLayout
 //                            documentation ```java\n@Override\npublic int getDefaultLayout()\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     return R.layout.view_holder_empty_view;
@@ -42,13 +45,17 @@ public int getDefaultLayout() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getSpanSize(int spanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
+//                       display_name getSpanSize
 //                       documentation ```java\n@Override\npublic int getSpanSize(int spanCount, int position, int itemCount)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^ definition local 0
+//                                     display_name spanCount
 //                                     documentation ```java\nint spanCount\n```
 //                                          ^^^^^^^^ definition local 1
+//                                                   display_name position
 //                                                   documentation ```java\nint position\n```
 //                                                        ^^^^^^^^^ definition local 2
+//                                                                  display_name itemCount
 //                                                                  documentation ```java\nint itemCount\n```
     return 0;
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
index 6a2403213..7424ba0a0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
@@ -10,10 +10,12 @@
  */
 public final class IdUtils {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#
+//                         display_name IdUtils
 //                         documentation ```java\npublic final class IdUtils\n```
 //                         documentation  Utilities for generating 64-bit long IDs from types such as {@link CharSequence}.\n
   private IdUtils() {
 //        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#`<init>`().
+//                display_name <init>
 //                documentation ```java\nprivate IdUtils()\n```
   }
 
@@ -27,9 +29,11 @@ private IdUtils() {
    */
   public static long hashLong64Bit(long value) {
 //                   ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#hashLong64Bit().
+//                                 display_name hashLong64Bit
 //                                 documentation ```java\npublic static long hashLong64Bit(long value)\n```
 //                                 documentation  Hash a long into 64 bits instead of the normal 32. This uses a xor shift implementation to\n attempt psuedo randomness so object ids have an even spread for less chance of collisions.\n <p>\n From http://stackoverflow.com/a/11554034\n <p>\n http://www.javamex.com/tutorials/random_numbers/xorshift.shtml\n
 //                                      ^^^^^ definition local 0
+//                                            display_name value
 //                                            documentation ```java\nlong value\n```
     value ^= (value << 21);
 //  ^^^^^ reference local 0
@@ -55,11 +59,13 @@ public static long hashLong64Bit(long value) {
    */
   public static long hashString64Bit(@Nullable CharSequence str) {
 //                   ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
+//                                   display_name hashString64Bit
 //                                   documentation ```java\npublic static long hashString64Bit(CharSequence str)\n```
 //                                   documentation  Hash a string into 64 bits instead of the normal 32. This allows us to better use strings as a\n model id with less chance of collisions. This uses the FNV-1a algorithm for a good mix of speed\n and distribution.\n <p>\n Performance comparisons found at http://stackoverflow.com/a/1660613\n <p>\n Hash implementation from http://www.isthe.com/chongo/tech/comp/fnv/index.html#FNV-1a\n
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                          ^^^ definition local 1
+//                                                              display_name str
 //                                                              documentation ```java\n@Nullable\nCharSequence str\n```
     if (str == null) {
 //      ^^^ reference local 1
@@ -68,14 +74,17 @@ public static long hashString64Bit(@Nullable CharSequence str) {
 
     long result = 0xcbf29ce484222325L;
 //       ^^^^^^ definition local 2
+//              display_name result
 //              documentation ```java\nlong result\n```
     final int len = str.length();
 //            ^^^ definition local 3
+//                display_name len
 //                documentation ```java\nfinal int len\n```
 //                  ^^^ reference local 1
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     for (int i = 0; i < len; i++) {
 //           ^ definition local 4
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 4
 //                      ^^^ reference local 3
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
index 2e6cbbf03..2c966da30 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
@@ -2,6 +2,7 @@
 
 public class IllegalEpoxyUsage extends RuntimeException {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IllegalEpoxyUsage#
+//                             display_name IllegalEpoxyUsage
 //                             documentation ```java\npublic class IllegalEpoxyUsage\n```
 //                             relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/Exception#
@@ -10,9 +11,11 @@ public class IllegalEpoxyUsage extends RuntimeException {
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
   public IllegalEpoxyUsage(String message) {
 //       ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IllegalEpoxyUsage#`<init>`().
+//                         display_name <init>
 //                         documentation ```java\npublic IllegalEpoxyUsage(String message)\n```
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                ^^^^^^^ definition local 0
+//                                        display_name message
 //                                        documentation ```java\nString message\n```
     super(message);
 //  ^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+1).
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
index 57218e88d..cb7da2e45 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
@@ -10,6 +10,7 @@
  */
 class ImmutableModelException extends RuntimeException {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#
+//                            display_name ImmutableModelException
 //                            documentation ```java\nclass ImmutableModelException\n```
 //                            documentation  Thrown if a model is changed after it is added to an {@link com.airbnb.epoxy.EpoxyController}.\n
 //                            relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
@@ -20,6 +21,7 @@ class ImmutableModelException extends RuntimeException {
   private static final String MODEL_CANNOT_BE_CHANGED_MESSAGE =
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#MODEL_CANNOT_BE_CHANGED_MESSAGE.
+//                                                            display_name MODEL_CANNOT_BE_CHANGED_MESSAGE
 //                                                            documentation ```java\nprivate static final String MODEL_CANNOT_BE_CHANGED_MESSAGE\n```
       "Epoxy attribute fields on a model cannot be changed once the model is added to a "
           + "controller. Check that these fields are not updated, or that the assigned objects "
@@ -31,11 +33,14 @@ class ImmutableModelException extends RuntimeException {
 
   ImmutableModelException(EpoxyModel model, int modelPosition) {
 //^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`().
+//                        display_name <init>
 //                        documentation ```java\nImmutableModelException(EpoxyModel model, int modelPosition)\n```
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 0
+//                                         display_name model
 //                                         documentation ```java\nEpoxyModel model\n```
 //                                              ^^^^^^^^^^^^^ definition local 1
+//                                                            display_name modelPosition
 //                                                            documentation ```java\nint modelPosition\n```
     this(model, "", modelPosition);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
@@ -45,15 +50,19 @@ class ImmutableModelException extends RuntimeException {
 
   ImmutableModelException(EpoxyModel model,
 //^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
+//                        display_name <init>
 //                        documentation ```java\nImmutableModelException(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition)\n```
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 2
+//                                         display_name model
 //                                         documentation ```java\nEpoxyModel model\n```
       String descriptionOfWhenChangeHappened, int modelPosition) {
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 3
+//                                           display_name descriptionOfWhenChangeHappened
 //                                           documentation ```java\nString descriptionOfWhenChangeHappened\n```
 //                                                ^^^^^^^^^^^^^ definition local 4
+//                                                              display_name modelPosition
 //                                                              documentation ```java\nint modelPosition\n```
     super(buildMessage(model, descriptionOfWhenChangeHappened, modelPosition));
 //  ^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+1).
@@ -68,15 +77,19 @@ class ImmutableModelException extends RuntimeException {
   private static String buildMessage(EpoxyModel model,
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#buildMessage().
+//                                   display_name buildMessage
 //                                   documentation ```java\n@NonNull\nprivate static String buildMessage(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition)\n```
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 5
+//                                                    display_name model
 //                                                    documentation ```java\nEpoxyModel model\n```
       String descriptionOfWhenChangeHappened, int modelPosition) {
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 6
+//                                           display_name descriptionOfWhenChangeHappened
 //                                           documentation ```java\nString descriptionOfWhenChangeHappened\n```
 //                                                ^^^^^^^^^^^^^ definition local 7
+//                                                              display_name modelPosition
 //                                                              documentation ```java\nint modelPosition\n```
     return new StringBuilder(descriptionOfWhenChangeHappened)
 //             ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/StringBuilder#`<init>`(+2).
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/InternalExposer.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/InternalExposer.kt
index bac8c2c5d..beae3a07b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/InternalExposer.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/InternalExposer.kt
@@ -9,18 +9,23 @@ package com.airbnb.epoxy
 
 internal fun EpoxyViewHolder.objectToBindInternal() = objectToBind()
 //                           ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/InternalExposerKt#objectToBindInternal().
+//                                                display_name objectToBindInternal
 //                                                documentation ```kt\ninternal fun [Error type: Unresolved type for EpoxyViewHolder].objectToBindInternal(): [Error type: Return type for function cannot be resolved]\n```\n\n----\n\n\n Exposes package private things as internal so files in other packages can use them.\n
 
 internal fun EpoxyModel<*>.viewTypeInternal() = viewType
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/InternalExposerKt#viewTypeInternal().
+//                                          display_name viewTypeInternal
 //                                          documentation ```kt\ninternal fun [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>.viewTypeInternal(): [Error type: Error property type]\n```
 internal fun BaseEpoxyAdapter.boundViewHoldersInternal() = boundViewHolders
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/InternalExposerKt#boundViewHoldersInternal().
+//                                                     display_name boundViewHoldersInternal
 //                                                     documentation ```kt\ninternal fun [Error type: Unresolved type for BaseEpoxyAdapter].boundViewHoldersInternal(): [Error type: Error property type]\n```
 internal fun BaseEpoxyAdapter.getModelForPositionInternal(position: Int): EpoxyModel<*>? {
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/InternalExposerKt#getModelForPositionInternal().
+//                                                        display_name getModelForPositionInternal
 //                                                        documentation ```kt\ninternal fun [Error type: Unresolved type for BaseEpoxyAdapter].getModelForPositionInternal(position: kotlin.Int): [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>?\n```
 //                                                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/InternalExposerKt#getModelForPositionInternal().(position)
+//                                                                 display_name position
 //                                                                 documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                                                  ^^^ reference semanticdb maven . . kotlin/Int#
     return getModelForPosition(position)
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
index 658492870..9d63dad3c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
@@ -27,8 +27,10 @@
 
 public class ListenersUtils {
 //           ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#
+//                          display_name ListenersUtils
 //                          documentation ```java\npublic class ListenersUtils\n```
 //           ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#`<init>`().
+//                          display_name <init>
 //                          documentation ```java\npublic ListenersUtils()\n```
 
   @Nullable
@@ -36,13 +38,16 @@ public class ListenersUtils {
   static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
+//                                                  display_name getEpoxyHolderForChildView
 //                                                  documentation ```java\n@Nullable\nstatic EpoxyViewHolder getEpoxyHolderForChildView(unresolved_type v)\n```
 //                                                  ^^^^ reference semanticdb maven . . View#
 //                                                       ^ definition local 0
+//                                                         display_name v
 //                                                         documentation ```java\nunresolved_type v\n```
     RecyclerView recyclerView = findParentRecyclerView(v);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //               ^^^^^^^^^^^^ definition local 1
+//                            display_name recyclerView
 //                            documentation ```java\nunresolved_type recyclerView\n```
 //                              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
 //                                                     ^ reference local 0
@@ -54,6 +59,7 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
     ViewHolder viewHolder = recyclerView.findContainingViewHolder(v);
 //  ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //             ^^^^^^^^^^ definition local 2
+//                        display_name viewHolder
 //                        documentation ```java\nunresolved_type viewHolder\n```
 //                          ^^^^^^^^^^^^ reference local 1
 //                                       ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#findContainingViewHolder#
@@ -79,10 +85,12 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
   private static RecyclerView findParentRecyclerView(@Nullable View v) {
 //               ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
+//                                                   display_name findParentRecyclerView
 //                                                   documentation ```java\n@Nullable\nprivate static unresolved_type findParentRecyclerView(unresolved_type v)\n```
 //                                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                             ^^^^ reference semanticdb maven . . View#
 //                                                                  ^ definition local 3
+//                                                                    display_name v
 //                                                                    documentation ```java\n@Nullable\nunresolved_type v\n```
     if (v == null) {
 //      ^ reference local 3
@@ -92,6 +100,7 @@ private static RecyclerView findParentRecyclerView(@Nullable View v) {
     ViewParent parent = v.getParent();
 //  ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //             ^^^^^^ definition local 4
+//                    display_name parent
 //                    documentation ```java\nunresolved_type parent\n```
 //                      ^ reference local 3
 //                        ^^^^^^^^^ reference semanticdb maven . . View#getParent#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
index f5bd3eb40..85bc8eee6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
@@ -13,6 +13,7 @@
 
 class MainThreadExecutor extends HandlerExecutor {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
+//                       display_name MainThreadExecutor
 //                       documentation ```java\nclass MainThreadExecutor\n```
 //                       relationship is_implementation semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#
 //                       relationship is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#
@@ -20,18 +21,22 @@ class MainThreadExecutor extends HandlerExecutor {
   static final MainThreadExecutor INSTANCE = new MainThreadExecutor(false);
 //             ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
+//                                         display_name INSTANCE
 //                                         documentation ```java\nstatic final MainThreadExecutor INSTANCE\n```
 //                                               ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
   static final MainThreadExecutor ASYNC_INSTANCE = new MainThreadExecutor(true);
 //             ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#ASYNC_INSTANCE.
+//                                               display_name ASYNC_INSTANCE
 //                                               documentation ```java\nstatic final MainThreadExecutor ASYNC_INSTANCE\n```
 //                                                     ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
 
   MainThreadExecutor(boolean async) {
 //^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
+//                   display_name <init>
 //                   documentation ```java\nMainThreadExecutor(boolean async)\n```
 //                           ^^^^^ definition local 0
+//                                 display_name async
 //                                 documentation ```java\nboolean async\n```
     super(async ? AYSNC_MAIN_THREAD_HANDLER : MAIN_THREAD_HANDLER);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#`<init>`().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelCollector.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelCollector.kt
index fe621bfc0..2a901d1fd 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelCollector.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelCollector.kt
@@ -9,13 +9,16 @@ package com.airbnb.epoxy
  */
 interface ModelCollector {
 //        ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelCollector#
+//                       display_name ModelCollector
 //                       documentation ```kt\npublic interface ModelCollector\n```\n\n----\n\n\n Interface used to collect models. Used by [EpoxyController]. It is also convenient to build DSL\n helpers for carousel: @link https://github.com/airbnb/epoxy/issues/847.\n
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/GroupModel#
 
     fun add(model: EpoxyModel<*>)
 //      ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelCollector#add().
+//          display_name add
 //          documentation ```kt\npublic abstract fun add(model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>)\n```
 //          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/GroupModel#add().
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelCollector#add().(model)
+//                display_name model
 //                documentation ```kt\nvalue-parameter model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelGroupHolder.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelGroupHolder.kt
index daa51ea1e..d02c1802b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelGroupHolder.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelGroupHolder.kt
@@ -23,19 +23,26 @@ import java.util.ArrayList
 
 class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder() {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#
+//                     display_name ModelGroupHolder
 //                     documentation ```kt\npublic final class ModelGroupHolder\n```
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#`<init>`().
+//                     display_name ModelGroupHolder
 //                     documentation ```kt\npublic constructor ModelGroupHolder(modelGroupParent: [Error type: Unresolved type for ViewParent])\n```
 //                                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#`<init>`().(modelGroupParent)
+//                                                  display_name modelGroupParent
 //                                                  documentation ```kt\nvalue-parameter modelGroupParent: [Error type: Unresolved type for ViewParent]\n```
 //                                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getModelGroupParent().
+//                                                  display_name modelGroupParent
 //                                                  documentation ```kt\nprivate final val modelGroupParent: [Error type: Unresolved type for ViewParent]\n```
 //                                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#modelGroupParent.
+//                                                  display_name modelGroupParent
 //                                                  documentation ```kt\nprivate final val modelGroupParent: [Error type: Unresolved type for ViewParent]\n```
     val viewHolders = ArrayList<EpoxyViewHolder>(4)
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewHolders().
+//                  display_name viewHolders
 //                  documentation ```kt\npublic final val viewHolders: [Error type: Not found recorded type for ArrayList<EpoxyViewHolder>(4)]\n```
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#viewHolders.
+//                  display_name viewHolders
 //                  documentation ```kt\npublic final val viewHolders: [Error type: Not found recorded type for ArrayList<EpoxyViewHolder>(4)]\n```
 
     /** Use parent pool or create a local pool */
@@ -43,8 +50,10 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 //   ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/VisibleForTesting#`<init>`().
     val viewPool = findViewPool(modelGroupParent)
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewPool().
+//               display_name viewPool
 //               documentation ```kt\npublic final val viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```\n\n----\n\n Use parent pool or create a local pool
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#viewPool.
+//               display_name viewPool
 //               documentation ```kt\npublic final val viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```\n\n----\n\n Use parent pool or create a local pool
 //                 ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#Companion#findViewPool().
 //                              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getModelGroupParent().
@@ -58,39 +67,52 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
      */
     lateinit var rootView: ViewGroup
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getRootView().
+//                        display_name rootView
 //                        documentation ```kt\npublic final lateinit var rootView: [Error type: Unresolved type for ViewGroup]\n```\n\n----\n\n\n Get the root view group (aka\n [androidx.recyclerview.widget.RecyclerView.ViewHolder.itemView].\n You can override [EpoxyModelGroup.bind] and use this method to make custom\n changes to the root view.\n
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#rootView.
+//                        display_name rootView
 //                        documentation ```kt\npublic final lateinit var rootView: [Error type: Unresolved type for ViewGroup]\n```\n\n----\n\n\n Get the root view group (aka\n [androidx.recyclerview.widget.RecyclerView.ViewHolder.itemView].\n You can override [EpoxyModelGroup.bind] and use this method to make custom\n changes to the root view.\n
         private set
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#setRootView().
+//                  display_name set
 //                  documentation ```kt\nprivate final fun `<set-rootView>`(`<set-?>`: [Error type: Unresolved type for ViewGroup])\n```
 
     private lateinit var childContainer: ViewGroup
 //                       ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#childContainer.
+//                                      display_name childContainer
 //                                      documentation ```kt\nprivate final lateinit var childContainer: [Error type: Unresolved type for ViewGroup]\n```
 //                       ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getChildContainer().
+//                                      display_name childContainer
 //                                      documentation ```kt\nprivate final lateinit var childContainer: [Error type: Unresolved type for ViewGroup]\n```
 //                       ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#setChildContainer().
+//                                      display_name childContainer
 //                                      documentation ```kt\nprivate final lateinit var childContainer: [Error type: Unresolved type for ViewGroup]\n```
     private lateinit var stubs: List<ViewStubData>
 //                       ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getStubs().
+//                             display_name stubs
 //                             documentation ```kt\nprivate final lateinit var stubs: kotlin.collections.List<com.airbnb.epoxy.ViewStubData>\n```
 //                       ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#setStubs().
+//                             display_name stubs
 //                             documentation ```kt\nprivate final lateinit var stubs: kotlin.collections.List<com.airbnb.epoxy.ViewStubData>\n```
 //                       ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#stubs.
+//                             display_name stubs
 //                             documentation ```kt\nprivate final lateinit var stubs: kotlin.collections.List<com.airbnb.epoxy.ViewStubData>\n```
 //                              ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#
     private var boundGroup: EpoxyModelGroup? = null
 //              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#boundGroup.
+//                         display_name boundGroup
 //                         documentation ```kt\nprivate final var boundGroup: [Error type: Unresolved type for EpoxyModelGroup]?\n```
 //              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getBoundGroup().
+//                         display_name boundGroup
 //                         documentation ```kt\nprivate final var boundGroup: [Error type: Unresolved type for EpoxyModelGroup]?\n```
 //              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#setBoundGroup().
+//                         display_name boundGroup
 //                         documentation ```kt\nprivate final var boundGroup: [Error type: Unresolved type for EpoxyModelGroup]?\n```
 
     private fun usingStubs(): Boolean = stubs.isNotEmpty()
 //              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#usingStubs().
+//                         display_name usingStubs
 //                         documentation ```kt\nprivate final fun usingStubs(): kotlin.Boolean\n```
 //                            ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
 //                                      ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getStubs().
@@ -100,8 +122,10 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     override fun bindView(itemView: View) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindView().
+//                        display_name bindView
 //                        documentation ```kt\npublic open fun bindView(itemView: [Error type: Unresolved type for View])\n```
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindView().(itemView)
+//                                 display_name itemView
 //                                 documentation ```kt\nvalue-parameter itemView: [Error type: Unresolved type for View]\n```
         if (itemView !is ViewGroup) {
 //          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindView().(itemView)
@@ -148,11 +172,14 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
      */
     private fun findChildContainer(outermostRoot: ViewGroup): ViewGroup {
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#findChildContainer().
+//                                 display_name findChildContainer
 //                                 documentation ```kt\nprivate final fun findChildContainer(outermostRoot: [Error type: Unresolved type for ViewGroup]): [Error type: Unresolved type for ViewGroup]\n```\n\n----\n\n\n By default the outermost viewgroup is used as the container that views are added to. However,\n users can specify a different, nested view group to use as the child container by marking it\n with a special id.\n
 //                                 ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#findChildContainer().(outermostRoot)
+//                                               display_name outermostRoot
 //                                               documentation ```kt\nvalue-parameter outermostRoot: [Error type: Unresolved type for ViewGroup]\n```
         val customRoot = outermostRoot.findViewById<View>(R.id.epoxy_model_group_child_container)
 //          ^^^^^^^^^^ definition local 0
+//                     display_name customRoot
 //                     documentation ```kt\nval customRoot: [Error type: Return type for function cannot be resolved]\n```
 //                       ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#findChildContainer().(outermostRoot)
 
@@ -163,8 +190,10 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     private fun createViewStubData(viewGroup: ViewGroup): List<ViewStubData> {
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#createViewStubData().
+//                                 display_name createViewStubData
 //                                 documentation ```kt\nprivate final fun createViewStubData(viewGroup: [Error type: Unresolved type for ViewGroup]): kotlin.collections.List<com.airbnb.epoxy.ViewStubData>\n```
 //                                 ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#createViewStubData().(viewGroup)
+//                                           display_name viewGroup
 //                                           documentation ```kt\nvalue-parameter viewGroup: [Error type: Unresolved type for ViewGroup]\n```
 //                                                        ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                                                             ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#
@@ -189,23 +218,28 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     private fun collectViewStubs(
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#collectViewStubs().
+//                               display_name collectViewStubs
 //                               documentation ```kt\nprivate final fun collectViewStubs(viewGroup: [Error type: Unresolved type for ViewGroup], stubs: java.util.ArrayList<com.airbnb.epoxy.ViewStubData>)\n```
         viewGroup: ViewGroup,
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#collectViewStubs().(viewGroup)
+//                display_name viewGroup
 //                documentation ```kt\nvalue-parameter viewGroup: [Error type: Unresolved type for ViewGroup]\n```
         stubs: ArrayList<ViewStubData>
 //      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#collectViewStubs().(stubs)
+//            display_name stubs
 //            documentation ```kt\nvalue-parameter stubs: java.util.ArrayList<com.airbnb.epoxy.ViewStubData>\n```
 //             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //                       ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#
     ) {
         for (i in 0 until viewGroup.childCount) {
 //           ^ definition local 1
+//             display_name i
 //             documentation ```kt\nval i: kotlin.Int\n```
 //                  ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/RangesKt#until(+6).
 //                        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#collectViewStubs().(viewGroup)
             val child = viewGroup.getChildAt(i)
 //              ^^^^^ definition local 2
+//                    display_name child
 //                    documentation ```kt\nval child: [Error type: Return type for function cannot be resolved]\n```
 //                      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#collectViewStubs().(viewGroup)
 //                                           ^ reference local 1
@@ -231,11 +265,14 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     fun bindGroupIfNeeded(group: EpoxyModelGroup) {
 //      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindGroupIfNeeded().
+//                        display_name bindGroupIfNeeded
 //                        documentation ```kt\npublic final fun bindGroupIfNeeded(group: [Error type: Unresolved type for EpoxyModelGroup])\n```
 //                        ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindGroupIfNeeded().(group)
+//                              display_name group
 //                              documentation ```kt\nvalue-parameter group: [Error type: Unresolved type for EpoxyModelGroup]\n```
         val previouslyBoundGroup = this.boundGroup
 //          ^^^^^^^^^^^^^^^^^^^^ definition local 3
+//                               display_name previouslyBoundGroup
 //                               documentation ```kt\nval previouslyBoundGroup: [Error type: Unresolved type for EpoxyModelGroup]?\n```
 //                                 ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#boundGroup.
@@ -256,6 +293,7 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 //                                                 ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindGroupIfNeeded().(group)
                 for (i in previouslyBoundGroup.models.size - 1 downTo group.models.size) {
 //                   ^ definition local 4
+//                     display_name i
 //                     documentation ```kt\nval i: [Error type: Return type for function cannot be resolved]\n```
 //                        ^^^^^^^^^^^^^^^^^^^^ reference local 3
 //                                                                    ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindGroupIfNeeded().(group)
@@ -274,10 +312,12 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 //                        ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindGroupIfNeeded().(group)
         val models = group.models
 //          ^^^^^^ definition local 5
+//                 display_name models
 //                 documentation ```kt\nval models: [Error type: Error property type]\n```
 //                   ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#bindGroupIfNeeded().(group)
         val modelCount = models.size
 //          ^^^^^^^^^^ definition local 6
+//                     display_name modelCount
 //                     documentation ```kt\nval modelCount: [Error type: Error property type]\n```
 //                       ^^^^^^ reference local 5
 
@@ -307,21 +347,25 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
         for (i in 0 until modelCount) {
 //           ^ definition local 7
+//             display_name i
 //             documentation ```kt\nval i: kotlin.Int\n```
 //                  ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/RangesKt#until(+6).
 //                        ^^^^^^^^^^ reference local 6
             val model = models[i]
 //              ^^^^^ definition local 8
+//                    display_name model
 //                    documentation ```kt\nval model: [Error type: Return type for function cannot be resolved]\n```
 //                      ^^^^^^ reference local 5
 //                             ^ reference local 7
             val previouslyBoundModel = previouslyBoundGroup?.models?.getOrNull(i)
 //              ^^^^^^^^^^^^^^^^^^^^ definition local 9
+//                                   display_name previouslyBoundModel
 //                                   documentation ```kt\nval previouslyBoundModel: [Error type: Return type for function cannot be resolved]?\n```
 //                                     ^^^^^^^^^^^^^^^^^^^^ reference local 3
 //                                                                             ^ reference local 7
             val stubData = stubs.getOrNull(i)
 //              ^^^^^^^^ definition local 10
+//                       display_name stubData
 //                       documentation ```kt\nval stubData: com.airbnb.epoxy.ViewStubData?\n```
 //                         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getStubs().
 //                         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#setStubs().
@@ -330,6 +374,7 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 //                                         ^ reference local 7
             val parent = stubData?.viewGroup ?: childContainer
 //              ^^^^^^ definition local 11
+//                     display_name parent
 //                     documentation ```kt\nval parent: ???\n```
 //                       ^^^^^^^^ reference local 10
 //                                 ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#getViewGroup().
@@ -354,6 +399,7 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
             val holder = getViewHolder(parent, model)
 //              ^^^^^^ definition local 12
+//                     display_name holder
 //                     documentation ```kt\nval holder: [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                       ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewHolder().
 //                                     ^^^^^^ reference local 11
@@ -388,10 +434,13 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     private fun areSameViewType(model1: EpoxyModel<*>, model2: EpoxyModel<*>?): Boolean {
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#areSameViewType().
+//                              display_name areSameViewType
 //                              documentation ```kt\nprivate final fun areSameViewType(model1: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, model2: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>?): kotlin.Boolean\n```
 //                              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#areSameViewType().(model1)
+//                                     display_name model1
 //                                     documentation ```kt\nvalue-parameter model1: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>\n```
 //                                                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#areSameViewType().(model2)
+//                                                            display_name model2
 //                                                            documentation ```kt\nvalue-parameter model2: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>?\n```
 //                                                                              ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         return ViewTypeManager.getViewType(model1) == ViewTypeManager.getViewType(model2)
@@ -401,17 +450,22 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     private fun getViewHolder(parent: ViewGroup, model: EpoxyModel<*>): EpoxyViewHolder {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewHolder().
+//                            display_name getViewHolder
 //                            documentation ```kt\nprivate final fun getViewHolder(parent: [Error type: Unresolved type for ViewGroup], model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>): [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewHolder().(parent)
+//                                   display_name parent
 //                                   documentation ```kt\nvalue-parameter parent: [Error type: Unresolved type for ViewGroup]\n```
 //                                               ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewHolder().(model)
+//                                                     display_name model
 //                                                     documentation ```kt\nvalue-parameter model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>\n```
         val viewType = ViewTypeManager.getViewType(model)
 //          ^^^^^^^^ definition local 13
+//                   display_name viewType
 //                   documentation ```kt\nval viewType: [Error type: Return type for function cannot be resolved]\n```
 //                                                 ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewHolder().(model)
         val recycledView = viewPool.getRecycledView(viewType)
 //          ^^^^^^^^^^^^ definition local 14
+//                       display_name recycledView
 //                       documentation ```kt\nval recycledView: [Error type: Return type for function cannot be resolved]\n```
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewPool().
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#viewPool.
@@ -437,6 +491,7 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     fun unbindGroup() {
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#unbindGroup().
+//                  display_name unbindGroup
 //                  documentation ```kt\npublic final fun unbindGroup()\n```
         if (boundGroup == null) {
 //          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#boundGroup.
@@ -465,8 +520,10 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     private fun removeAndRecycleView(modelPosition: Int) {
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#removeAndRecycleView().
+//                                   display_name removeAndRecycleView
 //                                   documentation ```kt\nprivate final fun removeAndRecycleView(modelPosition: kotlin.Int)\n```
 //                                   ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#removeAndRecycleView().(modelPosition)
+//                                                 display_name modelPosition
 //                                                 documentation ```kt\nvalue-parameter modelPosition: kotlin.Int\n```
 //                                                  ^^^ reference semanticdb maven . . kotlin/Int#
         if (usingStubs()) {
@@ -487,6 +544,7 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
         val viewHolder = viewHolders.removeAt(modelPosition)
 //          ^^^^^^^^^^ definition local 15
+//                     display_name viewHolder
 //                     documentation ```kt\nval viewHolder: [Error type: Return type for function cannot be resolved]\n```
 //                       ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#getViewHolders().
 //                       ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#viewHolders.
@@ -501,22 +559,28 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
     companion object {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#Companion# 1:0
+//                     display_name Companion
 //                     documentation ```kt\npublic companion object\n```
 
         private val HELPER_ADAPTER = HelperAdapter()
 //                  ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#Companion#HELPER_ADAPTER.
+//                                 display_name HELPER_ADAPTER
 //                                 documentation ```kt\nprivate final val HELPER_ADAPTER: com.airbnb.epoxy.HelperAdapter\n```
 //                  ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#Companion#getHELPER_ADAPTER().
+//                                 display_name HELPER_ADAPTER
 //                                 documentation ```kt\nprivate final val HELPER_ADAPTER: com.airbnb.epoxy.HelperAdapter\n```
 //                                   ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HelperAdapter#`<init>`().
 
         private fun findViewPool(view: ViewParent): RecyclerView.RecycledViewPool {
 //                  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#Companion#findViewPool().
+//                               display_name findViewPool
 //                               documentation ```kt\nprivate final fun findViewPool(view: [Error type: Unresolved type for ViewParent]): [Error type: Unresolved type for RecyclerView.RecycledViewPool]\n```
 //                               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#Companion#findViewPool().(view)
+//                                    display_name view
 //                                    documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for ViewParent]\n```
             var viewPool: RecyclerView.RecycledViewPool? = null
 //              ^^^^^^^^ definition local 16
+//                       display_name viewPool
 //                       documentation ```kt\nvar viewPool: [Error type: Unresolved type for RecyclerView.RecycledViewPool]?\n```
             while (viewPool == null) {
 //                 ^^^^^^^^ reference local 16
@@ -528,6 +592,7 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
                 } else {
                     val parent = view.parent
 //                      ^^^^^^ definition local 17
+//                             display_name parent
 //                             documentation ```kt\nval parent: [Error type: Error property type]\n```
 //                               ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#Companion#findViewPool().(view)
                     if (parent is ViewParent) {
@@ -550,39 +615,53 @@ class ModelGroupHolder(private val modelGroupParent: ViewParent) : EpoxyHolder()
 
 private class ViewStubData(
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#
+//                         display_name ViewStubData
 //                         documentation ```kt\nprivate final class ViewStubData\n```
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#`<init>`().
+//                         display_name ViewStubData
 //                         documentation ```kt\npublic constructor ViewStubData(viewGroup: [Error type: Unresolved type for ViewGroup], viewStub: [Error type: Unresolved type for ViewStub], position: kotlin.Int)\n```
     val viewGroup: ViewGroup,
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#`<init>`().(viewGroup)
+//                display_name viewGroup
 //                documentation ```kt\nvalue-parameter viewGroup: [Error type: Unresolved type for ViewGroup]\n```
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#getViewGroup().
+//                display_name viewGroup
 //                documentation ```kt\npublic final val viewGroup: [Error type: Unresolved type for ViewGroup]\n```
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#viewGroup.
+//                display_name viewGroup
 //                documentation ```kt\npublic final val viewGroup: [Error type: Unresolved type for ViewGroup]\n```
     val viewStub: ViewStub,
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#`<init>`().(viewStub)
+//               display_name viewStub
 //               documentation ```kt\nvalue-parameter viewStub: [Error type: Unresolved type for ViewStub]\n```
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#getViewStub().
+//               display_name viewStub
 //               documentation ```kt\npublic final val viewStub: [Error type: Unresolved type for ViewStub]\n```
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#viewStub.
+//               display_name viewStub
 //               documentation ```kt\npublic final val viewStub: [Error type: Unresolved type for ViewStub]\n```
     val position: Int
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#`<init>`().(position)
+//               display_name position
 //               documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#getPosition().
+//               display_name position
 //               documentation ```kt\npublic final val position: kotlin.Int\n```
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#position.
+//               display_name position
 //               documentation ```kt\npublic final val position: kotlin.Int\n```
 //                ^^^ reference semanticdb maven . . kotlin/Int#
 ) {
 
     fun setView(view: View, useStubLayoutParams: Boolean) {
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#setView().
+//              display_name setView
 //              documentation ```kt\npublic final fun setView(view: [Error type: Unresolved type for View], useStubLayoutParams: kotlin.Boolean)\n```
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#setView().(view)
+//                   display_name view
 //                   documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                          ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#setView().(useStubLayoutParams)
+//                                              display_name useStubLayoutParams
 //                                              documentation ```kt\nvalue-parameter useStubLayoutParams: kotlin.Boolean\n```
 //                                               ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         removeCurrentView()
@@ -591,6 +670,7 @@ private class ViewStubData(
         // Carry over the stub id manually since we aren't inflating via the stub
         val inflatedId = viewStub.inflatedId
 //          ^^^^^^^^^^ definition local 18
+//                     display_name inflatedId
 //                     documentation ```kt\nval inflatedId: [Error type: Error property type]\n```
 //                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#getViewStub().
 //                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#viewStub.
@@ -623,6 +703,7 @@ private class ViewStubData(
 
     fun resetStub() {
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#resetStub().
+//                display_name resetStub
 //                documentation ```kt\npublic final fun resetStub()\n```
         removeCurrentView()
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#removeCurrentView().
@@ -637,9 +718,11 @@ private class ViewStubData(
 
     private fun removeCurrentView() {
 //              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewStubData#removeCurrentView().
+//                                display_name removeCurrentView
 //                                documentation ```kt\nprivate final fun removeCurrentView()\n```
         val view = viewGroup.getChildAt(position)
 //          ^^^^ definition local 19
+//               display_name view
 //               documentation ```kt\nval view: kotlin.Nothing\n```
 //                 ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#getViewGroup().
 //                 ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewStubData#viewGroup.
@@ -661,8 +744,10 @@ private class ViewStubData(
  */
 private class LocalGroupRecycledViewPool : RecyclerView.RecycledViewPool()
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/LocalGroupRecycledViewPool#
+//                                       display_name LocalGroupRecycledViewPool
 //                                       documentation ```kt\nprivate final class LocalGroupRecycledViewPool\n```\n\n----\n\n\n Local pool to the [ModelGroupHolder]\n
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/LocalGroupRecycledViewPool#`<init>`().
+//                                       display_name LocalGroupRecycledViewPool
 //                                       documentation ```kt\npublic constructor LocalGroupRecycledViewPool()\n```\n\n----\n\n\n Local pool to the [ModelGroupHolder]\n
 
 /**
@@ -671,39 +756,52 @@ private class LocalGroupRecycledViewPool : RecyclerView.RecycledViewPool()
  */
 private class HelperAdapter : RecyclerView.Adapter<EpoxyViewHolder>() {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#
+//                          display_name HelperAdapter
 //                          documentation ```kt\nprivate final class HelperAdapter\n```\n\n----\n\n\n A viewholder's viewtype can only be set internally in an adapter when the viewholder\n is created. To work around that we do the creation in an adapter.\n
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#`<init>`().
+//                          display_name HelperAdapter
 //                          documentation ```kt\npublic constructor HelperAdapter()\n```\n\n----\n\n\n A viewholder's viewtype can only be set internally in an adapter when the viewholder\n is created. To work around that we do the creation in an adapter.\n
 
     private var model: EpoxyModel<*>? = null
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#getModel().
+//                    display_name model
 //                    documentation ```kt\nprivate final var model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>?\n```
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#model.
+//                    display_name model
 //                    documentation ```kt\nprivate final var model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>?\n```
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#setModel().
+//                    display_name model
 //                    documentation ```kt\nprivate final var model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>?\n```
     private var modelGroupParent: ViewParent? = null
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#getModelGroupParent().
+//                               display_name modelGroupParent
 //                               documentation ```kt\nprivate final var modelGroupParent: [Error type: Unresolved type for ViewParent]?\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#modelGroupParent.
+//                               display_name modelGroupParent
 //                               documentation ```kt\nprivate final var modelGroupParent: [Error type: Unresolved type for ViewParent]?\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#setModelGroupParent().
+//                               display_name modelGroupParent
 //                               documentation ```kt\nprivate final var modelGroupParent: [Error type: Unresolved type for ViewParent]?\n```
 
     fun createViewHolder(
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#createViewHolder().
+//                       display_name createViewHolder
 //                       documentation ```kt\npublic final fun createViewHolder(modelGroupParent: [Error type: Unresolved type for ViewParent], model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, parent: [Error type: Unresolved type for ViewGroup], viewType: kotlin.Int): [Error type: Unresolved type for EpoxyViewHolder]\n```
         modelGroupParent: ViewParent,
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#createViewHolder().(modelGroupParent)
+//                       display_name modelGroupParent
 //                       documentation ```kt\nvalue-parameter modelGroupParent: [Error type: Unresolved type for ViewParent]\n```
         model: EpoxyModel<*>,
 //      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#createViewHolder().(model)
+//            display_name model
 //            documentation ```kt\nvalue-parameter model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>\n```
         parent: ViewGroup,
 //      ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#createViewHolder().(parent)
+//             display_name parent
 //             documentation ```kt\nvalue-parameter parent: [Error type: Unresolved type for ViewGroup]\n```
         viewType: Int
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#createViewHolder().(viewType)
+//               display_name viewType
 //               documentation ```kt\nvalue-parameter viewType: kotlin.Int\n```
 //                ^^^ reference semanticdb maven . . kotlin/Int#
     ): EpoxyViewHolder {
@@ -721,6 +819,7 @@ private class HelperAdapter : RecyclerView.Adapter<EpoxyViewHolder>() {
 //                              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HelperAdapter#createViewHolder().(modelGroupParent)
         val viewHolder = createViewHolder(parent, viewType)
 //          ^^^^^^^^^^ definition local 20
+//                     display_name viewHolder
 //                     documentation ```kt\nval viewHolder: [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HelperAdapter#createViewHolder().
 //                                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HelperAdapter#createViewHolder().(parent)
@@ -741,10 +840,13 @@ private class HelperAdapter : RecyclerView.Adapter<EpoxyViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EpoxyViewHolder {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#onCreateViewHolder().
+//                                  display_name onCreateViewHolder
 //                                  documentation ```kt\npublic open fun onCreateViewHolder(parent: [Error type: Unresolved type for ViewGroup], viewType: kotlin.Int): [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                                  ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#onCreateViewHolder().(parent)
+//                                         display_name parent
 //                                         documentation ```kt\nvalue-parameter parent: [Error type: Unresolved type for ViewGroup]\n```
 //                                                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#onCreateViewHolder().(viewType)
+//                                                              display_name viewType
 //                                                              documentation ```kt\nvalue-parameter viewType: kotlin.Int\n```
 //                                                               ^^^ reference semanticdb maven . . kotlin/Int#
         return EpoxyViewHolder(modelGroupParent, model!!.buildView(parent), model!!.shouldSaveViewState())
@@ -762,15 +864,19 @@ private class HelperAdapter : RecyclerView.Adapter<EpoxyViewHolder>() {
 
     override fun onBindViewHolder(holder: EpoxyViewHolder, position: Int) {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#onBindViewHolder().
+//                                display_name onBindViewHolder
 //                                documentation ```kt\npublic open fun onBindViewHolder(holder: [Error type: Unresolved type for EpoxyViewHolder], position: kotlin.Int)\n```
 //                                ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#onBindViewHolder().(holder)
+//                                       display_name holder
 //                                       documentation ```kt\nvalue-parameter holder: [Error type: Unresolved type for EpoxyViewHolder]\n```
 //                                                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#onBindViewHolder().(position)
+//                                                                  display_name position
 //                                                                  documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                                                   ^^^ reference semanticdb maven . . kotlin/Int#
     }
 
     override fun getItemCount() = 1
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HelperAdapter#getItemCount().
+//                            display_name getItemCount
 //                            documentation ```kt\npublic open fun getItemCount(): kotlin.Int\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
index 275d6f0b3..f039dce1b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
@@ -45,6 +45,7 @@
  */
 class ModelList extends ArrayList<EpoxyModel<?>> {
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#
+//              display_name ModelList
 //              documentation ```java\nclass ModelList\n```
 //              documentation  Used by our {@link EpoxyAdapter} to track models. It simply wraps ArrayList and notifies an\n observer when remove or insertion operations are done on the list. This allows us to optimize\n diffing since we have a knowledge of what changed in the list.\n
 //              relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
@@ -61,8 +62,10 @@ class ModelList extends ArrayList<EpoxyModel<?>> {
 
   ModelList(int expectedModelCount) {
 //^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`().
+//          display_name <init>
 //          documentation ```java\nModelList(int expectedModelCount)\n```
 //              ^^^^^^^^^^^^^^^^^^ definition local 0
+//                                 display_name expectedModelCount
 //                                 documentation ```java\nint expectedModelCount\n```
     super(expectedModelCount);
 //  ^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
@@ -71,39 +74,50 @@ class ModelList extends ArrayList<EpoxyModel<?>> {
 
   ModelList() {
 //^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`(+1).
+//          display_name <init>
 //          documentation ```java\nModelList()\n```
 
   }
 
   interface ModelListObserver {
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
+//                            display_name ModelListObserver
 //                            documentation ```java\ninterface ModelListObserver\n```
     void onItemRangeInserted(int positionStart, int itemCount);
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
+//                           display_name onItemRangeInserted
 //                           documentation ```java\npublic abstract void onItemRangeInserted(int positionStart, int itemCount)\n```
 //                               ^^^^^^^^^^^^^ definition local 1
+//                                             display_name positionStart
 //                                             documentation ```java\nint positionStart\n```
 //                                                  ^^^^^^^^^ definition local 2
+//                                                            display_name itemCount
 //                                                            documentation ```java\nint itemCount\n```
     void onItemRangeRemoved(int positionStart, int itemCount);
 //       ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
+//                          display_name onItemRangeRemoved
 //                          documentation ```java\npublic abstract void onItemRangeRemoved(int positionStart, int itemCount)\n```
 //                              ^^^^^^^^^^^^^ definition local 3
+//                                            display_name positionStart
 //                                            documentation ```java\nint positionStart\n```
 //                                                 ^^^^^^^^^ definition local 4
+//                                                           display_name itemCount
 //                                                           documentation ```java\nint itemCount\n```
   }
 
   private boolean notificationsPaused;
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
+//                                    display_name notificationsPaused
 //                                    documentation ```java\nprivate boolean notificationsPaused\n```
   private ModelListObserver observer;
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
+//                                   display_name observer
 //                                   documentation ```java\nprivate ModelListObserver observer\n```
 
   void pauseNotifications() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#pauseNotifications().
+//                        display_name pauseNotifications
 //                        documentation ```java\nvoid pauseNotifications()\n```
     if (notificationsPaused) {
 //      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
@@ -116,6 +130,7 @@ void pauseNotifications() {
 
   void resumeNotifications() {
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#resumeNotifications().
+//                         display_name resumeNotifications
 //                         documentation ```java\nvoid resumeNotifications()\n```
     if (!notificationsPaused) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
@@ -128,9 +143,11 @@ void resumeNotifications() {
 
   void setObserver(ModelListObserver observer) {
 //     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#setObserver().
+//                 display_name setObserver
 //                 documentation ```java\nvoid setObserver(ModelListObserver observer)\n```
 //                 ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                                   ^^^^^^^^ definition local 5
+//                                            display_name observer
 //                                            documentation ```java\nModelListObserver observer\n```
     this.observer = observer;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
@@ -139,10 +156,13 @@ void setObserver(ModelListObserver observer) {
 
   private void notifyInsertion(int positionStart, int itemCount) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
+//                             display_name notifyInsertion
 //                             documentation ```java\nprivate void notifyInsertion(int positionStart, int itemCount)\n```
 //                                 ^^^^^^^^^^^^^ definition local 6
+//                                               display_name positionStart
 //                                               documentation ```java\nint positionStart\n```
 //                                                    ^^^^^^^^^ definition local 7
+//                                                              display_name itemCount
 //                                                              documentation ```java\nint itemCount\n```
     if (!notificationsPaused && observer != null) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
@@ -157,10 +177,13 @@ private void notifyInsertion(int positionStart, int itemCount) {
 
   private void notifyRemoval(int positionStart, int itemCount) {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notifyRemoval().
+//                           display_name notifyRemoval
 //                           documentation ```java\nprivate void notifyRemoval(int positionStart, int itemCount)\n```
 //                               ^^^^^^^^^^^^^ definition local 8
+//                                             display_name positionStart
 //                                             documentation ```java\nint positionStart\n```
 //                                                  ^^^^^^^^^ definition local 9
+//                                                            display_name itemCount
 //                                                            documentation ```java\nint itemCount\n```
     if (!notificationsPaused && observer != null) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
@@ -178,18 +201,22 @@ private void notifyRemoval(int positionStart, int itemCount) {
   public EpoxyModel<?> set(int index, EpoxyModel<?> element) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#set().
+//                         display_name set
 //                         documentation ```java\n@Override\npublic EpoxyModel<?> set(int index, EpoxyModel<?> element)\n```
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#set().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#set().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#set().
 //                             ^^^^^ definition local 10
+//                                   display_name index
 //                                   documentation ```java\nint index\n```
 //                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^ definition local 11
+//                                                          display_name element
 //                                                          documentation ```java\nEpoxyModel<?> element\n```
     EpoxyModel<?> previousModel = super.set(index, element);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^^^^^^^^^ definition local 12
+//                              display_name previousModel
 //                              documentation ```java\nEpoxyModel<?> previousModel\n```
 //                                ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#super.
 //                                      ^^^ reference semanticdb maven jdk 11 java/util/ArrayList#set().
@@ -217,6 +244,7 @@ public EpoxyModel<?> set(int index, EpoxyModel<?> element) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean add(EpoxyModel<?> epoxyModel) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#add().
+//                   display_name add
 //                   documentation ```java\n@Override\npublic boolean add(EpoxyModel<?> epoxyModel)\n```
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#add().
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add().
@@ -225,6 +253,7 @@ public boolean add(EpoxyModel<?> epoxyModel) {
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#add().
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                 ^^^^^^^^^^ definition local 13
+//                                            display_name epoxyModel
 //                                            documentation ```java\nEpoxyModel<?> epoxyModel\n```
     notifyInsertion(size(), 1);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
@@ -239,14 +268,17 @@ public boolean add(EpoxyModel<?> epoxyModel) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void add(int index, EpoxyModel<?> element) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#add(+1).
+//                display_name add
 //                documentation ```java\n@Override\npublic void add(int index, EpoxyModel<?> element)\n```
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add(+1).
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#add(+1).
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#add(+1).
 //                    ^^^^^ definition local 14
+//                          display_name index
 //                          documentation ```java\nint index\n```
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^^^ definition local 15
+//                                                 display_name element
 //                                                 documentation ```java\nEpoxyModel<?> element\n```
     notifyInsertion(index, 1);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
@@ -262,6 +294,7 @@ public void add(int index, EpoxyModel<?> element) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean addAll(Collection<? extends EpoxyModel<?>> c) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#addAll().
+//                      display_name addAll
 //                      documentation ```java\n@Override\npublic boolean addAll(Collection<? extends EpoxyModel<?>> c)\n```
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#addAll().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#addAll().
@@ -270,6 +303,7 @@ public boolean addAll(Collection<? extends EpoxyModel<?>> c) {
 //                      ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^ definition local 16
+//                                                            display_name c
 //                                                            documentation ```java\nCollection<? extends EpoxyModel<?>> c\n```
     notifyInsertion(size(), c.size());
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
@@ -286,15 +320,18 @@ public boolean addAll(Collection<? extends EpoxyModel<?>> c) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean addAll(int index, Collection<? extends EpoxyModel<?>> c) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
+//                      display_name addAll
 //                      documentation ```java\n@Override\npublic boolean addAll(int index, Collection<? extends EpoxyModel<?>> c)\n```
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#addAll().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#addAll(+1).
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#addAll(+1).
 //                          ^^^^^ definition local 17
+//                                display_name index
 //                                documentation ```java\nint index\n```
 //                                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ definition local 18
+//                                                                       display_name c
 //                                                                       documentation ```java\nCollection<? extends EpoxyModel<?>> c\n```
     notifyInsertion(index, c.size());
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
@@ -313,11 +350,13 @@ public boolean addAll(int index, Collection<? extends EpoxyModel<?>> c) {
   public EpoxyModel<?> remove(int index) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#remove().
+//                            display_name remove
 //                            documentation ```java\n@Override\npublic EpoxyModel<?> remove(int index)\n```
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#remove().
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#remove().
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#remove(+1).
 //                                ^^^^^ definition local 19
+//                                      display_name index
 //                                      documentation ```java\nint index\n```
     notifyRemoval(index, 1);
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyRemoval().
@@ -332,6 +371,7 @@ public EpoxyModel<?> remove(int index) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean remove(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#remove(+1).
+//                      display_name remove
 //                      documentation ```java\n@Override\npublic boolean remove(Object o)\n```
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#remove().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#remove(+1).
@@ -339,9 +379,11 @@ public boolean remove(Object o) {
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#remove().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 20
+//                               display_name o
 //                               documentation ```java\nObject o\n```
     int index = indexOf(o);
 //      ^^^^^ definition local 21
+//            display_name index
 //            documentation ```java\nint index\n```
 //              ^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#indexOf().
 //                      ^ reference local 20
@@ -365,6 +407,7 @@ public boolean remove(Object o) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void clear() {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#clear().
+//                  display_name clear
 //                  documentation ```java\n@Override\npublic void clear()\n```
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#clear().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#clear().
@@ -386,12 +429,15 @@ public void clear() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected void removeRange(int fromIndex, int toIndex) {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#removeRange().
+//                           display_name removeRange
 //                           documentation ```java\n@Override\nprotected void removeRange(int fromIndex, int toIndex)\n```
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#removeRange().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#removeRange().
 //                               ^^^^^^^^^ definition local 22
+//                                         display_name fromIndex
 //                                         documentation ```java\nint fromIndex\n```
 //                                              ^^^^^^^ definition local 23
+//                                                      display_name toIndex
 //                                                      documentation ```java\nint toIndex\n```
     if (fromIndex == toIndex) {
 //      ^^^^^^^^^ reference local 22
@@ -415,6 +461,7 @@ protected void removeRange(int fromIndex, int toIndex) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean removeAll(Collection<?> collection) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#removeAll().
+//                         display_name removeAll
 //                         documentation ```java\n@Override\npublic boolean removeAll(Collection<?> collection)\n```
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#removeAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#removeAll().
@@ -422,16 +469,19 @@ public boolean removeAll(Collection<?> collection) {
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#removeAll().
 //                         ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                       ^^^^^^^^^^ definition local 24
+//                                                  display_name collection
 //                                                  documentation ```java\nCollection<?> collection\n```
     // Using this implementation from the Android ArrayList since the Java 1.8 ArrayList
     // doesn't call through to remove. Calling through to remove lets us leverage the notification
     // done there
     boolean result = false;
 //          ^^^^^^ definition local 25
+//                 display_name result
 //                 documentation ```java\nboolean result\n```
     Iterator<?> it = iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //              ^^ definition local 26
+//                 display_name it
 //                 documentation ```java\nIterator<?> it\n```
 //                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
     while (it.hasNext()) {
@@ -457,6 +507,7 @@ public boolean removeAll(Collection<?> collection) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean retainAll(Collection<?> collection) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#retainAll().
+//                         display_name retainAll
 //                         documentation ```java\n@Override\npublic boolean retainAll(Collection<?> collection)\n```
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#retainAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#retainAll().
@@ -464,16 +515,19 @@ public boolean retainAll(Collection<?> collection) {
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#retainAll().
 //                         ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                       ^^^^^^^^^^ definition local 27
+//                                                  display_name collection
 //                                                  documentation ```java\nCollection<?> collection\n```
     // Using this implementation from the Android ArrayList since the Java 1.8 ArrayList
     // doesn't call through to remove. Calling through to remove lets us leverage the notification
     // done there
     boolean result = false;
 //          ^^^^^^ definition local 28
+//                 display_name result
 //                 documentation ```java\nboolean result\n```
     Iterator<?> it = iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //              ^^ definition local 29
+//                 display_name it
 //                 documentation ```java\nIterator<?> it\n```
 //                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
     while (it.hasNext()) {
@@ -503,6 +557,7 @@ public Iterator<EpoxyModel<?>> iterator() {
 //       ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
+//                                        display_name iterator
 //                                        documentation ```java\n@NonNull\n@Override\npublic Iterator<EpoxyModel<?>> iterator()\n```
 //                                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
 //                                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#iterator().
@@ -522,26 +577,32 @@ public Iterator<EpoxyModel<?>> iterator() {
    */
   private class Itr implements Iterator<EpoxyModel<?>> {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#
+//                  display_name Itr
 //                  documentation ```java\nprivate class Itr\n```
 //                  documentation  An Iterator implementation that calls through to the parent list's methods for modification.\n Some implementations, like the Android ArrayList.ArrayListIterator class, modify the list data\n directly instead of calling into the parent list's methods. We need the implementation to call\n the parent methods so that the proper notifications are done.\n
 //                  relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#`<init>`().
+//                  display_name <init>
 //                  documentation ```java\nprivate Itr()\n```
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
     int cursor;       // index of next element to return
 //      ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
+//             display_name cursor
 //             documentation ```java\nint cursor\n```
     int lastRet = -1; // index of last element returned; -1 if no such
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#lastRet.
+//              display_name lastRet
 //              documentation ```java\nint lastRet\n```
     int expectedModCount = modCount;
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#expectedModCount.
+//                       display_name expectedModCount
 //                       documentation ```java\nint expectedModCount\n```
 //                         ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 
     public boolean hasNext() {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#hasNext().
+//                         display_name hasNext
 //                         documentation ```java\npublic boolean hasNext()\n```
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
       return cursor != size();
@@ -554,12 +615,14 @@ public boolean hasNext() {
     public EpoxyModel<?> next() {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#next().
+//                            display_name next
 //                            documentation ```java\n@SuppressWarnings("unchecked")\npublic EpoxyModel<?> next()\n```
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
       int i = cursor;
 //        ^ definition local 30
+//          display_name i
 //          documentation ```java\nint i\n```
 //            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
       cursor = i + 1;
@@ -577,6 +640,7 @@ public EpoxyModel<?> next() {
 
     public void remove() {
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#remove().
+//                     display_name remove
 //                     documentation ```java\npublic void remove()\n```
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
       if (lastRet < 0) {
@@ -604,6 +668,7 @@ public void remove() {
       } catch (IndexOutOfBoundsException ex) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
 //                                       ^^ definition local 31
+//                                          display_name ex
 //                                          documentation ```java\nIndexOutOfBoundsException ex\n```
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
@@ -612,6 +677,7 @@ public void remove() {
 
     final void checkForComodification() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
+//                                    display_name checkForComodification
 //                                    documentation ```java\nfinal void checkForComodification()\n```
       if (modCount != expectedModCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
@@ -630,6 +696,7 @@ public ListIterator<EpoxyModel<?>> listIterator() {
 //       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#listIterator().
+//                                                display_name listIterator
 //                                                documentation ```java\n@NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator()\n```
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator().
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#listIterator(+1).
@@ -646,11 +713,13 @@ public ListIterator<EpoxyModel<?>> listIterator(int index) {
 //       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#listIterator(+1).
+//                                                display_name listIterator
 //                                                documentation ```java\n@NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator(int index)\n```
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator(+1).
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#listIterator().
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#listIterator(+1).
 //                                                    ^^^^^ definition local 32
+//                                                          display_name index
 //                                                          documentation ```java\nint index\n```
     return new ListItr(index);
 //             ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#`<init>`().
@@ -665,6 +734,7 @@ public ListIterator<EpoxyModel<?>> listIterator(int index) {
    */
   private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#
+//                      display_name ListItr
 //                      documentation ```java\nprivate class ListItr\n```
 //                      documentation  A ListIterator implementation that calls through to the parent list's methods for modification.\n Some implementations may modify the list data directly instead of calling into the parent\n list's methods. We need the implementation to call the parent methods so that the proper\n notifications are done.\n
 //                      relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#
@@ -675,8 +745,10 @@ private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
     ListItr(int index) {
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#`<init>`().
+//          display_name <init>
 //          documentation ```java\nListItr(int index)\n```
 //              ^^^^^ definition local 33
+//                    display_name index
 //                    documentation ```java\nint index\n```
       cursor = index;
 //    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -685,6 +757,7 @@ private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
 
     public boolean hasPrevious() {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#hasPrevious().
+//                             display_name hasPrevious
 //                             documentation ```java\npublic boolean hasPrevious()\n```
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasPrevious().
       return cursor != 0;
@@ -693,6 +766,7 @@ public boolean hasPrevious() {
 
     public int nextIndex() {
 //             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#nextIndex().
+//                       display_name nextIndex
 //                       documentation ```java\npublic int nextIndex()\n```
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#nextIndex().
       return cursor;
@@ -701,6 +775,7 @@ public int nextIndex() {
 
     public int previousIndex() {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#previousIndex().
+//                           display_name previousIndex
 //                           documentation ```java\npublic int previousIndex()\n```
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
       return cursor - 1;
@@ -712,12 +787,14 @@ public int previousIndex() {
     public EpoxyModel<?> previous() {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#previous().
+//                                display_name previous
 //                                documentation ```java\n@SuppressWarnings("unchecked")\npublic EpoxyModel<?> previous()\n```
 //                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previous().
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
       int i = cursor - 1;
 //        ^ definition local 34
+//          display_name i
 //          documentation ```java\nint i\n```
 //            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
       if (i < 0) {
@@ -741,10 +818,12 @@ public EpoxyModel<?> previous() {
 
     public void set(EpoxyModel<?> e) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#set().
+//                  display_name set
 //                  documentation ```java\npublic void set(EpoxyModel<?> e)\n```
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#set().
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^ definition local 35
+//                                  display_name e
 //                                  documentation ```java\nEpoxyModel<?> e\n```
       if (lastRet < 0) {
 //        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#lastRet.
@@ -764,6 +843,7 @@ public void set(EpoxyModel<?> e) {
       } catch (IndexOutOfBoundsException ex) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
 //                                       ^^ definition local 36
+//                                          display_name ex
 //                                          documentation ```java\nIndexOutOfBoundsException ex\n```
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
@@ -772,10 +852,12 @@ public void set(EpoxyModel<?> e) {
 
     public void add(EpoxyModel<?> e) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#add().
+//                  display_name add
 //                  documentation ```java\npublic void add(EpoxyModel<?> e)\n```
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#add().
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^ definition local 37
+//                                  display_name e
 //                                  documentation ```java\nEpoxyModel<?> e\n```
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
@@ -783,6 +865,7 @@ public void add(EpoxyModel<?> e) {
       try {
         int i = cursor;
 //          ^ definition local 38
+//            display_name i
 //            documentation ```java\nint i\n```
 //              ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
         ModelList.this.add(i, e);
@@ -802,6 +885,7 @@ public void add(EpoxyModel<?> e) {
       } catch (IndexOutOfBoundsException ex) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
 //                                       ^^ definition local 39
+//                                          display_name ex
 //                                          documentation ```java\nIndexOutOfBoundsException ex\n```
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
@@ -817,13 +901,16 @@ public List<EpoxyModel<?>> subList(int start, int end) {
 //       ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#subList().
+//                                   display_name subList
 //                                   documentation ```java\n@NonNull\n@Override\npublic List<EpoxyModel<?>> subList(int start, int end)\n```
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#subList().
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#subList().
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#subList().
 //                                       ^^^^^ definition local 40
+//                                             display_name start
 //                                             documentation ```java\nint start\n```
 //                                                  ^^^ definition local 41
+//                                                      display_name end
 //                                                      documentation ```java\nint end\n```
     if (start >= 0 && end <= size()) {
 //      ^^^^^ reference local 40
@@ -852,6 +939,7 @@ public List<EpoxyModel<?>> subList(int start, int end) {
    */
   private static class SubList extends AbstractList<EpoxyModel<?>> {
 //                     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#
+//                             display_name SubList
 //                             documentation ```java\nprivate static class SubList\n```
 //                             documentation  A SubList implementation from Android's AbstractList class. It's copied here to make sure the\n implementation doesn't change, since some implementations, like the Java 1.8 ArrayList.SubList\n class, modify the list data directly instead of calling into the parent list's methods. We need\n the implementation to call the parent methods so that the proper notifications are done.\n
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/Iterable#
@@ -864,16 +952,20 @@ private static class SubList extends AbstractList<EpoxyModel<?>> {
     private final ModelList fullList;
 //                ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
 //                          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
+//                                   display_name fullList
 //                                   documentation ```java\nprivate final ModelList fullList\n```
     private int offset;
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#offset.
+//                     display_name offset
 //                     documentation ```java\nprivate int offset\n```
     private int size;
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#size.
+//                   display_name size
 //                   documentation ```java\nprivate int size\n```
 
     private static final class SubListIterator implements ListIterator<EpoxyModel<?>> {
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#
+//                                             display_name SubListIterator
 //                                             documentation ```java\nprivate static final class SubListIterator\n```
 //                                             relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //                                             relationship is_implementation semanticdb maven jdk 11 java/util/ListIterator#
@@ -882,32 +974,41 @@ private static final class SubListIterator implements ListIterator<EpoxyModel<?>
       private final SubList subList;
 //                  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#
 //                          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#subList.
+//                                  display_name subList
 //                                  documentation ```java\nprivate final SubList subList\n```
       private final ListIterator<EpoxyModel<?>> iterator;
 //                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
+//                                                       display_name iterator
 //                                                       documentation ```java\nprivate final ListIterator<EpoxyModel<?>> iterator\n```
       private int start;
 //                ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#start.
+//                      display_name start
 //                      documentation ```java\nprivate int start\n```
       private int end;
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#end.
+//                    display_name end
 //                    documentation ```java\nprivate int end\n```
 
       SubListIterator(ListIterator<EpoxyModel<?>> it, SubList list, int offset, int length) {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#`<init>`().
+//                    display_name <init>
 //                    documentation ```java\nSubListIterator(ListIterator<EpoxyModel<?>> it, SubList list, int offset, int length)\n```
 //                    ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^ definition local 42
+//                                                   display_name it
 //                                                   documentation ```java\nListIterator<EpoxyModel<?>> it\n```
 //                                                    ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#
 //                                                            ^^^^ definition local 43
+//                                                                 display_name list
 //                                                                 documentation ```java\nSubList list\n```
 //                                                                      ^^^^^^ definition local 44
+//                                                                             display_name offset
 //                                                                             documentation ```java\nint offset\n```
 //                                                                                  ^^^^^^ definition local 45
+//                                                                                         display_name length
 //                                                                                         documentation ```java\nint length\n```
         iterator = it;
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -926,10 +1027,12 @@ private static final class SubListIterator implements ListIterator<EpoxyModel<?>
 
       public void add(EpoxyModel<?> object) {
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#add().
+//                    display_name add
 //                    documentation ```java\npublic void add(EpoxyModel<?> object)\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#add().
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^ definition local 46
+//                                         display_name object
 //                                         documentation ```java\nEpoxyModel<?> object\n```
         iterator.add(object);
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -944,6 +1047,7 @@ public void add(EpoxyModel<?> object) {
 
       public boolean hasNext() {
 //                   ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#hasNext().
+//                           display_name hasNext
 //                           documentation ```java\npublic boolean hasNext()\n```
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasNext().
@@ -955,6 +1059,7 @@ public boolean hasNext() {
 
       public boolean hasPrevious() {
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#hasPrevious().
+//                               display_name hasPrevious
 //                               documentation ```java\npublic boolean hasPrevious()\n```
 //                               relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasPrevious().
         return iterator.previousIndex() >= start;
@@ -966,6 +1071,7 @@ public boolean hasPrevious() {
       public EpoxyModel<?> next() {
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                         ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#next().
+//                              display_name next
 //                              documentation ```java\npublic EpoxyModel<?> next()\n```
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#next().
@@ -983,6 +1089,7 @@ public EpoxyModel<?> next() {
 
       public int nextIndex() {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#nextIndex().
+//                         display_name nextIndex
 //                         documentation ```java\npublic int nextIndex()\n```
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#nextIndex().
         return iterator.nextIndex() - start;
@@ -994,6 +1101,7 @@ public int nextIndex() {
       public EpoxyModel<?> previous() {
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#previous().
+//                                  display_name previous
 //                                  documentation ```java\npublic EpoxyModel<?> previous()\n```
 //                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previous().
         if (iterator.previousIndex() >= start) {
@@ -1010,10 +1118,12 @@ public EpoxyModel<?> previous() {
 
       public int previousIndex() {
 //               ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#previousIndex().
+//                             display_name previousIndex
 //                             documentation ```java\npublic int previousIndex()\n```
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         int previous = iterator.previousIndex();
 //          ^^^^^^^^ definition local 47
+//                   display_name previous
 //                   documentation ```java\nint previous\n```
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //                              ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
@@ -1029,6 +1139,7 @@ public int previousIndex() {
 
       public void remove() {
 //                ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#remove().
+//                       display_name remove
 //                       documentation ```java\npublic void remove()\n```
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#remove().
@@ -1044,10 +1155,12 @@ public void remove() {
 
       public void set(EpoxyModel<?> object) {
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#set().
+//                    display_name set
 //                    documentation ```java\npublic void set(EpoxyModel<?> object)\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#set().
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^ definition local 48
+//                                         display_name object
 //                                         documentation ```java\nEpoxyModel<?> object\n```
         iterator.set(object);
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -1058,13 +1171,17 @@ public void set(EpoxyModel<?> object) {
 
     SubList(ModelList list, int start, int end) {
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#`<init>`().
+//          display_name <init>
 //          documentation ```java\nSubList(ModelList list, int start, int end)\n```
 //          ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
 //                    ^^^^ definition local 49
+//                         display_name list
 //                         documentation ```java\nModelList list\n```
 //                              ^^^^^ definition local 50
+//                                    display_name start
 //                                    documentation ```java\nint start\n```
 //                                         ^^^ definition local 51
+//                                             display_name end
 //                                             documentation ```java\nint end\n```
       fullList = list;
 //    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1086,13 +1203,16 @@ public void set(EpoxyModel<?> object) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void add(int location, EpoxyModel<?> object) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#add().
+//                  display_name add
 //                  documentation ```java\n@Override\npublic void add(int location, EpoxyModel<?> object)\n```
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add(+1).
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#add(+1).
 //                      ^^^^^^^^ definition local 52
+//                               display_name location
 //                               documentation ```java\nint location\n```
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^ definition local 53
+//                                                     display_name object
 //                                                     documentation ```java\nEpoxyModel<?> object\n```
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
@@ -1128,14 +1248,17 @@ public void add(int location, EpoxyModel<?> object) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collection) {
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll().
+//                        display_name addAll
 //                        documentation ```java\n@Override\npublic boolean addAll(int location, Collection<? extends EpoxyModel<?>> collection)\n```
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#addAll().
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#addAll(+1).
 //                            ^^^^^^^^ definition local 54
+//                                     display_name location
 //                                     documentation ```java\nint location\n```
 //                                      ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^^^^^^^^^^ definition local 55
+//                                                                                     display_name collection
 //                                                                                     documentation ```java\nCollection<? extends EpoxyModel<?>> collection\n```
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
@@ -1147,6 +1270,7 @@ public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collecti
 //                                       ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#size.
           boolean result = fullList.addAll(location + offset, collection);
 //                ^^^^^^ definition local 56
+//                       display_name result
 //                       documentation ```java\nboolean result\n```
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
@@ -1178,6 +1302,7 @@ public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collecti
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll(+1).
+//                        display_name addAll
 //                        documentation ```java\n@Override\npublic boolean addAll(Collection<? extends EpoxyModel<?>> collection)\n```
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#addAll().
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#addAll().
@@ -1186,6 +1311,7 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //                                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^^^^^^^^^^ definition local 57
+//                                                                                display_name collection
 //                                                                                documentation ```java\n@NonNull\nCollection<? extends EpoxyModel<?>> collection\n```
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
@@ -1193,6 +1319,7 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
         boolean result = fullList.addAll(offset + size, collection);
 //              ^^^^^^ definition local 58
+//                     display_name result
 //                     documentation ```java\nboolean result\n```
 //                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
@@ -1222,10 +1349,12 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
     public EpoxyModel<?> get(int location) {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#get().
+//                           display_name get
 //                           documentation ```java\n@Override\npublic EpoxyModel<?> get(int location)\n```
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#get().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#get().
 //                               ^^^^^^^^ definition local 59
+//                                        display_name location
 //                                        documentation ```java\nint location\n```
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
@@ -1256,6 +1385,7 @@ public Iterator<EpoxyModel<?>> iterator() {
 //         ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#iterator().
+//                                          display_name iterator
 //                                          documentation ```java\n@NonNull\n@Override\npublic Iterator<EpoxyModel<?>> iterator()\n```
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#iterator().
@@ -1274,10 +1404,12 @@ public ListIterator<EpoxyModel<?>> listIterator(int location) {
 //         ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#listIterator().
+//                                                  display_name listIterator
 //                                                  documentation ```java\n@NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator(int location)\n```
 //                                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator(+1).
 //                                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#listIterator(+1).
 //                                                      ^^^^^^^^ definition local 60
+//                                                               display_name location
 //                                                               documentation ```java\nint location\n```
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
@@ -1308,10 +1440,12 @@ public ListIterator<EpoxyModel<?>> listIterator(int location) {
     public EpoxyModel<?> remove(int location) {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#remove().
+//                              display_name remove
 //                              documentation ```java\n@Override\npublic EpoxyModel<?> remove(int location)\n```
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#remove().
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#remove(+1).
 //                                  ^^^^^^^^ definition local 61
+//                                           display_name location
 //                                           documentation ```java\nint location\n```
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
@@ -1324,6 +1458,7 @@ public EpoxyModel<?> remove(int location) {
           EpoxyModel<?> result = fullList.remove(location + offset);
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^ definition local 62
+//                             display_name result
 //                             documentation ```java\nEpoxyModel<?> result\n```
 //                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#remove().
@@ -1349,11 +1484,14 @@ public EpoxyModel<?> remove(int location) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     protected void removeRange(int start, int end) {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#removeRange().
+//                             display_name removeRange
 //                             documentation ```java\n@Override\nprotected void removeRange(int start, int end)\n```
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#removeRange().
 //                                 ^^^^^ definition local 63
+//                                       display_name start
 //                                       documentation ```java\nint start\n```
 //                                            ^^^ definition local 64
+//                                                display_name end
 //                                                documentation ```java\nint end\n```
       if (start != end) {
 //        ^^^^^ reference local 63
@@ -1389,13 +1527,16 @@ protected void removeRange(int start, int end) {
     public EpoxyModel<?> set(int location, EpoxyModel<?> object) {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#set().
+//                           display_name set
 //                           documentation ```java\n@Override\npublic EpoxyModel<?> set(int location, EpoxyModel<?> object)\n```
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#set().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#set().
 //                               ^^^^^^^^ definition local 65
+//                                        display_name location
 //                                        documentation ```java\nint location\n```
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                       ^^^^^^ definition local 66
+//                                                              display_name object
 //                                                              documentation ```java\nEpoxyModel<?> object\n```
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
@@ -1423,6 +1564,7 @@ public EpoxyModel<?> set(int location, EpoxyModel<?> object) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public int size() {
 //             ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#size().
+//                  display_name size
 //                  documentation ```java\n@Override\npublic int size()\n```
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#size().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#size().
@@ -1440,8 +1582,10 @@ public int size() {
 
     void sizeChanged(boolean increment) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#sizeChanged().
+//                   display_name sizeChanged
 //                   documentation ```java\nvoid sizeChanged(boolean increment)\n```
 //                           ^^^^^^^^^ definition local 67
+//                                     display_name increment
 //                                     documentation ```java\nboolean increment\n```
       if (increment) {
 //        ^^^^^^^^^ reference local 67
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
index 4f05d9dd4..8f381b7d6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
@@ -3,22 +3,28 @@
 /** Helper to store relevant information about a model that we need to determine if it changed. */
 class ModelState {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#
+//               display_name ModelState
 //               documentation ```java\nclass ModelState\n```
 //               documentation Helper to store relevant information about a model that we need to determine if it changed. 
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#`<init>`().
+//               display_name <init>
 //               documentation ```java\nModelState()\n```
   long id;
 //     ^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#id.
+//        display_name id
 //        documentation ```java\nlong id\n```
   int hashCode;
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#hashCode.
+//             display_name hashCode
 //             documentation ```java\nint hashCode\n```
   int position;
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#position.
+//             display_name position
 //             documentation ```java\nint position\n```
   EpoxyModel<?> model;
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#model.
+//                    display_name model
 //                    documentation ```java\nEpoxyModel<?> model\n```
 
   /**
@@ -29,6 +35,7 @@ class ModelState {
   ModelState pair;
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
+//                display_name pair
 //                documentation ```java\nModelState pair\n```
 //                documentation  A link to the item with the same id in the other list when diffing two lists. This will be null\n if the item doesn't exist, in the case of insertions or removals. This is an optimization to\n prevent having to look up the matching pair in a hash map every time.\n
 
@@ -42,23 +49,29 @@ class ModelState {
    */
   int lastMoveOp;
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#lastMoveOp.
+//               display_name lastMoveOp
 //               documentation ```java\nint lastMoveOp\n```
 //               documentation  How many movement operations have been applied to this item in order to update its position. As\n we find more item movements we need to update the position of affected items in the list in\n order to correctly calculate the next movement. Instead of iterating through all items in the\n list every time a movement operation happens we keep track of how many of these operations have\n been applied to an item, and apply all new operations in order when we need to get this item's\n up to date position.\n
 
   static ModelState build(EpoxyModel<?> model, int position, boolean immutableModel) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#build().
+//                        display_name build
 //                        documentation ```java\nstatic ModelState build(EpoxyModel<?> model, int position, boolean immutableModel)\n```
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^ definition local 0
+//                                            display_name model
 //                                            documentation ```java\nEpoxyModel<?> model\n```
 //                                                 ^^^^^^^^ definition local 1
+//                                                          display_name position
 //                                                          documentation ```java\nint position\n```
 //                                                                   ^^^^^^^^^^^^^^ definition local 2
+//                                                                                  display_name immutableModel
 //                                                                                  documentation ```java\nboolean immutableModel\n```
     ModelState state = new ModelState();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^ definition local 3
+//                   display_name state
 //                   documentation ```java\nModelState state\n```
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#`<init>`().
 
@@ -102,6 +115,7 @@ static ModelState build(EpoxyModel<?> model, int position, boolean immutableMode
    */
   void pairWithSelf() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#pairWithSelf().
+//                  display_name pairWithSelf
 //                  documentation ```java\nvoid pairWithSelf()\n```
 //                  documentation  Used for an item inserted into the new list when we need to track moves that effect the\n inserted item in the old list.\n
     if (pair != null) {
@@ -142,6 +156,7 @@ void pairWithSelf() {
   public String toString() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#toString().
+//                       display_name toString
 //                       documentation ```java\n@Override\npublic String toString()\n```
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return "ModelState{"
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
index fe2383b69..e42276478 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
@@ -6,10 +6,12 @@
  */
 class NoOpControllerHelper extends ControllerHelper<EpoxyController> {
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#
+//                         display_name NoOpControllerHelper
 //                         documentation ```java\nclass NoOpControllerHelper\n```
 //                         documentation  A {@link ControllerHelper} implementation for adapters with no {@link\n com.airbnb.epoxy.AutoModel} usage.\n
 //                         relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#`<init>`().
+//                         display_name <init>
 //                         documentation ```java\nNoOpControllerHelper()\n```
 //                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
@@ -18,6 +20,7 @@ class NoOpControllerHelper extends ControllerHelper<EpoxyController> {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void resetAutoModels() {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#resetAutoModels().
+//                            display_name resetAutoModels
 //                            documentation ```java\n@Override\npublic void resetAutoModels()\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ControllerHelper#resetAutoModels().
     // No - Op
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
index 7b2f682cd..1517b1441 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
@@ -2,19 +2,23 @@
 
 class NoOpTimer implements Timer {
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#
+//              display_name NoOpTimer
 //              documentation ```java\nclass NoOpTimer\n```
 //              relationship is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#`<init>`().
+//              display_name <init>
 //              documentation ```java\nNoOpTimer()\n```
 //                         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void start(String sectionName) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#start().
+//                  display_name start
 //                  documentation ```java\n@Override\npublic void start(String sectionName)\n```
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#start().
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                         ^^^^^^^^^^^ definition local 0
+//                                     display_name sectionName
 //                                     documentation ```java\nString sectionName\n```
 
   }
@@ -23,6 +27,7 @@ public void start(String sectionName) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void stop() {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#stop().
+//                 display_name stop
 //                 documentation ```java\n@Override\npublic void stop()\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#stop().
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
index 0006c74f7..b0a051f21 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
@@ -16,19 +16,23 @@
  */
 class NotifyBlocker extends AdapterDataObserver {
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#
+//                  display_name NotifyBlocker
 //                  documentation ```java\nclass NotifyBlocker\n```
 //                  documentation  We don't allow any data change notifications except the ones done though diffing. Forcing\n changes to happen through diffing reduces the chance for developer error when implementing an\n adapter.\n <p>\n This observer throws upon any changes done outside of diffing.\n
 //                  relationship is_implementation semanticdb maven . . AdapterDataObserver#
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#`<init>`().
+//                  display_name <init>
 //                  documentation ```java\nNotifyBlocker()\n```
 //                          ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . AdapterDataObserver#
 
   private boolean changesAllowed;
 //                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
+//                               display_name changesAllowed
 //                               documentation ```java\nprivate boolean changesAllowed\n```
 
   void allowChanges() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#allowChanges().
+//                  display_name allowChanges
 //                  documentation ```java\nvoid allowChanges()\n```
     changesAllowed = true;
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
@@ -36,6 +40,7 @@ void allowChanges() {
 
   void blockChanges() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#blockChanges().
+//                  display_name blockChanges
 //                  documentation ```java\nvoid blockChanges()\n```
     changesAllowed = false;
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
@@ -45,6 +50,7 @@ void blockChanges() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onChanged() {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
+//                      display_name onChanged
 //                      documentation ```java\n@Override\npublic void onChanged()\n```
     if (!changesAllowed) {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
@@ -58,10 +64,13 @@ public void onChanged() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeChanged(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged().
+//                               display_name onItemRangeChanged
 //                               documentation ```java\n@Override\npublic void onItemRangeChanged(int positionStart, int itemCount)\n```
 //                                   ^^^^^^^^^^^^^ definition local 0
+//                                                 display_name positionStart
 //                                                 documentation ```java\nint positionStart\n```
 //                                                      ^^^^^^^^^ definition local 1
+//                                                                display_name itemCount
 //                                                                documentation ```java\nint itemCount\n```
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
@@ -71,13 +80,17 @@ public void onItemRangeChanged(int positionStart, int itemCount) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeChanged(int positionStart, int itemCount, Object payload) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(+1).
+//                               display_name onItemRangeChanged
 //                               documentation ```java\n@Override\npublic void onItemRangeChanged(int positionStart, int itemCount, Object payload)\n```
 //                                   ^^^^^^^^^^^^^ definition local 2
+//                                                 display_name positionStart
 //                                                 documentation ```java\nint positionStart\n```
 //                                                      ^^^^^^^^^ definition local 3
+//                                                                display_name itemCount
 //                                                                documentation ```java\nint itemCount\n```
 //                                                                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                        ^^^^^^^ definition local 4
+//                                                                                display_name payload
 //                                                                                documentation ```java\nObject payload\n```
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
@@ -87,10 +100,13 @@ public void onItemRangeChanged(int positionStart, int itemCount, Object payload)
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeInserted(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeInserted().
+//                                display_name onItemRangeInserted
 //                                documentation ```java\n@Override\npublic void onItemRangeInserted(int positionStart, int itemCount)\n```
 //                                    ^^^^^^^^^^^^^ definition local 5
+//                                                  display_name positionStart
 //                                                  documentation ```java\nint positionStart\n```
 //                                                       ^^^^^^^^^ definition local 6
+//                                                                 display_name itemCount
 //                                                                 documentation ```java\nint itemCount\n```
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
@@ -100,10 +116,13 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeRemoved(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeRemoved().
+//                               display_name onItemRangeRemoved
 //                               documentation ```java\n@Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)\n```
 //                                   ^^^^^^^^^^^^^ definition local 7
+//                                                 display_name positionStart
 //                                                 documentation ```java\nint positionStart\n```
 //                                                      ^^^^^^^^^ definition local 8
+//                                                                display_name itemCount
 //                                                                documentation ```java\nint itemCount\n```
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
@@ -113,12 +132,16 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeMoved().
+//                             display_name onItemRangeMoved
 //                             documentation ```java\n@Override\npublic void onItemRangeMoved(int fromPosition, int toPosition, int itemCount)\n```
 //                                 ^^^^^^^^^^^^ definition local 9
+//                                              display_name fromPosition
 //                                              documentation ```java\nint fromPosition\n```
 //                                                   ^^^^^^^^^^ definition local 10
+//                                                              display_name toPosition
 //                                                              documentation ```java\nint toPosition\n```
 //                                                                   ^^^^^^^^^ definition local 11
+//                                                                             display_name itemCount
 //                                                                             documentation ```java\nint itemCount\n```
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
index 7e3d6a2b0..c935876a4 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
@@ -3,12 +3,15 @@
 /** Used to register an onBind callback with a generated model. */
 public interface OnModelBoundListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#
+//                                    display_name OnModelBoundListener
 //                                    documentation ```java\npublic interface OnModelBoundListener<T extends EpoxyModel<?>, V>\n```
 //                                    documentation Used to register an onBind callback with a generated model. 
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[T]
+//                                      display_name T
 //                                      documentation ```java\nT extends EpoxyModel<?>\n```
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[V]
+//                                                               display_name V
 //                                                               documentation ```java\nV\n```
   /**
    * This will be called immediately after a model was bound, with the model and view that were
@@ -20,14 +23,18 @@ public interface OnModelBoundListener<T extends EpoxyModel<?>, V> {
    */
   void onModelBound(T model, V view, int position);
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#onModelBound().
+//                  display_name onModelBound
 //                  documentation ```java\npublic abstract void onModelBound(T model, V view, int position)\n```
 //                  documentation  This will be called immediately after a model was bound, with the model and view that were\n bound together.\n\n @param model    The model being bound\n @param view     The view that is being bound to the model\n @param position The adapter position of the model\n
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[T]
 //                    ^^^^^ definition local 0
+//                          display_name model
 //                          documentation ```java\nT model\n```
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[V]
 //                             ^^^^ definition local 1
+//                                  display_name view
 //                                  documentation ```java\nV view\n```
 //                                       ^^^^^^^^ definition local 2
+//                                                display_name position
 //                                                documentation ```java\nint position\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
index 4484dc923..ff8b22b6b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
@@ -11,6 +11,7 @@
  */
 public interface OnModelBuildFinishedListener {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
+//                                            display_name OnModelBuildFinishedListener
 //                                            documentation ```java\npublic interface OnModelBuildFinishedListener\n```
 //                                            documentation  Used with {@link EpoxyController#addModelBuildListener(OnModelBuildFinishedListener)} to be\n alerted to new model changes.\n
   /**
@@ -19,10 +20,12 @@ public interface OnModelBuildFinishedListener {
    */
   void onModelBuildFinished(@NonNull DiffResult result);
 //     ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished().
+//                          display_name onModelBuildFinished
 //                          documentation ```java\npublic abstract void onModelBuildFinished(DiffResult result)\n```
 //                          documentation  Called after {@link EpoxyController#buildModels()} has run and changes have been notified to\n the adapter. This will be called even if no changes existed.\n
 //                           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                                              ^^^^^^ definition local 0
+//                                                     display_name result
 //                                                     documentation ```java\n@NonNull\nDiffResult result\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
index 0209499a3..6e7036c69 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
@@ -7,11 +7,14 @@
 
 public interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#
+//                                            display_name OnModelCheckedChangeListener
 //                                            documentation ```java\npublic interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V>\n```
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[T]
+//                                              display_name T
 //                                              documentation ```java\nT extends EpoxyModel<?>\n```
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[V]
+//                                                                       display_name V
 //                                                                       documentation ```java\nV\n```
   /**
    * Called when the view bound to the model is checked.
@@ -25,20 +28,26 @@ public interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V> {
    */
   void onChecked(T model, V parentView,
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked().
+//               display_name onChecked
 //               documentation ```java\npublic abstract void onChecked(T model, V parentView, unresolved_type checkedView, boolean isChecked, int position)\n```
 //               documentation  Called when the view bound to the model is checked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param checkedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param isChecked   The new value for isChecked property.\n @param position    The position of the model in the adapter.\n
 //               ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[T]
 //                 ^^^^^ definition local 0
+//                       display_name model
 //                       documentation ```java\nT model\n```
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[V]
 //                          ^^^^^^^^^^ definition local 1
+//                                     display_name parentView
 //                                     documentation ```java\nV parentView\n```
       CompoundButton checkedView, boolean isChecked, int position);
 //    ^^^^^^^^^^^^^^ reference semanticdb maven . . CompoundButton#
 //                   ^^^^^^^^^^^ definition local 2
+//                               display_name checkedView
 //                               documentation ```java\nunresolved_type checkedView\n```
 //                                        ^^^^^^^^^ definition local 3
+//                                                  display_name isChecked
 //                                                  documentation ```java\nboolean isChecked\n```
 //                                                       ^^^^^^^^ definition local 4
+//                                                                display_name position
 //                                                                documentation ```java\nint position\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
index e2f6d8ea4..1120614e6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
@@ -8,12 +8,15 @@
 /** Used to register a click listener on a generated model. */
 public interface OnModelClickListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#
+//                                    display_name OnModelClickListener
 //                                    documentation ```java\npublic interface OnModelClickListener<T extends EpoxyModel<?>, V>\n```
 //                                    documentation Used to register a click listener on a generated model. 
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[T]
+//                                      display_name T
 //                                      documentation ```java\nT extends EpoxyModel<?>\n```
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[V]
+//                                                               display_name V
 //                                                               documentation ```java\nV\n```
   /**
    * Called when the view bound to the model is clicked.
@@ -26,17 +29,22 @@ public interface OnModelClickListener<T extends EpoxyModel<?>, V> {
    */
   void onClick(T model, V parentView, View clickedView, int position);
 //     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#onClick().
+//             display_name onClick
 //             documentation ```java\npublic abstract void onClick(T model, V parentView, unresolved_type clickedView, int position)\n```
 //             documentation  Called when the view bound to the model is clicked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param clickedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param position    The position of the model in the adapter.\n
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[T]
 //               ^^^^^ definition local 0
+//                     display_name model
 //                     documentation ```java\nT model\n```
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[V]
 //                        ^^^^^^^^^^ definition local 1
+//                                   display_name parentView
 //                                   documentation ```java\nV parentView\n```
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^^^^ definition local 2
+//                                                     display_name clickedView
 //                                                     documentation ```java\nunresolved_type clickedView\n```
 //                                                          ^^^^^^^^ definition local 3
+//                                                                   display_name position
 //                                                                   documentation ```java\nint position\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
index e48a520dc..80d34c463 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
@@ -7,11 +7,14 @@
 
 public interface OnModelLongClickListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#
+//                                        display_name OnModelLongClickListener
 //                                        documentation ```java\npublic interface OnModelLongClickListener<T extends EpoxyModel<?>, V>\n```
 //                                        ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[T]
+//                                          display_name T
 //                                          documentation ```java\nT extends EpoxyModel<?>\n```
 //                                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                 ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[V]
+//                                                                   display_name V
 //                                                                   documentation ```java\nV\n```
   /**
    * Called when the view bound to the model is clicked.
@@ -24,17 +27,22 @@ public interface OnModelLongClickListener<T extends EpoxyModel<?>, V> {
    */
   boolean onLongClick(T model, V parentView, View clickedView, int position);
 //        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#onLongClick().
+//                    display_name onLongClick
 //                    documentation ```java\npublic abstract boolean onLongClick(T model, V parentView, unresolved_type clickedView, int position)\n```
 //                    documentation  Called when the view bound to the model is clicked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param clickedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param position    The position of the model in the adapter.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[T]
 //                      ^^^^^ definition local 0
+//                            display_name model
 //                            documentation ```java\nT model\n```
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[V]
 //                               ^^^^^^^^^^ definition local 1
+//                                          display_name parentView
 //                                          documentation ```java\nV parentView\n```
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^ definition local 2
+//                                                            display_name clickedView
 //                                                            documentation ```java\nunresolved_type clickedView\n```
 //                                                                 ^^^^^^^^ definition local 3
+//                                                                          display_name position
 //                                                                          documentation ```java\nint position\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
index 7d15bc63b..7b29a9539 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
@@ -3,12 +3,15 @@
 /** Used to register an onUnbind callback with a generated model. */
 public interface OnModelUnboundListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#
+//                                      display_name OnModelUnboundListener
 //                                      documentation ```java\npublic interface OnModelUnboundListener<T extends EpoxyModel<?>, V>\n```
 //                                      documentation Used to register an onUnbind callback with a generated model. 
 //                                      ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[T]
+//                                        display_name T
 //                                        documentation ```java\nT extends EpoxyModel<?>\n```
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[V]
+//                                                                 display_name V
 //                                                                 documentation ```java\nV\n```
   /**
    * This will be called immediately after a model is unbound from a view, with the view and model
@@ -16,12 +19,15 @@ public interface OnModelUnboundListener<T extends EpoxyModel<?>, V> {
    */
   void onModelUnbound(T model, V view);
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound().
+//                    display_name onModelUnbound
 //                    documentation ```java\npublic abstract void onModelUnbound(T model, V view)\n```
 //                    documentation  This will be called immediately after a model is unbound from a view, with the view and model\n that were unbound.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[T]
 //                      ^^^^^ definition local 0
+//                            display_name model
 //                            documentation ```java\nT model\n```
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[V]
 //                               ^^^^ definition local 1
+//                                    display_name view
 //                                    documentation ```java\nV view\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
index ef272add2..99c4cc7c1 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
@@ -12,13 +12,16 @@
 /** Used to register an onVisibilityChanged callback with a generated model. */
 public interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#
+//                                                display_name OnModelVisibilityChangedListener
 //                                                documentation ```java\npublic interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V>\n```
 //                                                documentation Used to register an onVisibilityChanged callback with a generated model. 
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[T]
+//                                                  display_name T
 //                                                  documentation ```java\nT extends EpoxyModel<V>\n```
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
 //                                                                         ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
+//                                                                           display_name V
 //                                                                           documentation ```java\nV\n```
 
   /**
@@ -38,31 +41,38 @@ public interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V> {
    */
   void onVisibilityChanged(T model, V view,
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
+//                         display_name onVisibilityChanged
 //                         documentation ```java\npublic abstract void onVisibilityChanged(T model, V view, float percentVisibleHeight, float percentVisibleWidth, int heightVisible, int widthVisible)\n```
 //                         documentation  This will be called once the view visible part changes.\n <p>\n OnModelVisibilityChangedListener should be used with particular care since they will be\n dispatched on every frame while scrolling. No heavy work should be done inside the\n implementation. Using {@link OnModelVisibilityStateChangedListener} is recommended whenever\n possible.\n <p>\n @param model                The model being bound\n @param view                 The view that is being bound to the model\n @param percentVisibleHeight The percentage of height visible (0-100)\n @param percentVisibleWidth  The percentage of width visible (0-100)\n @param heightVisible        The visible height in pixel\n @param widthVisible         The visible width in pixel\n
 //                         ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[T]
 //                           ^^^^^ definition local 0
+//                                 display_name model
 //                                 documentation ```java\nT model\n```
 //                                  ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
 //                                    ^^^^ definition local 1
+//                                         display_name view
 //                                         documentation ```java\nV view\n```
       @FloatRange(from = 0, to = 100) float percentVisibleHeight,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 2
+//                                                               display_name percentVisibleHeight
 //                                                               documentation ```java\n@FloatRange(from = 0, to = 100)\nfloat percentVisibleHeight\n```
       @FloatRange(from = 0, to = 100) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                          ^^^^^^^^^^^^^^^^^^^ definition local 3
+//                                                              display_name percentVisibleWidth
 //                                                              documentation ```java\n@FloatRange(from = 0, to = 100)\nfloat percentVisibleWidth\n```
       @Px int heightVisible, @Px int widthVisible);
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 4
+//                          display_name heightVisible
 //                          documentation ```java\n@Px\nint heightVisible\n```
 //                            ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                   ^^^^^^^^^^^^ definition local 5
+//                                                display_name widthVisible
 //                                                documentation ```java\n@Px\nint widthVisible\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
index 3f57eb796..76738e0ee 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
@@ -10,13 +10,16 @@
 /** Used to register an onVisibilityChanged callback with a generated model. */
 public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#
+//                                                     display_name OnModelVisibilityStateChangedListener
 //                                                     documentation ```java\npublic interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>, V>\n```
 //                                                     documentation Used to register an onVisibilityChanged callback with a generated model. 
 //                                                     ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T]
+//                                                       display_name T
 //                                                       documentation ```java\nT extends EpoxyModel<V>\n```
 //                                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
 //                                                                              ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
+//                                                                                display_name V
 //                                                                                documentation ```java\nV\n```
 
   /**
@@ -30,15 +33,19 @@ public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>,
    */
   void onVisibilityStateChanged(T model, V view, @Visibility int visibilityState);
 //     ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged().
+//                              display_name onVisibilityStateChanged
 //                              documentation ```java\npublic abstract void onVisibilityStateChanged(T model, V view, int visibilityState)\n```
 //                              documentation  This will be called once the visibility changed.\n <p>\n @param model           The model being bound\n @param view            The view that is being bound to the model\n @param visibilityState The new visibility\n <p>\n @see VisibilityState\n
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T]
 //                                ^^^^^ definition local 0
+//                                      display_name model
 //                                      documentation ```java\nT model\n```
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
 //                                         ^^^^ definition local 1
+//                                              display_name view
 //                                              documentation ```java\nV view\n```
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                               ^^^^^^^^^^^^^^^ definition local 2
+//                                                                               display_name visibilityState
 //                                                                               documentation ```java\n@Visibility\nint visibilityState\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
index 5091cc913..6755151d9 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
@@ -21,32 +21,40 @@
 
 public class QuantityStringResAttribute {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
+//                                      display_name QuantityStringResAttribute
 //                                      documentation ```java\npublic class QuantityStringResAttribute\n```
   @PluralsRes private final int id;
 // ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                              ^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
+//                                 display_name id
 //                                 documentation ```java\n@PluralsRes\nprivate final int id\n```
   private final int quantity;
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
+//                           display_name quantity
 //                           documentation ```java\nprivate final int quantity\n```
   @Nullable private final Object[] formatArgs;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
+//                                            display_name formatArgs
 //                                            documentation ```java\n@Nullable\nprivate final Object[] formatArgs\n```
 
   public QuantityStringResAttribute(@PluralsRes int id, int quantity,
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
+//                                  display_name <init>
 //                                  documentation ```java\npublic QuantityStringResAttribute(int id, int quantity, Object[] formatArgs)\n```
 //                                   ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                                                  ^^ definition local 0
+//                                                     display_name id
 //                                                     documentation ```java\n@PluralsRes\nint id\n```
 //                                                          ^^^^^^^^ definition local 1
+//                                                                   display_name quantity
 //                                                                   documentation ```java\nint quantity\n```
       @Nullable Object[] formatArgs) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                       ^^^^^^^^^^ definition local 2
+//                                  display_name formatArgs
 //                                  documentation ```java\n@Nullable\nObject[] formatArgs\n```
     this.quantity = quantity;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
@@ -61,10 +69,13 @@ public QuantityStringResAttribute(@PluralsRes int id, int quantity,
 
   public QuantityStringResAttribute(int id, int quantity) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`(+1).
+//                                  display_name <init>
 //                                  documentation ```java\npublic QuantityStringResAttribute(int id, int quantity)\n```
 //                                      ^^ definition local 3
+//                                         display_name id
 //                                         documentation ```java\nint id\n```
 //                                              ^^^^^^^^ definition local 4
+//                                                       display_name quantity
 //                                                       documentation ```java\nint quantity\n```
     this(id, quantity, null);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
@@ -76,6 +87,7 @@ public QuantityStringResAttribute(int id, int quantity) {
 // ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
   public int getId() {
 //           ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getId().
+//                 display_name getId
 //                 documentation ```java\n@PluralsRes\npublic int getId()\n```
     return id;
 //         ^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
@@ -83,6 +95,7 @@ public int getId() {
 
   public int getQuantity() {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getQuantity().
+//                       display_name getQuantity
 //                       documentation ```java\npublic int getQuantity()\n```
     return quantity;
 //         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
@@ -93,6 +106,7 @@ public int getQuantity() {
   public Object[] getFormatArgs() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getFormatArgs().
+//                              display_name getFormatArgs
 //                              documentation ```java\n@Nullable\npublic Object[] getFormatArgs()\n```
     return formatArgs;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
@@ -101,9 +115,11 @@ public Object[] getFormatArgs() {
   public CharSequence toString(Context context) {
 //       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#toString().
+//                             display_name toString
 //                             documentation ```java\npublic CharSequence toString(unresolved_type context)\n```
 //                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                     ^^^^^^^ definition local 5
+//                                             display_name context
 //                                             documentation ```java\nunresolved_type context\n```
     if (formatArgs == null || formatArgs.length == 0) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
@@ -130,10 +146,12 @@ public CharSequence toString(Context context) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#equals().
+//                      display_name equals
 //                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 6
+//                               display_name o
 //                               documentation ```java\nObject o\n```
     if (this == o) {
 //              ^ reference local 6
@@ -148,6 +166,7 @@ public boolean equals(Object o) {
     QuantityStringResAttribute that = (QuantityStringResAttribute) o;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
 //                             ^^^^ definition local 7
+//                                  display_name that
 //                                  documentation ```java\nQuantityStringResAttribute that\n```
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
 //                                                                 ^ reference local 6
@@ -177,10 +196,12 @@ public boolean equals(Object o) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#hashCode().
+//                    display_name hashCode
 //                    documentation ```java\n@Override\npublic int hashCode()\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = id;
 //      ^^^^^^ definition local 8
+//             display_name result
 //             documentation ```java\nint result\n```
 //               ^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
     result = 31 * result + quantity;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
index 9fa5e413d..a708b8201 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
@@ -16,6 +16,7 @@
  */
 public class SimpleEpoxyAdapter extends EpoxyAdapter {
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#
+//                              display_name SimpleEpoxyAdapter
 //                              documentation ```java\npublic class SimpleEpoxyAdapter\n```
 //                              documentation  A non-abstract version of {@link com.airbnb.epoxy.EpoxyAdapter} that exposes all methods and\n models as public. Use this if you don't want to create your own adapter subclass and instead want\n to modify the adapter from elsewhere, such as from an activity.\n
 //                              relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
@@ -23,6 +24,7 @@ public class SimpleEpoxyAdapter extends EpoxyAdapter {
 //                              relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                              relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#`<init>`().
+//                              display_name <init>
 //                              documentation ```java\npublic SimpleEpoxyAdapter()\n```
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#
 
@@ -30,6 +32,7 @@ public List<EpoxyModel<?>> getModels() {
 //       ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModels().
+//                                     display_name getModels
 //                                     documentation ```java\npublic List<EpoxyModel<?>> getModels()\n```
     return models;
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
@@ -39,6 +42,7 @@ public List<EpoxyModel<?>> getModels() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void enableDiffing() {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#enableDiffing().
+//                          display_name enableDiffing
 //                          documentation ```java\n@Override\npublic void enableDiffing()\n```
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#enableDiffing().
     super.enableDiffing();
@@ -50,6 +54,7 @@ public void enableDiffing() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void notifyModelsChanged() {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelsChanged().
+//                                display_name notifyModelsChanged
 //                                documentation ```java\n@Override\npublic void notifyModelsChanged()\n```
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelsChanged().
     super.notifyModelsChanged();
@@ -62,6 +67,7 @@ public void notifyModelsChanged() {
   public BoundViewHolders getBoundViewHolders() {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getBoundViewHolders().
+//                                            display_name getBoundViewHolders
 //                                            documentation ```java\n@Override\npublic BoundViewHolders getBoundViewHolders()\n```
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
     return super.getBoundViewHolders();
@@ -73,10 +79,12 @@ public BoundViewHolders getBoundViewHolders() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void notifyModelChanged(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged().
+//                               display_name notifyModelChanged
 //                               documentation ```java\n@Override\npublic void notifyModelChanged(EpoxyModel<?> model)\n```
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^ definition local 0
+//                                                   display_name model
 //                                                   documentation ```java\nEpoxyModel<?> model\n```
     super.notifyModelChanged(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -88,10 +96,12 @@ public void notifyModelChanged(EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void addModels(EpoxyModel<?>... modelsToAdd) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels().
+//                      display_name addModels
 //                      documentation ```java\n@Override\npublic void addModels(EpoxyModel<?>[] modelsToAdd)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^^^^^^^ definition local 1
+//                                                   display_name modelsToAdd
 //                                                   documentation ```java\nEpoxyModel<?>[] modelsToAdd\n```
     super.addModels(modelsToAdd);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -103,11 +113,13 @@ public void addModels(EpoxyModel<?>... modelsToAdd) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1).
+//                      display_name addModels
 //                      documentation ```java\n@Override\npublic void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
 //                      ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^^^^^^^ definition local 2
+//                                                                      display_name modelsToAdd
 //                                                                      documentation ```java\nCollection<? extends EpoxyModel<?>> modelsToAdd\n```
     super.addModels(modelsToAdd);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -119,13 +131,16 @@ public void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore().
+//                              display_name insertModelBefore
 //                              documentation ```java\n@Override\npublic void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore)\n```
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^^^^^^^^^ definition local 3
+//                                                          display_name modelToInsert
 //                                                          documentation ```java\nEpoxyModel<?> modelToInsert\n```
 //                                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                         ^^^^^^^^^^^^^^^^^^^ definition local 4
+//                                                                                             display_name modelToInsertBefore
 //                                                                                             documentation ```java\nEpoxyModel<?> modelToInsertBefore\n```
     super.insertModelBefore(modelToInsert, modelToInsertBefore);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -138,13 +153,16 @@ public void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelTo
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter().
+//                             display_name insertModelAfter
 //                             documentation ```java\n@Override\npublic void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter)\n```
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^^^^^ definition local 5
+//                                                         display_name modelToInsert
 //                                                         documentation ```java\nEpoxyModel<?> modelToInsert\n```
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                        ^^^^^^^^^^^^^^^^^^ definition local 6
+//                                                                                           display_name modelToInsertAfter
 //                                                                                           documentation ```java\nEpoxyModel<?> modelToInsertAfter\n```
     super.insertModelAfter(modelToInsert, modelToInsertAfter);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -157,10 +175,12 @@ public void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToI
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void removeModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel().
+//                        display_name removeModel
 //                        documentation ```java\n@Override\npublic void removeModel(EpoxyModel<?> model)\n```
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^ definition local 7
+//                                            display_name model
 //                                            documentation ```java\nEpoxyModel<?> model\n```
     super.removeModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -172,6 +192,7 @@ public void removeModel(EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void removeAllModels() {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllModels().
+//                            display_name removeAllModels
 //                            documentation ```java\n@Override\npublic void removeAllModels()\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllModels().
     super.removeAllModels();
@@ -183,10 +204,12 @@ public void removeAllModels() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void removeAllAfterModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel().
+//                                display_name removeAllAfterModel
 //                                documentation ```java\n@Override\npublic void removeAllAfterModel(EpoxyModel<?> model)\n```
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 8
+//                                                    display_name model
 //                                                    documentation ```java\nEpoxyModel<?> model\n```
     super.removeAllAfterModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -198,12 +221,15 @@ public void removeAllAfterModel(EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void showModel(EpoxyModel<?> model, boolean show) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel().
+//                      display_name showModel
 //                      documentation ```java\n@Override\npublic void showModel(EpoxyModel<?> model, boolean show)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 9
+//                                          display_name model
 //                                          documentation ```java\nEpoxyModel<?> model\n```
 //                                                   ^^^^ definition local 10
+//                                                        display_name show
 //                                                        documentation ```java\nboolean show\n```
     super.showModel(model, show);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -216,10 +242,12 @@ public void showModel(EpoxyModel<?> model, boolean show) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void showModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1).
+//                      display_name showModel
 //                      documentation ```java\n@Override\npublic void showModel(EpoxyModel<?> model)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 11
+//                                          display_name model
 //                                          documentation ```java\nEpoxyModel<?> model\n```
     super.showModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -231,10 +259,12 @@ public void showModel(EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void showModels(EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels().
+//                       display_name showModels
 //                       documentation ```java\n@Override\npublic void showModels(EpoxyModel<?>[] models)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^ definition local 12
+//                                               display_name models
 //                                               documentation ```java\nEpoxyModel<?>[] models\n```
     super.showModels(models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -246,12 +276,15 @@ public void showModels(EpoxyModel<?>... models) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void showModels(boolean show, EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1).
+//                       display_name showModels
 //                       documentation ```java\n@Override\npublic void showModels(boolean show, EpoxyModel<?>[] models)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
 //                               ^^^^ definition local 13
+//                                    display_name show
 //                                    documentation ```java\nboolean show\n```
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                      ^^^^^^ definition local 14
+//                                                             display_name models
 //                                                             documentation ```java\nEpoxyModel<?>[] models\n```
     super.showModels(show, models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -264,11 +297,13 @@ public void showModels(boolean show, EpoxyModel<?>... models) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void showModels(Iterable<EpoxyModel<?>> epoxyModels) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2).
+//                       display_name showModels
 //                       documentation ```java\n@Override\npublic void showModels(Iterable<EpoxyModel<?>> epoxyModels)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^ definition local 15
+//                                                           display_name epoxyModels
 //                                                           documentation ```java\nIterable<EpoxyModel<?>> epoxyModels\n```
     super.showModels(epoxyModels);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -280,13 +315,16 @@ public void showModels(Iterable<EpoxyModel<?>> epoxyModels) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3).
+//                       display_name showModels
 //                       documentation ```java\n@Override\npublic void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^ definition local 16
+//                                                           display_name epoxyModels
 //                                                           documentation ```java\nIterable<EpoxyModel<?>> epoxyModels\n```
 //                                                                    ^^^^ definition local 17
+//                                                                         display_name show
 //                                                                         documentation ```java\nboolean show\n```
     super.showModels(epoxyModels, show);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -299,10 +337,12 @@ public void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void hideModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel().
+//                      display_name hideModel
 //                      documentation ```java\n@Override\npublic void hideModel(EpoxyModel<?> model)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 18
+//                                          display_name model
 //                                          documentation ```java\nEpoxyModel<?> model\n```
     super.hideModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -314,11 +354,13 @@ public void hideModel(EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void hideModels(Iterable<EpoxyModel<?>> epoxyModels) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels().
+//                       display_name hideModels
 //                       documentation ```java\n@Override\npublic void hideModels(Iterable<EpoxyModel<?>> epoxyModels)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^ definition local 19
+//                                                           display_name epoxyModels
 //                                                           documentation ```java\nIterable<EpoxyModel<?>> epoxyModels\n```
     super.hideModels(epoxyModels);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -330,10 +372,12 @@ public void hideModels(Iterable<EpoxyModel<?>> epoxyModels) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void hideModels(EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1).
+//                       display_name hideModels
 //                       documentation ```java\n@Override\npublic void hideModels(EpoxyModel<?>[] models)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^ definition local 20
+//                                               display_name models
 //                                               documentation ```java\nEpoxyModel<?>[] models\n```
     super.hideModels(models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -345,10 +389,12 @@ public void hideModels(EpoxyModel<?>... models) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void hideAllAfterModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel().
+//                              display_name hideAllAfterModel
 //                              documentation ```java\n@Override\npublic void hideAllAfterModel(EpoxyModel<?> model)\n```
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^ definition local 21
+//                                                  display_name model
 //                                                  documentation ```java\nEpoxyModel<?> model\n```
     super.hideAllAfterModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -362,10 +408,12 @@ public List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //       ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter().
+//                                             display_name getAllModelsAfter
 //                                             documentation ```java\n@Override\npublic List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model)\n```
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 22
+//                                                                 display_name model
 //                                                                 documentation ```java\nEpoxyModel<?> model\n```
     return super.getAllModelsAfter(model);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -377,10 +425,12 @@ public List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getModelPosition(EpoxyModel<?> model) {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition().
+//                            display_name getModelPosition
 //                            documentation ```java\n@Override\npublic int getModelPosition(EpoxyModel<?> model)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^ definition local 23
+//                                                display_name model
 //                                                documentation ```java\nEpoxyModel<?> model\n```
     return super.getModelPosition(model);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
index ae3b0aba5..84dc4185c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
@@ -11,21 +11,25 @@
  */
 public class SimpleEpoxyController extends EpoxyController {
 //           ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#
+//                                 display_name SimpleEpoxyController
 //                                 documentation ```java\npublic class SimpleEpoxyController\n```
 //                                 documentation  A small wrapper around {@link com.airbnb.epoxy.EpoxyController} that lets you set a list of\n models directly.\n
 //                                 relationship is_implementation semanticdb maven . . ModelCollector#
 //                                 relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                 relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //           ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#`<init>`().
+//                                 display_name <init>
 //                                 documentation ```java\npublic SimpleEpoxyController()\n```
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   private List<? extends EpoxyModel<?>> currentModels;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#currentModels.
+//                                                    display_name currentModels
 //                                                    documentation ```java\nprivate List<? extends EpoxyModel<?>> currentModels\n```
   private boolean insideSetModels;
 //                ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#insideSetModels.
+//                                display_name insideSetModels
 //                                documentation ```java\nprivate boolean insideSetModels\n```
 
   /**
@@ -34,11 +38,13 @@ public class SimpleEpoxyController extends EpoxyController {
    */
   public void setModels(List<? extends EpoxyModel<?>> models) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#setModels().
+//                      display_name setModels
 //                      documentation ```java\npublic void setModels(List<? extends EpoxyModel<?>> models)\n```
 //                      documentation  Set the models to add to this controller. Clears any previous models and adds this new list\n .\n
 //                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                    ^^^^^^ definition local 0
+//                                                           display_name models
 //                                                           documentation ```java\nList<? extends EpoxyModel<?>> models\n```
     currentModels = models;
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#currentModels.
@@ -55,6 +61,7 @@ public void setModels(List<? extends EpoxyModel<?>> models) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#requestModelBuild().
+//                                    display_name requestModelBuild
 //                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!insideSetModels) {
@@ -72,6 +79,7 @@ public final void requestModelBuild() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#buildModels().
+//                                 display_name buildModels
 //                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
index 6a2522d96..a0010ce77 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
@@ -26,6 +26,7 @@
  */
 public class SimpleEpoxyModel extends EpoxyModel<View> {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
+//                            display_name SimpleEpoxyModel
 //                            documentation ```java\npublic class SimpleEpoxyModel\n```
 //                            documentation  Helper class for cases where you don't need to do anything special when binding the view. This\n allows you to just provide the layout instead of needing to create a separate {@link EpoxyModel}\n subclass. This is useful for static layouts. You can also specify an onClick listener and the\n span size.\n
 //                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -34,21 +35,26 @@ public class SimpleEpoxyModel extends EpoxyModel<View> {
   @LayoutRes private final int layoutRes;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#layoutRes.
+//                                       display_name layoutRes
 //                                       documentation ```java\n@LayoutRes\nprivate final int layoutRes\n```
   private View.OnClickListener onClickListener;
 //        ^^^^ reference semanticdb maven . . View/
 //             ^^^^^^^^^^^^^^^ reference semanticdb maven . . View/OnClickListener#
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClickListener.
+//                                             display_name onClickListener
 //                                             documentation ```java\nprivate unresolved_type onClickListener\n```
   private int spanCount = 1;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
+//                      display_name spanCount
 //                      documentation ```java\nprivate int spanCount\n```
 
   public SimpleEpoxyModel(@LayoutRes int layoutRes) {
 //       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#`<init>`().
+//                        display_name <init>
 //                        documentation ```java\npublic SimpleEpoxyModel(int layoutRes)\n```
 //                         ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                       ^^^^^^^^^ definition local 0
+//                                                 display_name layoutRes
 //                                                 documentation ```java\n@LayoutRes\nint layoutRes\n```
     this.layoutRes = layoutRes;
 //       ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#layoutRes.
@@ -58,10 +64,12 @@ public SimpleEpoxyModel(@LayoutRes int layoutRes) {
   public SimpleEpoxyModel onClick(View.OnClickListener listener) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClick().
+//                                display_name onClick
 //                                documentation ```java\npublic SimpleEpoxyModel onClick(unresolved_type listener)\n```
 //                                ^^^^ reference semanticdb maven . . View/
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . View/OnClickListener#
 //                                                     ^^^^^^^^ definition local 1
+//                                                              display_name listener
 //                                                              documentation ```java\nunresolved_type listener\n```
     this.onClickListener = listener;
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClickListener.
@@ -72,8 +80,10 @@ public SimpleEpoxyModel onClick(View.OnClickListener listener) {
   public SimpleEpoxyModel span(int span) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                        ^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#span().
+//                             display_name span
 //                             documentation ```java\npublic SimpleEpoxyModel span(int span)\n```
 //                                 ^^^^ definition local 2
+//                                      display_name span
 //                                      documentation ```java\nint span\n```
     spanCount = span;
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
@@ -87,11 +97,13 @@ public SimpleEpoxyModel span(int span) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void bind(@NonNull View view) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#bind().
+//                 display_name bind
 //                 documentation ```java\n@CallSuper\n@Override\npublic void bind(unresolved_type view)\n```
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^ reference semanticdb maven . . View#
 //                               ^^^^ definition local 3
+//                                    display_name view
 //                                    documentation ```java\n@NonNull\nunresolved_type view\n```
     super.bind(view);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
@@ -113,11 +125,13 @@ public void bind(@NonNull View view) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void unbind(@NonNull View view) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#unbind().
+//                   display_name unbind
 //                   documentation ```java\n@CallSuper\n@Override\npublic void unbind(unresolved_type view)\n```
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^ reference semanticdb maven . . View#
 //                                 ^^^^ definition local 4
+//                                      display_name view
 //                                      documentation ```java\n@NonNull\nunresolved_type view\n```
     super.unbind(view);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
@@ -132,6 +146,7 @@ public void unbind(@NonNull View view) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected int getDefaultLayout() {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getDefaultLayout().
+//                               display_name getDefaultLayout
 //                               documentation ```java\n@Override\nprotected int getDefaultLayout()\n```
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     return layoutRes;
@@ -142,13 +157,17 @@ protected int getDefaultLayout() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize().
+//                       display_name getSpanSize
 //                       documentation ```java\n@Override\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^^^^^^ definition local 5
+//                                          display_name totalSpanCount
 //                                          documentation ```java\nint totalSpanCount\n```
 //                                               ^^^^^^^^ definition local 6
+//                                                        display_name position
 //                                                        documentation ```java\nint position\n```
 //                                                             ^^^^^^^^^ definition local 7
+//                                                                       display_name itemCount
 //                                                                       documentation ```java\nint itemCount\n```
     return spanCount;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
@@ -158,11 +177,13 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
+//                      display_name equals
 //                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 8
+//                               display_name o
 //                               documentation ```java\nObject o\n```
     if (this == o) {
 //              ^ reference local 8
@@ -183,6 +204,7 @@ public boolean equals(Object o) {
     SimpleEpoxyModel that = (SimpleEpoxyModel) o;
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                   ^^^^ definition local 9
+//                        display_name that
 //                        documentation ```java\nSimpleEpoxyModel that\n```
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                                             ^ reference local 8
@@ -214,11 +236,13 @@ public boolean equals(Object o) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#hashCode().
+//                    display_name hashCode
 //                    documentation ```java\n@Override\npublic int hashCode()\n```
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = super.hashCode();
 //      ^^^^^^ definition local 10
+//             display_name result
 //             documentation ```java\nint result\n```
 //               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
index 8139cbd4f..b864fd0c4 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
@@ -25,44 +25,54 @@
 
 public class StringAttributeData {
 //           ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
+//                               display_name StringAttributeData
 //                               documentation ```java\npublic class StringAttributeData\n```
   private final boolean hasDefault;
 //                      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
+//                                 display_name hasDefault
 //                                 documentation ```java\nprivate final boolean hasDefault\n```
   @Nullable private final CharSequence defaultString;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#defaultString.
+//                                                   display_name defaultString
 //                                                   documentation ```java\n@Nullable\nprivate final CharSequence defaultString\n```
   @StringRes private final int defaultStringRes;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#defaultStringRes.
+//                                              display_name defaultStringRes
 //                                              documentation ```java\n@StringRes\nprivate final int defaultStringRes\n```
 
   @Nullable private CharSequence string;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
+//                                      display_name string
 //                                      documentation ```java\n@Nullable\nprivate CharSequence string\n```
   @StringRes private int stringRes;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#stringRes.
+//                                 display_name stringRes
 //                                 documentation ```java\n@StringRes\nprivate int stringRes\n```
   @PluralsRes private int pluralRes;
 // ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                        ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#pluralRes.
+//                                  display_name pluralRes
 //                                  documentation ```java\n@PluralsRes\nprivate int pluralRes\n```
   private int quantity;
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#quantity.
+//                     display_name quantity
 //                     documentation ```java\nprivate int quantity\n```
   @Nullable private Object[] formatArgs;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                           ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#formatArgs.
+//                                      display_name formatArgs
 //                                      documentation ```java\n@Nullable\nprivate Object[] formatArgs\n```
 
   public StringAttributeData() {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`().
+//                           display_name <init>
 //                           documentation ```java\npublic StringAttributeData()\n```
     hasDefault = false;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
@@ -74,10 +84,12 @@ public StringAttributeData() {
 
   public StringAttributeData(@Nullable CharSequence defaultString) {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`(+1).
+//                           display_name <init>
 //                           documentation ```java\npublic StringAttributeData(CharSequence defaultString)\n```
 //                            ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                  ^^^^^^^^^^^^^ definition local 0
+//                                                                display_name defaultString
 //                                                                documentation ```java\n@Nullable\nCharSequence defaultString\n```
     hasDefault = true;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
@@ -93,9 +105,11 @@ public StringAttributeData(@Nullable CharSequence defaultString) {
 
   public StringAttributeData(@StringRes int defaultStringRes) {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`(+2).
+//                           display_name <init>
 //                           documentation ```java\npublic StringAttributeData(int defaultStringRes)\n```
 //                            ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                          ^^^^^^^^^^^^^^^^ definition local 1
+//                                                           display_name defaultStringRes
 //                                                           documentation ```java\n@StringRes\nint defaultStringRes\n```
     hasDefault = true;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
@@ -111,10 +125,12 @@ public StringAttributeData(@StringRes int defaultStringRes) {
 
   public void setValue(@Nullable CharSequence string) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue().
+//                     display_name setValue
 //                     documentation ```java\npublic void setValue(CharSequence string)\n```
 //                      ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^ definition local 2
+//                                                   display_name string
 //                                                   documentation ```java\n@Nullable\nCharSequence string\n```
     this.string = string;
 //       ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
@@ -127,9 +143,11 @@ public void setValue(@Nullable CharSequence string) {
 
   public void setValue(@StringRes int stringRes) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+1).
+//                     display_name setValue
 //                     documentation ```java\npublic void setValue(int stringRes)\n```
 //                      ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                    ^^^^^^^^^ definition local 3
+//                                              display_name stringRes
 //                                              documentation ```java\n@StringRes\nint stringRes\n```
     setValue(stringRes, null);
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+2).
@@ -138,13 +156,16 @@ public void setValue(@StringRes int stringRes) {
 
   public void setValue(@StringRes int stringRes, @Nullable Object[] formatArgs) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+2).
+//                     display_name setValue
 //                     documentation ```java\npublic void setValue(int stringRes, Object[] formatArgs)\n```
 //                      ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                    ^^^^^^^^^ definition local 4
+//                                              display_name stringRes
 //                                              documentation ```java\n@StringRes\nint stringRes\n```
 //                                                ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                  ^^^^^^^^^^ definition local 5
+//                                                                             display_name formatArgs
 //                                                                             documentation ```java\n@Nullable\nObject[] formatArgs\n```
     if (stringRes != 0) {
 //      ^^^^^^^^^ reference local 4
@@ -166,6 +187,7 @@ public void setValue(@StringRes int stringRes, @Nullable Object[] formatArgs) {
 
   private void handleInvalidStringRes() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#handleInvalidStringRes().
+//                                    display_name handleInvalidStringRes
 //                                    documentation ```java\nprivate void handleInvalidStringRes()\n```
     if (hasDefault) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
@@ -187,15 +209,19 @@ private void handleInvalidStringRes() {
 
   public void setValue(@PluralsRes int pluralRes, int quantity, @Nullable Object[] formatArgs) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+3).
+//                     display_name setValue
 //                     documentation ```java\npublic void setValue(int pluralRes, int quantity, Object[] formatArgs)\n```
 //                      ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                                     ^^^^^^^^^ definition local 6
+//                                               display_name pluralRes
 //                                               documentation ```java\n@PluralsRes\nint pluralRes\n```
 //                                                    ^^^^^^^^ definition local 7
+//                                                             display_name quantity
 //                                                             documentation ```java\nint quantity\n```
 //                                                               ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                 ^^^^^^^^^^ definition local 8
+//                                                                                            display_name formatArgs
 //                                                                                            documentation ```java\n@Nullable\nObject[] formatArgs\n```
     if (pluralRes != 0) {
 //      ^^^^^^^^^ reference local 6
@@ -221,9 +247,11 @@ public void setValue(@PluralsRes int pluralRes, int quantity, @Nullable Object[]
   public CharSequence toString(Context context) {
 //       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#toString().
+//                             display_name toString
 //                             documentation ```java\npublic CharSequence toString(unresolved_type context)\n```
 //                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                     ^^^^^^^ definition local 9
+//                                             display_name context
 //                                             documentation ```java\nunresolved_type context\n```
     if (pluralRes != 0) {
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#pluralRes.
@@ -271,10 +299,12 @@ public CharSequence toString(Context context) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#equals().
+//                      display_name equals
 //                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 10
+//                               display_name o
 //                               documentation ```java\nObject o\n```
     if (this == o) {
 //              ^ reference local 10
@@ -289,6 +319,7 @@ public boolean equals(Object o) {
     StringAttributeData that = (StringAttributeData) o;
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
 //                      ^^^^ definition local 11
+//                           display_name that
 //                           documentation ```java\nStringAttributeData that\n```
 //                              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
 //                                                   ^ reference local 10
@@ -334,10 +365,12 @@ public boolean equals(Object o) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hashCode().
+//                    display_name hashCode
 //                    documentation ```java\n@Override\npublic int hashCode()\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = string != null ? string.hashCode() : 0;
 //      ^^^^^^ definition local 12
+//             display_name result
 //             documentation ```java\nint result\n```
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
index 7f55c4e33..ead8eb5cc 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
@@ -6,14 +6,18 @@
  */
 public interface StyleBuilderCallback<T> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#
+//                                    display_name StyleBuilderCallback
 //                                    documentation ```java\npublic interface StyleBuilderCallback<T>\n```
 //                                    documentation  Used for specifying dynamic styling for a view when creating a model. This is only used if the\n view is set up to be styled with the Paris library.\n
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#[T]
+//                                      display_name T
 //                                      documentation ```java\nT\n```
   void buildStyle(T builder);
 //     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#buildStyle().
+//                display_name buildStyle
 //                documentation ```java\npublic abstract void buildStyle(T builder)\n```
 //                ^ reference semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#[T]
 //                  ^^^^^^^ definition local 0
+//                          display_name builder
 //                          documentation ```java\nT builder\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
index 37d89da9e..10927764e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
@@ -2,17 +2,21 @@
 
 interface Timer {
 //        ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#
+//              display_name Timer
 //              documentation ```java\ninterface Timer\n```
   void start(String sectionName);
 //     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#start().
+//           display_name start
 //           documentation ```java\npublic abstract void start(String sectionName)\n```
 //           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/DebugTimer#start().
 //           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpTimer#start().
 //           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                  ^^^^^^^^^^^ definition local 0
+//                              display_name sectionName
 //                              documentation ```java\nString sectionName\n```
   void stop();
 //     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#stop().
+//          display_name stop
 //          documentation ```java\npublic abstract void stop()\n```
 //          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/DebugTimer#stop().
 //          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpTimer#stop().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
index c22b1954b..07eb185c6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
@@ -21,42 +21,52 @@
  */
 public abstract class Typed2EpoxyController<T, U> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#
+//                                          display_name Typed2EpoxyController
 //                                          documentation ```java\npublic abstract class Typed2EpoxyController<T, U>\n```
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by two objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed3EpoxyController\n @see Typed4EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                          relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
+//                                            display_name T
 //                                            documentation ```java\nT\n```
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
+//                                               display_name U
 //                                               documentation ```java\nU\n```
 //                                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data1.
+//                display_name data1
 //                documentation ```java\nprivate T data1\n```
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data2.
+//                display_name data2
 //                documentation ```java\nprivate U data2\n```
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
+//                                        display_name allowModelBuildRequests
 //                                        documentation ```java\nprivate boolean allowModelBuildRequests\n```
 
   public Typed2EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#`<init>`().
+//                             display_name <init>
 //                             documentation ```java\npublic Typed2EpoxyController()\n```
   }
 
   public Typed2EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#`<init>`(+1).
+//                             display_name <init>
 //                             documentation ```java\npublic Typed2EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
+//                                                          display_name modelBuildingHandler
 //                                                          documentation ```java\nunresolved_type modelBuildingHandler\n```
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
+//                                                                                  display_name diffingHandler
 //                                                                                  documentation ```java\nunresolved_type diffingHandler\n```
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
@@ -70,13 +80,16 @@ public Typed2EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
    */
   public void setData(T data1, U data2) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#setData().
+//                    display_name setData
 //                    documentation ```java\npublic void setData(T data1, U data2)\n```
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //                      ^^^^^ definition local 2
+//                            display_name data1
 //                            documentation ```java\nT data1\n```
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //                               ^^^^^ definition local 3
+//                                     display_name data2
 //                                     documentation ```java\nU data2\n```
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data1.
@@ -96,6 +109,7 @@ public void setData(T data1, U data2) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestModelBuild().
+//                                    display_name requestModelBuild
 //                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
@@ -114,11 +128,14 @@ public final void requestModelBuild() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#moveModel().
+//                      display_name moveModel
 //                      documentation ```java\n@Override\npublic void moveModel(int fromPosition, int toPosition)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 4
+//                                       display_name fromPosition
 //                                       documentation ```java\nint fromPosition\n```
 //                                            ^^^^^^^^^^ definition local 5
+//                                                       display_name toPosition
 //                                                       documentation ```java\nint toPosition\n```
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
@@ -135,9 +152,11 @@ public void moveModel(int fromPosition, int toPosition) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild().
+//                                     display_name requestDelayedModelBuild
 //                                     documentation ```java\n@Override\npublic void requestDelayedModelBuild(int delayMs)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 6
+//                                                 display_name delayMs
 //                                                 documentation ```java\nint delayMs\n```
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
@@ -156,6 +175,7 @@ public void requestDelayedModelBuild(int delayMs) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels().
+//                                 display_name buildModels
 //                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
@@ -173,11 +193,14 @@ protected final void buildModels() {
 
   protected abstract void buildModels(T data1, U data2);
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels(+1).
+//                                    display_name buildModels
 //                                    documentation ```java\nprotected abstract void buildModels(T data1, U data2)\n```
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //                                      ^^^^^ definition local 7
+//                                            display_name data1
 //                                            documentation ```java\nT data1\n```
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //                                               ^^^^^ definition local 8
+//                                                     display_name data2
 //                                                     documentation ```java\nU data2\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
index 07df85192..6e206df77 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
@@ -21,48 +21,60 @@
  */
 public abstract class Typed3EpoxyController<T, U, V> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#
+//                                          display_name Typed3EpoxyController
 //                                          documentation ```java\npublic abstract class Typed3EpoxyController<T, U, V>\n```
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by three objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed2EpoxyController\n @see Typed4EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                          relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
+//                                            display_name T
 //                                            documentation ```java\nT\n```
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
+//                                               display_name U
 //                                               documentation ```java\nU\n```
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
+//                                                  display_name V
 //                                                  documentation ```java\nV\n```
 //                                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data1.
+//                display_name data1
 //                documentation ```java\nprivate T data1\n```
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data2.
+//                display_name data2
 //                documentation ```java\nprivate U data2\n```
   private V data3;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data3.
+//                display_name data3
 //                documentation ```java\nprivate V data3\n```
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
+//                                        display_name allowModelBuildRequests
 //                                        documentation ```java\nprivate boolean allowModelBuildRequests\n```
 
   public Typed3EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#`<init>`().
+//                             display_name <init>
 //                             documentation ```java\npublic Typed3EpoxyController()\n```
   }
 
   public Typed3EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#`<init>`(+1).
+//                             display_name <init>
 //                             documentation ```java\npublic Typed3EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
+//                                                          display_name modelBuildingHandler
 //                                                          documentation ```java\nunresolved_type modelBuildingHandler\n```
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
+//                                                                                  display_name diffingHandler
 //                                                                                  documentation ```java\nunresolved_type diffingHandler\n```
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
@@ -76,16 +88,20 @@ public Typed3EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
    */
   public void setData(T data1, U data2, V data3) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#setData().
+//                    display_name setData
 //                    documentation ```java\npublic void setData(T data1, U data2, V data3)\n```
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //                      ^^^^^ definition local 2
+//                            display_name data1
 //                            documentation ```java\nT data1\n```
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //                               ^^^^^ definition local 3
+//                                     display_name data2
 //                                     documentation ```java\nU data2\n```
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //                                        ^^^^^ definition local 4
+//                                              display_name data3
 //                                              documentation ```java\nV data3\n```
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data1.
@@ -108,6 +124,7 @@ public void setData(T data1, U data2, V data3) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestModelBuild().
+//                                    display_name requestModelBuild
 //                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
@@ -126,11 +143,14 @@ public final void requestModelBuild() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#moveModel().
+//                      display_name moveModel
 //                      documentation ```java\n@Override\npublic void moveModel(int fromPosition, int toPosition)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 5
+//                                       display_name fromPosition
 //                                       documentation ```java\nint fromPosition\n```
 //                                            ^^^^^^^^^^ definition local 6
+//                                                       display_name toPosition
 //                                                       documentation ```java\nint toPosition\n```
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
@@ -147,9 +167,11 @@ public void moveModel(int fromPosition, int toPosition) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestDelayedModelBuild().
+//                                     display_name requestDelayedModelBuild
 //                                     documentation ```java\n@Override\npublic void requestDelayedModelBuild(int delayMs)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 7
+//                                                 display_name delayMs
 //                                                 documentation ```java\nint delayMs\n```
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
@@ -168,6 +190,7 @@ public void requestDelayedModelBuild(int delayMs) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels().
+//                                 display_name buildModels
 //                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
@@ -186,14 +209,18 @@ protected final void buildModels() {
 
   protected abstract void buildModels(T data1, U data2, V data3);
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels(+1).
+//                                    display_name buildModels
 //                                    documentation ```java\nprotected abstract void buildModels(T data1, U data2, V data3)\n```
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //                                      ^^^^^ definition local 8
+//                                            display_name data1
 //                                            documentation ```java\nT data1\n```
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //                                               ^^^^^ definition local 9
+//                                                     display_name data2
 //                                                     documentation ```java\nU data2\n```
 //                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //                                                        ^^^^^ definition local 10
+//                                                              display_name data3
 //                                                              documentation ```java\nV data3\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
index e773eca29..3c12c0008 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
@@ -21,54 +21,68 @@
  */
 public abstract class Typed4EpoxyController<T, U, V, W> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#
+//                                          display_name Typed4EpoxyController
 //                                          documentation ```java\npublic abstract class Typed4EpoxyController<T, U, V, W>\n```
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by four objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed2EpoxyController\n @see Typed3EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                          relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
+//                                            display_name T
 //                                            documentation ```java\nT\n```
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
+//                                               display_name U
 //                                               documentation ```java\nU\n```
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
+//                                                  display_name V
 //                                                  documentation ```java\nV\n```
 //                                                   ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
+//                                                     display_name W
 //                                                     documentation ```java\nW\n```
 //                                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data1.
+//                display_name data1
 //                documentation ```java\nprivate T data1\n```
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data2.
+//                display_name data2
 //                documentation ```java\nprivate U data2\n```
   private V data3;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data3.
+//                display_name data3
 //                documentation ```java\nprivate V data3\n```
   private W data4;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data4.
+//                display_name data4
 //                documentation ```java\nprivate W data4\n```
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
+//                                        display_name allowModelBuildRequests
 //                                        documentation ```java\nprivate boolean allowModelBuildRequests\n```
 
   public Typed4EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#`<init>`().
+//                             display_name <init>
 //                             documentation ```java\npublic Typed4EpoxyController()\n```
   }
 
   public Typed4EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#`<init>`(+1).
+//                             display_name <init>
 //                             documentation ```java\npublic Typed4EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
+//                                                          display_name modelBuildingHandler
 //                                                          documentation ```java\nunresolved_type modelBuildingHandler\n```
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
+//                                                                                  display_name diffingHandler
 //                                                                                  documentation ```java\nunresolved_type diffingHandler\n```
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
@@ -82,19 +96,24 @@ public Typed4EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
    */
   public void setData(T data1, U data2, V data3, W data4) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#setData().
+//                    display_name setData
 //                    documentation ```java\npublic void setData(T data1, U data2, V data3, W data4)\n```
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object, Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //                      ^^^^^ definition local 2
+//                            display_name data1
 //                            documentation ```java\nT data1\n```
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //                               ^^^^^ definition local 3
+//                                     display_name data2
 //                                     documentation ```java\nU data2\n```
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //                                        ^^^^^ definition local 4
+//                                              display_name data3
 //                                              documentation ```java\nV data3\n```
 //                                               ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //                                                 ^^^^^ definition local 5
+//                                                       display_name data4
 //                                                       documentation ```java\nW data4\n```
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data1.
@@ -120,6 +139,7 @@ public void setData(T data1, U data2, V data3, W data4) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#requestModelBuild().
+//                                    display_name requestModelBuild
 //                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
@@ -138,11 +158,14 @@ public final void requestModelBuild() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#moveModel().
+//                      display_name moveModel
 //                      documentation ```java\n@Override\npublic void moveModel(int fromPosition, int toPosition)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 6
+//                                       display_name fromPosition
 //                                       documentation ```java\nint fromPosition\n```
 //                                            ^^^^^^^^^^ definition local 7
+//                                                       display_name toPosition
 //                                                       documentation ```java\nint toPosition\n```
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
@@ -159,9 +182,11 @@ public void moveModel(int fromPosition, int toPosition) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#requestDelayedModelBuild().
+//                                     display_name requestDelayedModelBuild
 //                                     documentation ```java\n@Override\npublic void requestDelayedModelBuild(int delayMs)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 8
+//                                                 display_name delayMs
 //                                                 documentation ```java\nint delayMs\n```
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
@@ -180,6 +205,7 @@ public void requestDelayedModelBuild(int delayMs) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels().
+//                                 display_name buildModels
 //                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
@@ -199,18 +225,23 @@ protected final void buildModels() {
 
   protected abstract void buildModels(T data1, U data2, V data3, W data4);
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels(+1).
+//                                    display_name buildModels
 //                                    documentation ```java\nprotected abstract void buildModels(T data1, U data2, V data3, W data4)\n```
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //                                      ^^^^^ definition local 9
+//                                            display_name data1
 //                                            documentation ```java\nT data1\n```
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //                                               ^^^^^ definition local 10
+//                                                     display_name data2
 //                                                     documentation ```java\nU data2\n```
 //                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //                                                        ^^^^^ definition local 11
+//                                                              display_name data3
 //                                                              documentation ```java\nV data3\n```
 //                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //                                                                 ^^^^^ definition local 12
+//                                                                       display_name data4
 //                                                                       documentation ```java\nW data4\n```
 }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
index bfa1b91d6..fe27d8f4c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
@@ -25,35 +25,43 @@
  */
 public abstract class TypedEpoxyController<T> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#
+//                                         display_name TypedEpoxyController
 //                                         documentation ```java\npublic abstract class TypedEpoxyController<T>\n```
 //                                         documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by a single object.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData(Object)}\n whenever that data changes. This class will handle calling {@link #buildModels(Object)} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see Typed2EpoxyController\n @see Typed3EpoxyController\n @see Typed4EpoxyController\n
 //                                         relationship is_implementation semanticdb maven . . ModelCollector#
 //                                         relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                         relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                         ^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
+//                                           display_name T
 //                                           documentation ```java\nT\n```
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   private T currentData;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
+//                      display_name currentData
 //                      documentation ```java\nprivate T currentData\n```
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
+//                                        display_name allowModelBuildRequests
 //                                        documentation ```java\nprivate boolean allowModelBuildRequests\n```
 
   public TypedEpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#`<init>`().
+//                            display_name <init>
 //                            documentation ```java\npublic TypedEpoxyController()\n```
   }
 
   public TypedEpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#`<init>`(+1).
+//                            display_name <init>
 //                            documentation ```java\npublic TypedEpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
 //                            ^^^^^^^ reference semanticdb maven . . Handler#
 //                                    ^^^^^^^^^^^^^^^^^^^^ definition local 0
+//                                                         display_name modelBuildingHandler
 //                                                         documentation ```java\nunresolved_type modelBuildingHandler\n```
 //                                                          ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                  ^^^^^^^^^^^^^^ definition local 1
+//                                                                                 display_name diffingHandler
 //                                                                                 documentation ```java\nunresolved_type diffingHandler\n```
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
@@ -63,9 +71,11 @@ public TypedEpoxyController(Handler modelBuildingHandler, Handler diffingHandler
 
   public final void setData(T data) {
 //                  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#setData().
+//                          display_name setData
 //                          documentation ```java\npublic final void setData(T data)\n```
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //                            ^^^^ definition local 2
+//                                 display_name data
 //                                 documentation ```java\nT data\n```
     currentData = data;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
@@ -82,6 +92,7 @@ public final void setData(T data) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestModelBuild().
+//                                    display_name requestModelBuild
 //                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
@@ -100,11 +111,14 @@ public final void requestModelBuild() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#moveModel().
+//                      display_name moveModel
 //                      documentation ```java\n@Override\npublic void moveModel(int fromPosition, int toPosition)\n```
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 3
+//                                       display_name fromPosition
 //                                       documentation ```java\nint fromPosition\n```
 //                                            ^^^^^^^^^^ definition local 4
+//                                                       display_name toPosition
 //                                                       documentation ```java\nint toPosition\n```
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
@@ -121,9 +135,11 @@ public void moveModel(int fromPosition, int toPosition) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestDelayedModelBuild().
+//                                     display_name requestDelayedModelBuild
 //                                     documentation ```java\n@Override\npublic void requestDelayedModelBuild(int delayMs)\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 5
+//                                                 display_name delayMs
 //                                                 documentation ```java\nint delayMs\n```
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
@@ -143,6 +159,7 @@ public void requestDelayedModelBuild(int delayMs) {
   public final T getCurrentData() {
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#getCurrentData().
+//                              display_name getCurrentData
 //                              documentation ```java\n@Nullable\npublic final T getCurrentData()\n```
     return currentData;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
@@ -152,6 +169,7 @@ public final T getCurrentData() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#buildModels().
+//                                 display_name buildModels
 //                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
@@ -168,8 +186,10 @@ protected final void buildModels() {
 
   protected abstract void buildModels(T data);
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#buildModels(+1).
+//                                    display_name buildModels
 //                                    documentation ```java\nprotected abstract void buildModels(T data)\n```
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //                                      ^^^^ definition local 6
+//                                           display_name data
 //                                           documentation ```java\nT data\n```
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UnboundedViewPool.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UnboundedViewPool.kt
index 290f2aef1..fa29c80c4 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UnboundedViewPool.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UnboundedViewPool.kt
@@ -25,19 +25,24 @@ import java.util.Queue
  */
 internal class UnboundedViewPool : RecycledViewPool() {
 //             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#
+//                               display_name UnboundedViewPool
 //                               documentation ```kt\ninternal final class UnboundedViewPool\n```\n\n----\n\n\n Like its parent, UnboundedViewPool lets you share Views between multiple RecyclerViews. However\n there is no maximum number of recycled views that it will store. This usually ends up being\n optimal, barring any hard memory constraints, as RecyclerViews do not recycle more Views than\n they need.\n
 //             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#`<init>`().
+//                               display_name UnboundedViewPool
 //                               documentation ```kt\npublic constructor UnboundedViewPool()\n```\n\n----\n\n\n Like its parent, UnboundedViewPool lets you share Views between multiple RecyclerViews. However\n there is no maximum number of recycled views that it will store. This usually ends up being\n optimal, barring any hard memory constraints, as RecyclerViews do not recycle more Views than\n they need.\n
 
     private val scrapHeaps = SparseArray<Queue<ViewHolder>>()
 //              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getScrapHeaps().
+//                         display_name scrapHeaps
 //                         documentation ```kt\nprivate final val scrapHeaps: [Error type: Not found recorded type for SparseArray<Queue<ViewHolder>>()]\n```
 //              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#scrapHeaps.
+//                         display_name scrapHeaps
 //                         documentation ```kt\nprivate final val scrapHeaps: [Error type: Not found recorded type for SparseArray<Queue<ViewHolder>>()]\n```
 //                                       ^^^^^ reference semanticdb maven jdk 11 java/util/Queue#
 
     override fun clear() {
 //               ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#clear().
+//                     display_name clear
 //                     documentation ```kt\npublic open fun clear()\n```
         scrapHeaps.clear()
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getScrapHeaps().
@@ -46,11 +51,14 @@ internal class UnboundedViewPool : RecycledViewPool() {
 
     override fun setMaxRecycledViews(viewType: Int, max: Int) {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#setMaxRecycledViews().
+//                                   display_name setMaxRecycledViews
 //                                   documentation ```kt\npublic open fun setMaxRecycledViews(viewType: kotlin.Int, max: kotlin.Int)\n```
 //                                   ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#setMaxRecycledViews().(viewType)
+//                                            display_name viewType
 //                                            documentation ```kt\nvalue-parameter viewType: kotlin.Int\n```
 //                                             ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                  ^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#setMaxRecycledViews().(max)
+//                                                      display_name max
 //                                                      documentation ```kt\nvalue-parameter max: kotlin.Int\n```
 //                                                       ^^^ reference semanticdb maven . . kotlin/Int#
         throw UnsupportedOperationException(
@@ -61,12 +69,15 @@ internal class UnboundedViewPool : RecycledViewPool() {
 
     override fun getRecycledView(viewType: Int): ViewHolder? {
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getRecycledView().
+//                               display_name getRecycledView
 //                               documentation ```kt\npublic open fun getRecycledView(viewType: kotlin.Int): [Error type: Unresolved type for ViewHolder]?\n```
 //                               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getRecycledView().(viewType)
+//                                        display_name viewType
 //                                        documentation ```kt\nvalue-parameter viewType: kotlin.Int\n```
 //                                         ^^^ reference semanticdb maven . . kotlin/Int#
         val scrapHeap = scrapHeaps.get(viewType)
 //          ^^^^^^^^^ definition local 0
+//                    display_name scrapHeap
 //                    documentation ```kt\nval scrapHeap: [Error type: Return type for function cannot be resolved]\n```
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getScrapHeaps().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#scrapHeaps.
@@ -77,8 +88,10 @@ internal class UnboundedViewPool : RecycledViewPool() {
 
     override fun putRecycledView(viewHolder: ViewHolder) {
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#putRecycledView().
+//                               display_name putRecycledView
 //                               documentation ```kt\npublic open fun putRecycledView(viewHolder: [Error type: Unresolved type for ViewHolder])\n```
 //                               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#putRecycledView().(viewHolder)
+//                                          display_name viewHolder
 //                                          documentation ```kt\nvalue-parameter viewHolder: [Error type: Unresolved type for ViewHolder]\n```
         getScrapHeapForType(viewHolder.itemViewType).add(viewHolder)
 //      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getScrapHeapForType().
@@ -89,8 +102,10 @@ internal class UnboundedViewPool : RecycledViewPool() {
 
     override fun getRecycledViewCount(viewType: Int): Int {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getRecycledViewCount().
+//                                    display_name getRecycledViewCount
 //                                    documentation ```kt\npublic open fun getRecycledViewCount(viewType: kotlin.Int): kotlin.Int\n```
 //                                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getRecycledViewCount().(viewType)
+//                                             display_name viewType
 //                                             documentation ```kt\nvalue-parameter viewType: kotlin.Int\n```
 //                                              ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                    ^^^ reference semanticdb maven . . kotlin/Int#
@@ -102,13 +117,16 @@ internal class UnboundedViewPool : RecycledViewPool() {
 
     private fun getScrapHeapForType(viewType: Int): Queue<ViewHolder> {
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getScrapHeapForType().
+//                                  display_name getScrapHeapForType
 //                                  documentation ```kt\nprivate final fun getScrapHeapForType(viewType: kotlin.Int): java.util.Queue<[Error type: Unresolved type for ViewHolder]>\n```
 //                                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getScrapHeapForType().(viewType)
+//                                           display_name viewType
 //                                           documentation ```kt\nvalue-parameter viewType: kotlin.Int\n```
 //                                            ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                  ^^^^^ reference semanticdb maven jdk 11 java/util/Queue#
         var scrapHeap: Queue<ViewHolder>? = scrapHeaps.get(viewType)
 //          ^^^^^^^^^ definition local 1
+//                    display_name scrapHeap
 //                    documentation ```kt\nvar scrapHeap: java.util.Queue<[Error type: Unresolved type for ViewHolder]>?\n```
 //                     ^^^^^ reference semanticdb maven jdk 11 java/util/Queue#
 //                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UnboundedViewPool#getScrapHeaps().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
index e3bf39c75..4e9c26468 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
@@ -28,6 +28,7 @@
 /** Defines an operation that makes a change to the epoxy model list. */
 class UpdateOp {
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#
+//             display_name UpdateOp
 //             documentation ```java\nclass UpdateOp\n```
 //             documentation Defines an operation that makes a change to the epoxy model list. 
 
@@ -43,65 +44,81 @@ class UpdateOp {
 //                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/RetentionPolicy#SOURCE.
   @interface Type {
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
+//                display_name Type
 //                documentation ```java\n@IntDef({ADD, REMOVE, UPDATE, MOVE})\n@Retention(RetentionPolicy.SOURCE)\n@interface Type\n```
 //                relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
   }
 
   static final int ADD = 0;
 //                 ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#ADD.
+//                     display_name ADD
 //                     documentation ```java\nstatic final int ADD\n```
   static final int REMOVE = 1;
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#REMOVE.
+//                        display_name REMOVE
 //                        documentation ```java\nstatic final int REMOVE\n```
   static final int UPDATE = 2;
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#UPDATE.
+//                        display_name UPDATE
 //                        documentation ```java\nstatic final int UPDATE\n```
   static final int MOVE = 3;
 //                 ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#MOVE.
+//                      display_name MOVE
 //                      documentation ```java\nstatic final int MOVE\n```
 
   @Type int type;
 // ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //          ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#type.
+//               display_name type
 //               documentation ```java\n@Type\nint type\n```
   int positionStart;
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
+//                  display_name positionStart
 //                  documentation ```java\nint positionStart\n```
   /** Holds the target position if this is a MOVE */
   int itemCount;
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
+//              display_name itemCount
 //              documentation ```java\nint itemCount\n```
 //              documentation Holds the target position if this is a MOVE 
   ArrayList<EpoxyModel<?>> payloads;
 //^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#payloads.
+//                                  display_name payloads
 //                                  documentation ```java\nArrayList<EpoxyModel<?>> payloads\n```
 
   private UpdateOp() {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#`<init>`().
+//                 display_name <init>
 //                 documentation ```java\nprivate UpdateOp()\n```
   }
 
   static UpdateOp instance(@Type int type, int positionStart, int itemCount,
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
+//                         display_name instance
 //                         documentation ```java\nstatic UpdateOp instance(int type, int positionStart, int itemCount, EpoxyModel<?> payload)\n```
 //                          ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                   ^^^^ definition local 0
+//                                        display_name type
 //                                        documentation ```java\n@Type\nint type\n```
 //                                             ^^^^^^^^^^^^^ definition local 1
+//                                                           display_name positionStart
 //                                                           documentation ```java\nint positionStart\n```
 //                                                                ^^^^^^^^^ definition local 2
+//                                                                          display_name itemCount
 //                                                                          documentation ```java\nint itemCount\n```
       @Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^ definition local 3
+//                                    display_name payload
 //                                    documentation ```java\n@Nullable\nEpoxyModel<?> payload\n```
     UpdateOp op = new UpdateOp();
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //           ^^ definition local 4
+//              display_name op
 //              documentation ```java\nUpdateOp op\n```
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#`<init>`().
 
@@ -130,6 +147,7 @@ static UpdateOp instance(@Type int type, int positionStart, int itemCount,
   /** Returns the index one past the last item in the affected range. */
   int positionEnd() {
 //    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionEnd().
+//                display_name positionEnd
 //                documentation ```java\nint positionEnd()\n```
 //                documentation Returns the index one past the last item in the affected range. 
     return positionStart + itemCount;
@@ -139,8 +157,10 @@ int positionEnd() {
 
   boolean isAfter(int position) {
 //        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#isAfter().
+//                display_name isAfter
 //                documentation ```java\nboolean isAfter(int position)\n```
 //                    ^^^^^^^^ definition local 5
+//                             display_name position
 //                             documentation ```java\nint position\n```
     return position < positionStart;
 //         ^^^^^^^^ reference local 5
@@ -149,8 +169,10 @@ boolean isAfter(int position) {
 
   boolean isBefore(int position) {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#isBefore().
+//                 display_name isBefore
 //                 documentation ```java\nboolean isBefore(int position)\n```
 //                     ^^^^^^^^ definition local 6
+//                              display_name position
 //                              documentation ```java\nint position\n```
     return position >= positionEnd();
 //         ^^^^^^^^ reference local 6
@@ -159,8 +181,10 @@ boolean isBefore(int position) {
 
   boolean contains(int position) {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#contains().
+//                 display_name contains
 //                 documentation ```java\nboolean contains(int position)\n```
 //                     ^^^^^^^^ definition local 7
+//                              display_name position
 //                              documentation ```java\nint position\n```
     return position >= positionStart && position < positionEnd();
 //         ^^^^^^^^ reference local 7
@@ -171,10 +195,12 @@ boolean contains(int position) {
 
   void addPayload(@Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#addPayload().
+//                display_name addPayload
 //                documentation ```java\nvoid addPayload(EpoxyModel<?> payload)\n```
 //                 ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^^ definition local 8
+//                                                display_name payload
 //                                                documentation ```java\n@Nullable\nEpoxyModel<?> payload\n```
     if (payload == null) {
 //      ^^^^^^^ reference local 8
@@ -208,6 +234,7 @@ void addPayload(@Nullable EpoxyModel<?> payload) {
   public String toString() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#toString().
+//                       display_name toString
 //                       documentation ```java\n@Override\npublic String toString()\n```
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return "UpdateOp{"
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
index 9dce55ccb..03a6aef8d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
@@ -45,14 +45,17 @@
 /** Helper class to collect changes in a diff, batching when possible. */
 class UpdateOpHelper {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
+//                   display_name UpdateOpHelper
 //                   documentation ```java\nclass UpdateOpHelper\n```
 //                   documentation Helper class to collect changes in a diff, batching when possible. 
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#`<init>`().
+//                   display_name <init>
 //                   documentation ```java\nUpdateOpHelper()\n```
   final List<UpdateOp> opList = new ArrayList<>();
 //      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
+//                            display_name opList
 //                            documentation ```java\nfinal List<UpdateOp> opList\n```
 //                                  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   // We have to be careful to update all item positions in the list when we
@@ -63,27 +66,34 @@ class UpdateOpHelper {
 //      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#moves.
+//                           display_name moves
 //                           documentation ```java\nfinal List<UpdateOp> moves\n```
 //                                 ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   private UpdateOp lastOp;
 //        ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
+//                        display_name lastOp
 //                        documentation ```java\nprivate UpdateOp lastOp\n```
   private int numInsertions;
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
+//                          display_name numInsertions
 //                          documentation ```java\nprivate int numInsertions\n```
   private int numInsertionBatches;
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertionBatches.
+//                                display_name numInsertionBatches
 //                                documentation ```java\nprivate int numInsertionBatches\n```
   private int numRemovals;
 //            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
+//                        display_name numRemovals
 //                        documentation ```java\nprivate int numRemovals\n```
   private int numRemovalBatches;
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovalBatches.
+//                              display_name numRemovalBatches
 //                              documentation ```java\nprivate int numRemovalBatches\n```
 
   void reset() {
 //     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#reset().
+//           display_name reset
 //           documentation ```java\nvoid reset()\n```
     opList.clear();
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
@@ -105,8 +115,10 @@ void reset() {
 
   void add(int indexToInsert) {
 //     ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add().
+//         display_name add
 //         documentation ```java\nvoid add(int indexToInsert)\n```
 //             ^^^^^^^^^^^^^ definition local 0
+//                           display_name indexToInsert
 //                           documentation ```java\nint indexToInsert\n```
     add(indexToInsert, 1);
 //  ^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
@@ -115,10 +127,13 @@ void add(int indexToInsert) {
 
   void add(int startPosition, int itemCount) {
 //     ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
+//         display_name add
 //         documentation ```java\nvoid add(int startPosition, int itemCount)\n```
 //             ^^^^^^^^^^^^^ definition local 1
+//                           display_name startPosition
 //                           documentation ```java\nint startPosition\n```
 //                                ^^^^^^^^^ definition local 2
+//                                          display_name itemCount
 //                                          documentation ```java\nint itemCount\n```
     numInsertions += itemCount;
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
@@ -128,6 +143,7 @@ void add(int startPosition, int itemCount) {
     // range of the previous batch batch
     boolean batchWithLast = isLastOp(ADD)
 //          ^^^^^^^^^^^^^ definition local 3
+//                        display_name batchWithLast
 //                        documentation ```java\nboolean batchWithLast\n```
 //                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //                                   ^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#ADD.
@@ -157,8 +173,10 @@ void add(int startPosition, int itemCount) {
 
   void update(int indexToChange) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update().
+//            display_name update
 //            documentation ```java\nvoid update(int indexToChange)\n```
 //                ^^^^^^^^^^^^^ definition local 4
+//                              display_name indexToChange
 //                              documentation ```java\nint indexToChange\n```
     update(indexToChange, null);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update(+1).
@@ -167,11 +185,14 @@ void update(int indexToChange) {
 
   void update(final int indexToChange, EpoxyModel<?> payload) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update(+1).
+//            display_name update
 //            documentation ```java\nvoid update(int indexToChange, EpoxyModel<?> payload)\n```
 //                      ^^^^^^^^^^^^^ definition local 5
+//                                    display_name indexToChange
 //                                    documentation ```java\nfinal int indexToChange\n```
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                   ^^^^^^^ definition local 6
+//                                                           display_name payload
 //                                                           documentation ```java\nEpoxyModel<?> payload\n```
     if (isLastOp(UPDATE)) {
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
@@ -224,8 +245,10 @@ void update(final int indexToChange, EpoxyModel<?> payload) {
 
   void remove(int indexToRemove) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove().
+//            display_name remove
 //            documentation ```java\nvoid remove(int indexToRemove)\n```
 //                ^^^^^^^^^^^^^ definition local 7
+//                              display_name indexToRemove
 //                              documentation ```java\nint indexToRemove\n```
     remove(indexToRemove, 1);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
@@ -234,10 +257,13 @@ void remove(int indexToRemove) {
 
   void remove(int startPosition, int itemCount) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
+//            display_name remove
 //            documentation ```java\nvoid remove(int startPosition, int itemCount)\n```
 //                ^^^^^^^^^^^^^ definition local 8
+//                              display_name startPosition
 //                              documentation ```java\nint startPosition\n```
 //                                   ^^^^^^^^^ definition local 9
+//                                             display_name itemCount
 //                                             documentation ```java\nint itemCount\n```
     numRemovals += itemCount;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
@@ -245,6 +271,7 @@ void remove(int startPosition, int itemCount) {
 
     boolean batchWithLast = false;
 //          ^^^^^^^^^^^^^ definition local 10
+//                        display_name batchWithLast
 //                        documentation ```java\nboolean batchWithLast\n```
     if (isLastOp(REMOVE)) {
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
@@ -293,10 +320,12 @@ void remove(int startPosition, int itemCount) {
 
   private boolean isLastOp(@UpdateOp.Type int updateType) {
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
+//                         display_name isLastOp
 //                         documentation ```java\nprivate boolean isLastOp(int updateType)\n```
 //                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                                   ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                            ^^^^^^^^^^ definition local 11
+//                                                       display_name updateType
 //                                                       documentation ```java\n@Type\nint updateType\n```
     return lastOp != null && lastOp.type == updateType;
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
@@ -307,13 +336,17 @@ private boolean isLastOp(@UpdateOp.Type int updateType) {
 
   private void addNewOperation(@Type int type, int position, int itemCount) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation().
+//                             display_name addNewOperation
 //                             documentation ```java\nprivate void addNewOperation(int type, int position, int itemCount)\n```
 //                              ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                       ^^^^ definition local 12
+//                                            display_name type
 //                                            documentation ```java\n@Type\nint type\n```
 //                                                 ^^^^^^^^ definition local 13
+//                                                          display_name position
 //                                                          documentation ```java\nint position\n```
 //                                                               ^^^^^^^^^ definition local 14
+//                                                                         display_name itemCount
 //                                                                         documentation ```java\nint itemCount\n```
     addNewOperation(type, position, itemCount, null);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
@@ -324,18 +357,23 @@ private void addNewOperation(@Type int type, int position, int itemCount) {
 
   private void addNewOperation(@Type int type, int position, int itemCount,
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
+//                             display_name addNewOperation
 //                             documentation ```java\nprivate void addNewOperation(int type, int position, int itemCount, EpoxyModel<?> payload)\n```
 //                              ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                       ^^^^ definition local 15
+//                                            display_name type
 //                                            documentation ```java\n@Type\nint type\n```
 //                                                 ^^^^^^^^ definition local 16
+//                                                          display_name position
 //                                                          documentation ```java\nint position\n```
 //                                                               ^^^^^^^^^ definition local 17
+//                                                                         display_name itemCount
 //                                                                         documentation ```java\nint itemCount\n```
       @Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^ definition local 18
+//                                    display_name payload
 //                                    documentation ```java\n@Nullable\nEpoxyModel<?> payload\n```
     lastOp = UpdateOp.instance(type, position, itemCount, payload);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
@@ -353,11 +391,14 @@ private void addNewOperation(@Type int type, int position, int itemCount,
 
   private void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addItemsToLastOperation().
+//                                     display_name addItemsToLastOperation
 //                                     documentation ```java\nprivate void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload)\n```
 //                                         ^^^^^^^^^^^^^ definition local 19
+//                                                       display_name numItemsToAdd
 //                                                       documentation ```java\nint numItemsToAdd\n```
 //                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                      ^^^^^^^ definition local 20
+//                                                                              display_name payload
 //                                                                              documentation ```java\nEpoxyModel<?> payload\n```
     lastOp.itemCount += numItemsToAdd;
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
@@ -371,10 +412,13 @@ private void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload) {
 
   void move(int from, int to) {
 //     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#move().
+//          display_name move
 //          documentation ```java\nvoid move(int from, int to)\n```
 //              ^^^^ definition local 21
+//                   display_name from
 //                   documentation ```java\nint from\n```
 //                        ^^ definition local 22
+//                           display_name to
 //                           documentation ```java\nint to\n```
     // We can't batch moves
     lastOp = null;
@@ -382,6 +426,7 @@ void move(int from, int to) {
     UpdateOp op = UpdateOp.instance(MOVE, from, to, null);
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //           ^^ definition local 23
+//              display_name op
 //              documentation ```java\nUpdateOp op\n```
 //                ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
@@ -400,6 +445,7 @@ void move(int from, int to) {
 
   int getNumRemovals() {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumRemovals().
+//                   display_name getNumRemovals
 //                   documentation ```java\nint getNumRemovals()\n```
     return numRemovals;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
@@ -407,6 +453,7 @@ int getNumRemovals() {
 
   boolean hasRemovals() {
 //        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#hasRemovals().
+//                    display_name hasRemovals
 //                    documentation ```java\nboolean hasRemovals()\n```
     return numRemovals > 0;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
@@ -414,6 +461,7 @@ boolean hasRemovals() {
 
   int getNumInsertions() {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumInsertions().
+//                     display_name getNumInsertions
 //                     documentation ```java\nint getNumInsertions()\n```
     return numInsertions;
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
@@ -421,6 +469,7 @@ int getNumInsertions() {
 
   boolean hasInsertions() {
 //        ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#hasInsertions().
+//                      display_name hasInsertions
 //                      documentation ```java\nboolean hasInsertions()\n```
     return numInsertions > 0;
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
@@ -428,6 +477,7 @@ boolean hasInsertions() {
 
   int getNumMoves() {
 //    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumMoves().
+//                display_name getNumMoves
 //                documentation ```java\nint getNumMoves()\n```
     return moves.size();
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#moves.
@@ -436,6 +486,7 @@ int getNumMoves() {
 
   int getNumInsertionBatches() {
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumInsertionBatches().
+//                           display_name getNumInsertionBatches
 //                           documentation ```java\nint getNumInsertionBatches()\n```
     return numInsertionBatches;
 //         ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertionBatches.
@@ -443,6 +494,7 @@ int getNumInsertionBatches() {
 
   int getNumRemovalBatches() {
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumRemovalBatches().
+//                         display_name getNumRemovalBatches
 //                         documentation ```java\nint getNumRemovalBatches()\n```
     return numRemovalBatches;
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovalBatches.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
index 231eb8984..41376cde1 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
@@ -60,6 +60,7 @@
 //^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 class ViewHolderState extends LongSparseArray<ViewState> implements Parcelable {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
+//                    display_name ViewHolderState
 //                    documentation ```java\n@SuppressWarnings("WeakerAccess")\nclass ViewHolderState\n```
 //                    documentation  Helper for {@link EpoxyAdapter} to store the state of Views in the adapter. This is useful for\n saving changes due to user input, such as text input or selection, when a view is scrolled off\n screen or if the adapter needs to be recreated.\n <p/>\n This saved state is separate from the state represented by a {@link EpoxyModel}, which should\n represent the more permanent state of the data shown in the view. This class stores transient\n state that is added to the View after it is bound to a {@link EpoxyModel}. For example, a {@link\n EpoxyModel} may inflate and bind an EditText and then be responsible for styling it and attaching\n listeners. If the user then inputs text, scrolls the view offscreen and then scrolls back, this\n class will preserve the inputted text without the {@link EpoxyModel} needing to be aware of its\n existence.\n <p/>\n This class relies on the adapter having stable ids, as the state of a view is mapped to the id of\n the {@link EpoxyModel}.\n
 //                    relationship is_implementation semanticdb maven . . Parcelable#
@@ -70,13 +71,16 @@ class ViewHolderState extends LongSparseArray<ViewState> implements Parcelable {
 //                                                                  ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
   ViewHolderState() {
 //^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`().
+//                display_name <init>
 //                documentation ```java\nViewHolderState()\n```
   }
 
   private ViewHolderState(int size) {
 //        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`(+1).
+//                        display_name <init>
 //                        documentation ```java\nprivate ViewHolderState(int size)\n```
 //                            ^^^^ definition local 0
+//                                 display_name size
 //                                 documentation ```java\nint size\n```
     super(size);
 //  ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#`<init>`(+1).
@@ -87,6 +91,7 @@ private ViewHolderState(int size) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int describeContents() {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#describeContents().
+//                            display_name describeContents
 //                            documentation ```java\n@Override\npublic int describeContents()\n```
     return 0;
   }
@@ -95,14 +100,18 @@ public int describeContents() {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void writeToParcel(Parcel dest, int flags) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
+//                          display_name writeToParcel
 //                          documentation ```java\n@Override\npublic void writeToParcel(unresolved_type dest, int flags)\n```
 //                          ^^^^^^ reference semanticdb maven . . Parcel#
 //                                 ^^^^ definition local 1
+//                                      display_name dest
 //                                      documentation ```java\nunresolved_type dest\n```
 //                                           ^^^^^ definition local 2
+//                                                 display_name flags
 //                                                 documentation ```java\nint flags\n```
     final int size = size();
 //            ^^^^ definition local 3
+//                 display_name size
 //                 documentation ```java\nfinal int size\n```
 //                   ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
     dest.writeInt(size);
@@ -111,6 +120,7 @@ public void writeToParcel(Parcel dest, int flags) {
 //                ^^^^ reference local 3
     for (int i = 0; i < size; i++) {
 //           ^ definition local 4
+//             display_name i
 //             documentation ```java\nint i\n```
 //                  ^ reference local 4
 //                      ^^^^ reference local 3
@@ -132,6 +142,7 @@ public void writeToParcel(Parcel dest, int flags) {
 //                    ^^^^^^^ reference semanticdb maven . . Creator#
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 //                                             ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#CREATOR.
+//                                                     display_name CREATOR
 //                                                     documentation ```java\npublic static final unresolved_type CREATOR\n```
 //                                                           ^^^^^^^ reference semanticdb maven . . Creator#
 //                                                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
@@ -156,9 +167,11 @@ public ViewHolderState createFromParcel(Parcel source) {
 
   public boolean hasStateForHolder(EpoxyViewHolder holder) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#hasStateForHolder().
+//                                 display_name hasStateForHolder
 //                                 documentation ```java\npublic boolean hasStateForHolder(EpoxyViewHolder holder)\n```
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^ definition local 5
+//                                                        display_name holder
 //                                                        documentation ```java\nEpoxyViewHolder holder\n```
     return get(holder.getItemId()) != null;
 //         ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
@@ -168,14 +181,17 @@ public boolean hasStateForHolder(EpoxyViewHolder holder) {
 
   public void save(Collection<EpoxyViewHolder> holders) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save().
+//                 display_name save
 //                 documentation ```java\npublic void save(Collection<EpoxyViewHolder> holders)\n```
 //                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^^ definition local 6
+//                                                     display_name holders
 //                                                     documentation ```java\nCollection<EpoxyViewHolder> holders\n```
     for (EpoxyViewHolder holder : holders) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^ definition local 7
+//                              display_name holder
 //                              documentation ```java\nEpoxyViewHolder holder\n```
 //                                ^^^^^^^ reference local 6
       save(holder);
@@ -187,10 +203,12 @@ public void save(Collection<EpoxyViewHolder> holders) {
   /** Save the state of the view bound to the given holder. */
   public void save(EpoxyViewHolder holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
+//                 display_name save
 //                 documentation ```java\npublic void save(EpoxyViewHolder holder)\n```
 //                 documentation Save the state of the view bound to the given holder. 
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                 ^^^^^^ definition local 8
+//                                        display_name holder
 //                                        documentation ```java\nEpoxyViewHolder holder\n```
     if (!holder.getModel().shouldSaveViewState()) {
 //       ^^^^^^ reference local 8
@@ -205,6 +223,7 @@ public void save(EpoxyViewHolder holder) {
     ViewState state = get(holder.getItemId());
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //            ^^^^^ definition local 9
+//                  display_name state
 //                  documentation ```java\nViewState state\n```
 //                    ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //                        ^^^^^^ reference local 8
@@ -234,10 +253,12 @@ public void save(EpoxyViewHolder holder) {
    */
   public void restore(EpoxyViewHolder holder) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#restore().
+//                    display_name restore
 //                    documentation ```java\npublic void restore(EpoxyViewHolder holder)\n```
 //                    documentation  If a state was previously saved for this view holder via {@link #save} it will be restored\n here.\n
 //                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                    ^^^^^^ definition local 10
+//                                           display_name holder
 //                                           documentation ```java\nEpoxyViewHolder holder\n```
     if (!holder.getModel().shouldSaveViewState()) {
 //       ^^^^^^ reference local 10
@@ -249,6 +270,7 @@ public void restore(EpoxyViewHolder holder) {
     ViewState state = get(holder.getItemId());
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //            ^^^^^ definition local 11
+//                  display_name state
 //                  documentation ```java\nViewState state\n```
 //                    ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //                        ^^^^^^ reference local 10
@@ -275,6 +297,7 @@ public void restore(EpoxyViewHolder holder) {
    */
   public static class ViewState extends SparseArray<Parcelable> implements Parcelable {
 //                    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
+//                              display_name ViewState
 //                              documentation ```java\npublic static class ViewState\n```
 //                              documentation  A wrapper around a sparse array as a helper to save the state of a view. This also adds\n parcelable support.\n
 //                              relationship is_implementation semanticdb maven . . Parcelable#
@@ -285,23 +308,29 @@ public static class ViewState extends SparseArray<Parcelable> implements Parcela
 
     ViewState() {
 //  ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`().
+//            display_name <init>
 //            documentation ```java\nViewState()\n```
     }
 
     private ViewState(int size, int[] keys, Parcelable[] values) {
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`(+1).
+//                    display_name <init>
 //                    documentation ```java\nprivate ViewState(int size, int[] keys, unresolved_type[] values)\n```
 //                        ^^^^ definition local 12
+//                             display_name size
 //                             documentation ```java\nint size\n```
 //                                    ^^^^ definition local 13
+//                                         display_name keys
 //                                         documentation ```java\nint[] keys\n```
 //                                          ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                                                       ^^^^^^ definition local 14
+//                                                              display_name values
 //                                                              documentation ```java\nunresolved_type[] values\n```
       super(size);
 //          ^^^^ reference local 12
       for (int i = 0; i < size; ++i) {
 //             ^ definition local 15
+//               display_name i
 //               documentation ```java\nint i\n```
 //                    ^ reference local 15
 //                        ^^^^ reference local 12
@@ -317,12 +346,15 @@ private ViewState(int size, int[] keys, Parcelable[] values) {
 
     public void save(View view) {
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#save().
+//                   display_name save
 //                   documentation ```java\npublic void save(unresolved_type view)\n```
 //                   ^^^^ reference semanticdb maven . . View#
 //                        ^^^^ definition local 16
+//                             display_name view
 //                             documentation ```java\nunresolved_type view\n```
       int originalId = view.getId();
 //        ^^^^^^^^^^ definition local 17
+//                   display_name originalId
 //                   documentation ```java\nint originalId\n```
 //                     ^^^^ reference local 16
 //                          ^^^^^ reference semanticdb maven . . View#getId#
@@ -341,12 +373,15 @@ public void save(View view) {
 
     public void restore(View view) {
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#restore().
+//                      display_name restore
 //                      documentation ```java\npublic void restore(unresolved_type view)\n```
 //                      ^^^^ reference semanticdb maven . . View#
 //                           ^^^^ definition local 18
+//                                display_name view
 //                                documentation ```java\nunresolved_type view\n```
       int originalId = view.getId();
 //        ^^^^^^^^^^ definition local 19
+//                   display_name originalId
 //                   documentation ```java\nint originalId\n```
 //                     ^^^^ reference local 18
 //                          ^^^^^ reference semanticdb maven . . View#getId#
@@ -371,10 +406,12 @@ public void restore(View view) {
      */
     private void setIdIfNoneExists(View view) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#setIdIfNoneExists().
+//                                 display_name setIdIfNoneExists
 //                                 documentation ```java\nprivate void setIdIfNoneExists(unresolved_type view)\n```
 //                                 documentation  If a view hasn't had an id set we need to set a temporary one in order to save state, since a\n view won't save its state unless it has an id. The view's id is also the key into the sparse\n array for its saved state, so the temporary one we choose just needs to be consistent between\n saving and restoring state.\n
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^ definition local 20
+//                                           display_name view
 //                                           documentation ```java\nunresolved_type view\n```
       if (view.getId() == View.NO_ID) {
 //        ^^^^ reference local 20
@@ -394,6 +431,7 @@ private void setIdIfNoneExists(View view) {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public int describeContents() {
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#describeContents().
+//                              display_name describeContents
 //                              documentation ```java\n@Override\npublic int describeContents()\n```
       return 0;
     }
@@ -402,28 +440,35 @@ public int describeContents() {
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void writeToParcel(Parcel parcel, int flags) {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
+//                            display_name writeToParcel
 //                            documentation ```java\n@Override\npublic void writeToParcel(unresolved_type parcel, int flags)\n```
 //                            ^^^^^^ reference semanticdb maven . . Parcel#
 //                                   ^^^^^^ definition local 21
+//                                          display_name parcel
 //                                          documentation ```java\nunresolved_type parcel\n```
 //                                               ^^^^^ definition local 22
+//                                                     display_name flags
 //                                                     documentation ```java\nint flags\n```
       int size = size();
 //        ^^^^ definition local 23
+//             display_name size
 //             documentation ```java\nint size\n```
 //               ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
       int[] keys = new int[size];
 //          ^^^^ definition local 24
+//               display_name keys
 //               documentation ```java\nint[] keys\n```
 //                         ^^^^ reference local 23
       Parcelable[] values = new Parcelable[size];
 //    ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                 ^^^^^^ definition local 25
+//                        display_name values
 //                        documentation ```java\nunresolved_type[] values\n```
 //                              ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                                         ^^^^ reference local 23
       for (int i = 0; i < size; ++i) {
 //             ^ definition local 26
+//               display_name i
 //               documentation ```java\nint i\n```
 //                    ^ reference local 26
 //                        ^^^^ reference local 23
@@ -458,6 +503,7 @@ public void writeToParcel(Parcel parcel, int flags) {
 //                      ^^^^^^^ reference semanticdb maven . . Creator#
 //                              ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //                                         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#CREATOR.
+//                                                 display_name CREATOR
 //                                                 documentation ```java\npublic static final unresolved_type CREATOR\n```
         new Parcelable.ClassLoaderCreator<ViewState>() {
 //          ^^^^^^^^^^ reference semanticdb maven . . Parcelable/
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
index 56dde2f33..0b6b131f0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
@@ -20,14 +20,17 @@
 
 class ViewTypeManager {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#
+//                    display_name ViewTypeManager
 //                    documentation ```java\nclass ViewTypeManager\n```
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#`<init>`().
+//                    display_name <init>
 //                    documentation ```java\nViewTypeManager()\n```
   private static final Map<Class, Integer> VIEW_TYPE_MAP = new HashMap<>();
 //                     ^^^ reference semanticdb maven jdk 11 java/util/Map#
 //                         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                                         ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
+//                                                       display_name VIEW_TYPE_MAP
 //                                                       documentation ```java\nprivate static final Map<Class, Integer> VIEW_TYPE_MAP\n```
 //                                                             ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   /**
@@ -39,6 +42,7 @@ class ViewTypeManager {
   EpoxyModel<?> lastModelForViewTypeLookup;
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
+//                                         display_name lastModelForViewTypeLookup
 //                                         documentation ```java\n@Nullable\nEpoxyModel<?> lastModelForViewTypeLookup\n```
 //                                         documentation  The last model that had its view type looked up. This is stored so in most cases we can quickly\n look up what view type belongs to which model.\n
 
@@ -52,6 +56,7 @@ class ViewTypeManager {
 // ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/VisibleForTesting#
   void resetMapForTesting() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#resetMapForTesting().
+//                        display_name resetMapForTesting
 //                        documentation ```java\n@VisibleForTesting\nvoid resetMapForTesting()\n```
 //                        documentation  The type map is static so that models of the same class share the same views across different\n adapters. This is useful for view recycling when the adapter instance changes, or when there\n are multiple adapters. For testing purposes though it is good to be able to clear the map so we\n don't carry over values across tests.\n
     VIEW_TYPE_MAP.clear();
@@ -61,9 +66,11 @@ void resetMapForTesting() {
 
   int getViewTypeAndRememberModel(EpoxyModel<?> model) {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewTypeAndRememberModel().
+//                                display_name getViewTypeAndRememberModel
 //                                documentation ```java\nint getViewTypeAndRememberModel(EpoxyModel<?> model)\n```
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 0
+//                                                    display_name model
 //                                                    documentation ```java\nEpoxyModel<?> model\n```
     lastModelForViewTypeLookup = model;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
@@ -75,12 +82,15 @@ int getViewTypeAndRememberModel(EpoxyModel<?> model) {
 
   static int getViewType(EpoxyModel<?> model) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
+//                       display_name getViewType
 //                       documentation ```java\nstatic int getViewType(EpoxyModel<?> model)\n```
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^ definition local 1
+//                                           display_name model
 //                                           documentation ```java\nEpoxyModel<?> model\n```
     int defaultViewType = model.getViewType();
 //      ^^^^^^^^^^^^^^^ definition local 2
+//                      display_name defaultViewType
 //                      documentation ```java\nint defaultViewType\n```
 //                        ^^^^^ reference local 1
 //                              ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
@@ -95,6 +105,7 @@ static int getViewType(EpoxyModel<?> model) {
     Class modelClass = model.getClass();
 //  ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //        ^^^^^^^^^^ definition local 3
+//                   display_name modelClass
 //                   documentation ```java\nClass modelClass\n```
 //                     ^^^^^ reference local 1
 //                           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
@@ -102,6 +113,7 @@ static int getViewType(EpoxyModel<?> model) {
     Integer viewType = VIEW_TYPE_MAP.get(modelClass);
 //  ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //          ^^^^^^^^ definition local 4
+//                   display_name viewType
 //                   documentation ```java\nInteger viewType\n```
 //                     ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
 //                                   ^^^ reference semanticdb maven jdk 11 java/util/Map#get().
@@ -142,12 +154,15 @@ static int getViewType(EpoxyModel<?> model) {
   EpoxyModel<?> getModelForViewType(BaseEpoxyAdapter adapter, int viewType) {
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
+//                                  display_name getModelForViewType
 //                                  documentation ```java\nEpoxyModel<?> getModelForViewType(BaseEpoxyAdapter adapter, int viewType)\n```
 //                                  documentation  Find the model that has the given view type so we can create a view for that model. In most\n cases this value is a layout resource and we could simply inflate it, but to support {@link\n EpoxyModelWithView} we can't assume the view type is a layout. In that case we need to lookup\n the model so we can ask it to create a new view for itself.\n <p>\n To make this efficient, we rely on the RecyclerView implementation detail that {@link\n BaseEpoxyAdapter#getItemViewType(int)} is called immediately before {@link\n BaseEpoxyAdapter#onCreateViewHolder(android.view.ViewGroup, int)} . We cache the last model\n that had its view type looked up, and unless that implementation changes we expect to have a\n very fast lookup for the correct model.\n <p>\n To be safe, we fallback to searching through all models for a view type match. This is slow and\n shouldn't be needed, but is a guard against recyclerview behavior changing.\n
 //                                  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                                                   ^^^^^^^ definition local 5
+//                                                           display_name adapter
 //                                                           documentation ```java\nBaseEpoxyAdapter adapter\n```
 //                                                                ^^^^^^^^ definition local 6
+//                                                                         display_name viewType
 //                                                                         documentation ```java\nint viewType\n```
     if (lastModelForViewTypeLookup != null
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
@@ -170,6 +185,7 @@ && getViewType(lastModelForViewTypeLookup) == viewType) {
     for (EpoxyModel<?> model : adapter.getCurrentModels()) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 7
+//                           display_name model
 //                           documentation ```java\nEpoxyModel<?> model\n```
 //                             ^^^^^^^ reference local 5
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
@@ -186,6 +202,7 @@ && getViewType(lastModelForViewTypeLookup) == viewType) {
     HiddenEpoxyModel hiddenEpoxyModel = new HiddenEpoxyModel();
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#
 //                   ^^^^^^^^^^^^^^^^ definition local 8
+//                                    display_name hiddenEpoxyModel
 //                                    documentation ```java\nHiddenEpoxyModel hiddenEpoxyModel\n```
 //                                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
     if (viewType == hiddenEpoxyModel.getViewType()) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
index 762b95bc9..a0b53983d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
@@ -18,8 +18,10 @@
 
 public final class VisibilityState {
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#
+//                                 display_name VisibilityState
 //                                 documentation ```java\npublic final class VisibilityState\n```
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#`<init>`().
+//                                 display_name <init>
 //                                 documentation ```java\npublic VisibilityState()\n```
 
   @Retention(RetentionPolicy.SOURCE)
@@ -43,6 +45,7 @@ public final class VisibilityState {
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_INVISIBLE.
   public @interface Visibility {
 //                  ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
+//                             display_name Visibility
 //                             documentation ```java\n@Retention(RetentionPolicy.SOURCE)\n@IntDef({VISIBLE, INVISIBLE, FOCUSED_VISIBLE, UNFOCUSED_VISIBLE, FULL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_INVISIBLE})\npublic @interface Visibility\n```
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
   }
@@ -53,6 +56,7 @@ public final class VisibilityState {
    */
   public static final int VISIBLE = 0;
 //                        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#VISIBLE.
+//                                display_name VISIBLE
 //                                documentation ```java\npublic static final int VISIBLE\n```
 //                                documentation  Event triggered when a Component enters the Visible Range. This happens when at least a pixel\n of the Component is visible.\n
 
@@ -63,6 +67,7 @@ public final class VisibilityState {
    */
   public static final int INVISIBLE = 1;
 //                        ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#INVISIBLE.
+//                                  display_name INVISIBLE
 //                                  documentation ```java\npublic static final int INVISIBLE\n```
 //                                  documentation  Event triggered when a Component becomes invisible. This is the same with exiting the Visible\n Range, the Focused Range and the Full Impression Range. All the code that needs to be executed\n when a component leaves any of these ranges should be written in the handler for this event.\n
 
@@ -73,6 +78,7 @@ public final class VisibilityState {
    */
   public static final int FOCUSED_VISIBLE = 2;
 //                        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#FOCUSED_VISIBLE.
+//                                        display_name FOCUSED_VISIBLE
 //                                        documentation ```java\npublic static final int FOCUSED_VISIBLE\n```
 //                                        documentation  Event triggered when a Component enters the Focused Range. This happens when either the\n Component occupies at least half of the viewport or, if the Component is smaller than half of\n the viewport, when the it is fully visible.\n
 
@@ -83,6 +89,7 @@ public final class VisibilityState {
    */
   public static final int UNFOCUSED_VISIBLE = 3;
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#UNFOCUSED_VISIBLE.
+//                                          display_name UNFOCUSED_VISIBLE
 //                                          documentation ```java\npublic static final int UNFOCUSED_VISIBLE\n```
 //                                          documentation  Event triggered when a Component exits the Focused Range. The Focused Range is defined as at\n least half of the viewport or, if the Component is smaller than half of the viewport, when the\n it is fully visible.\n
 
@@ -93,6 +100,7 @@ public final class VisibilityState {
    */
   public static final int FULL_IMPRESSION_VISIBLE = 4;
 //                        ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#FULL_IMPRESSION_VISIBLE.
+//                                                display_name FULL_IMPRESSION_VISIBLE
 //                                                documentation ```java\npublic static final int FULL_IMPRESSION_VISIBLE\n```
 //                                                documentation  Event triggered when a Component enters the Full Impression Range. This happens, for instance\n in the case of a vertical RecyclerView, when both the top and bottom edges of the component\n become visible.\n
 
@@ -104,6 +112,7 @@ public final class VisibilityState {
    */
   public static final int PARTIAL_IMPRESSION_VISIBLE = 5;
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_VISIBLE.
+//                                                   display_name PARTIAL_IMPRESSION_VISIBLE
 //                                                   documentation ```java\npublic static final int PARTIAL_IMPRESSION_VISIBLE\n```
 //                                                   documentation  Event triggered when a Component enters the Partial Impression Range. This happens, for\n instance in the case of a vertical RecyclerView, when the percentage of the visible area is\n at least the specified threshold. The threshold can be set in\n {@link EpoxyVisibilityTracker#setPartialImpressionThresholdPercentage(int)}.\n
 
@@ -115,6 +124,7 @@ public final class VisibilityState {
    */
   public static final int PARTIAL_IMPRESSION_INVISIBLE = 6;
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_INVISIBLE.
+//                                                     display_name PARTIAL_IMPRESSION_INVISIBLE
 //                                                     documentation ```java\npublic static final int PARTIAL_IMPRESSION_INVISIBLE\n```
 //                                                     documentation  Event triggered when a Component exits the Partial Impression Range. This happens, for\n instance in the case of a vertical RecyclerView, when the percentage of the visible area is\n less than a specified threshold. The threshold can be set in\n {@link EpoxyVisibilityTracker#setPartialImpressionThresholdPercentage(int)}.\n
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
index ab0bd8933..89029928a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
@@ -22,13 +22,16 @@
  */
 public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#
+//                                                  display_name WrappedEpoxyModelCheckedChangeListener
 //                                                  documentation ```java\npublic class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>\n```
 //                                                  documentation  Used in the generated models to transform normal checked change listener to model\n checked change.\n
 //                                                  relationship is_implementation semanticdb maven . . OnCheckedChangeListener#
 //                                                  ^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[T]
+//                                                    display_name T
 //                                                    documentation ```java\nT extends EpoxyModel<?>\n```
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                           ^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[V]
+//                                                                             display_name V
 //                                                                             documentation ```java\nV\n```
     implements OnCheckedChangeListener {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . OnCheckedChangeListener#
@@ -38,16 +41,19 @@ public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[T]
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[V]
 //                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#originalCheckedChangeListener.
+//                                                                               display_name originalCheckedChangeListener
 //                                                                               documentation ```java\nprivate final OnModelCheckedChangeListener<T, V> originalCheckedChangeListener\n```
 
   public WrappedEpoxyModelCheckedChangeListener(
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#`<init>`().
+//                                              display_name <init>
 //                                              documentation ```java\npublic WrappedEpoxyModelCheckedChangeListener(OnModelCheckedChangeListener<T, V> checkedListener)\n```
       OnModelCheckedChangeListener<T, V> checkedListener
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#
 //                                 ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[T]
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[V]
 //                                       ^^^^^^^^^^^^^^^ definition local 0
+//                                                       display_name checkedListener
 //                                                       documentation ```java\nOnModelCheckedChangeListener<T, V> checkedListener\n```
   ) {
     if (checkedListener == null) {
@@ -65,15 +71,19 @@ public WrappedEpoxyModelCheckedChangeListener(
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
+//                             display_name onCheckedChanged
 //                             documentation ```java\n@Override\npublic void onCheckedChanged(unresolved_type button, boolean isChecked)\n```
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven . . CompoundButton#
 //                                            ^^^^^^ definition local 1
+//                                                   display_name button
 //                                                   documentation ```java\nunresolved_type button\n```
 //                                                            ^^^^^^^^^ definition local 2
+//                                                                      display_name isChecked
 //                                                                      documentation ```java\nboolean isChecked\n```
     EpoxyViewHolder epoxyHolder = ListenersUtils.getEpoxyHolderForChildView(button);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                  ^^^^^^^^^^^ definition local 3
+//                              display_name epoxyHolder
 //                              documentation ```java\nEpoxyViewHolder epoxyHolder\n```
 //                                ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
@@ -91,6 +101,7 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 
     final int adapterPosition = epoxyHolder.getAdapterPosition();
 //            ^^^^^^^^^^^^^^^ definition local 4
+//                            display_name adapterPosition
 //                            documentation ```java\nfinal int adapterPosition\n```
 //                              ^^^^^^^^^^^ reference local 3
 //                                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
@@ -119,10 +130,12 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#equals().
+//                      display_name equals
 //                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 5
+//                               display_name o
 //                               documentation ```java\nObject o\n```
     if (this == o) {
 //              ^ reference local 5
@@ -138,6 +151,7 @@ public boolean equals(Object o) {
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#
         that = (WrappedEpoxyModelCheckedChangeListener<?, ?>) o;
 //      ^^^^ definition local 6
+//           display_name that
 //           documentation ```java\nWrappedEpoxyModelCheckedChangeListener<?, ?> that\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#
 //                                                            ^ reference local 5
@@ -153,6 +167,7 @@ public boolean equals(Object o) {
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#hashCode().
+//                    display_name hashCode
 //                    documentation ```java\n@Override\npublic int hashCode()\n```
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     return originalCheckedChangeListener.hashCode();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelClickListener.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelClickListener.kt
index 332fc8582..6002ebf5d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelClickListener.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelClickListener.kt
@@ -16,32 +16,41 @@ import androidx.recyclerview.widget.RecyclerView
  */
 class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, OnLongClickListener {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#
+//                                   display_name WrappedEpoxyModelClickListener
 //                                   documentation ```kt\npublic final class WrappedEpoxyModelClickListener<T, V>\n```\n\n----\n\n\n Used in the generated models to transform normal view click listeners to model click\n listeners.\n
 //                                   ^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[T]
+//                                     display_name T
 //                                     documentation ```kt\n<T>\n```
 //                                                      ^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[V]
+//                                                        display_name V
 //                                                        documentation ```kt\n<V>\n```
     // Save the original click listener to call back to when clicked.
     // This also lets us call back to the original hashCode and equals methods
     private val originalClickListener: OnModelClickListener<T, V>?
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getOriginalClickListener().
+//                                    display_name originalClickListener
 //                                    documentation ```kt\nprivate final val originalClickListener: [Error type: Unresolved type for OnModelClickListener<T, V>]<T, V>?\n```
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#originalClickListener.
+//                                    display_name originalClickListener
 //                                    documentation ```kt\nprivate final val originalClickListener: [Error type: Unresolved type for OnModelClickListener<T, V>]<T, V>?\n```
 //                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[T]
 //                                                             ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[V]
     private val originalLongClickListener: OnModelLongClickListener<T, V>?
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getOriginalLongClickListener().
+//                                        display_name originalLongClickListener
 //                                        documentation ```kt\nprivate final val originalLongClickListener: [Error type: Unresolved type for OnModelLongClickListener<T, V>]<T, V>?\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#originalLongClickListener.
+//                                        display_name originalLongClickListener
 //                                        documentation ```kt\nprivate final val originalLongClickListener: [Error type: Unresolved type for OnModelLongClickListener<T, V>]<T, V>?\n```
 //                                                                  ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[T]
 //                                                                     ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[V]
 
     constructor(clickListener: OnModelClickListener<T, V>?) {
 //  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#`<init>`().
+//              display_name WrappedEpoxyModelClickListener
 //              documentation ```kt\npublic constructor WrappedEpoxyModelClickListener<T, V>(clickListener: [Error type: Unresolved type for OnModelClickListener<T, V>]<T, V>?)\n```
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#`<init>`().(clickListener)
+//                            display_name clickListener
 //                            documentation ```kt\nvalue-parameter clickListener: [Error type: Unresolved type for OnModelClickListener<T, V>]<T, V>?\n```
 //                                                  ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[T]
 //                                                     ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[V]
@@ -63,8 +72,10 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
     constructor(clickListener: OnModelLongClickListener<T, V>?) {
 //  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#`<init>`(+1).
+//              display_name WrappedEpoxyModelClickListener
 //              documentation ```kt\npublic constructor WrappedEpoxyModelClickListener<T, V>(clickListener: [Error type: Unresolved type for OnModelLongClickListener<T, V>]<T, V>?)\n```
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#`<init>`(+1).(clickListener)
+//                            display_name clickListener
 //                            documentation ```kt\nvalue-parameter clickListener: [Error type: Unresolved type for OnModelLongClickListener<T, V>]<T, V>?\n```
 //                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[T]
 //                                                         ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#[V]
@@ -86,11 +97,14 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
     override fun onClick(view: View) {
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#onClick().
+//                       display_name onClick
 //                       documentation ```kt\npublic open fun onClick(view: [Error type: Unresolved type for View])\n```
 //                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#onClick().(view)
+//                            display_name view
 //                            documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
         val modelInfo = getClickedModelInfo(view) ?: return
 //          ^^^^^^^^^ definition local 0
+//                    display_name modelInfo
 //                    documentation ```kt\nval modelInfo: com.airbnb.epoxy.WrappedEpoxyModelClickListener.ClickedModelInfo\n```
 //                      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getClickedModelInfo().
 //                                          ^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#onClick().(view)
@@ -122,12 +136,15 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
     override fun onLongClick(view: View): Boolean {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#onLongClick().
+//                           display_name onLongClick
 //                           documentation ```kt\npublic open fun onLongClick(view: [Error type: Unresolved type for View]): kotlin.Boolean\n```
 //                           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#onLongClick().(view)
+//                                display_name view
 //                                documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                                        ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         val modelInfo = getClickedModelInfo(view) ?: return false
 //          ^^^^^^^^^ definition local 1
+//                    display_name modelInfo
 //                    documentation ```kt\nval modelInfo: com.airbnb.epoxy.WrappedEpoxyModelClickListener.ClickedModelInfo\n```
 //                      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getClickedModelInfo().
 //                                          ^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#onLongClick().(view)
@@ -159,12 +176,15 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
     private fun getClickedModelInfo(view: View): ClickedModelInfo? {
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getClickedModelInfo().
+//                                  display_name getClickedModelInfo
 //                                  documentation ```kt\nprivate final fun getClickedModelInfo(view: [Error type: Unresolved type for View]): com.airbnb.epoxy.WrappedEpoxyModelClickListener.ClickedModelInfo?\n```
 //                                  ^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getClickedModelInfo().(view)
+//                                       display_name view
 //                                       documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                                               ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#
         val epoxyHolder = ListenersUtils.getEpoxyHolderForChildView(view)
 //          ^^^^^^^^^^^ definition local 2
+//                      display_name epoxyHolder
 //                      documentation ```kt\nval epoxyHolder: kotlin.Nothing\n```
 //                                                                  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getClickedModelInfo().(view)
             ?: error("Could not find RecyclerView holder for clicked view")
@@ -172,6 +192,7 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
         val adapterPosition = epoxyHolder.adapterPosition
 //          ^^^^^^^^^^^^^^^ definition local 3
+//                          display_name adapterPosition
 //                          documentation ```kt\nval adapterPosition: [Error type: Not found recorded type for epoxyHolder.adapterPosition]\n```
 //                            ^^^^^^^^^^^ reference local 2
         if (adapterPosition == RecyclerView.NO_POSITION) return null
@@ -179,11 +200,13 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
         val boundObject = epoxyHolder.objectToBind()
 //          ^^^^^^^^^^^ definition local 4
+//                      display_name boundObject
 //                      documentation ```kt\nval boundObject: [Error type: Not found recorded type for epoxyHolder.objectToBind()]\n```
 //                        ^^^^^^^^^^^ reference local 2
 
         val holderToUse = if (boundObject is ModelGroupHolder) {
 //          ^^^^^^^^^^^ definition local 5
+//                      display_name holderToUse
 //                      documentation ```kt\nval holderToUse: kotlin.Nothing\n```
 //                            ^^^^^^^^^^^ reference local 4
 //                                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelGroupHolder#
@@ -218,30 +241,41 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
     private class ClickedModelInfo(
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#
+//                                 display_name ClickedModelInfo
 //                                 documentation ```kt\nprivate final class ClickedModelInfo\n```
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#`<init>`().
+//                                 display_name ClickedModelInfo
 //                                 documentation ```kt\npublic constructor ClickedModelInfo(model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, adapterPosition: kotlin.Int, boundObject: kotlin.Any)\n```
         val model: EpoxyModel<*>,
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#`<init>`().(model)
+//                display_name model
 //                documentation ```kt\nvalue-parameter model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>\n```
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#getModel().
+//                display_name model
 //                documentation ```kt\npublic final val model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>\n```
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#model.
+//                display_name model
 //                documentation ```kt\npublic final val model: [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>\n```
         val adapterPosition: Int,
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#`<init>`().(adapterPosition)
+//                          display_name adapterPosition
 //                          documentation ```kt\nvalue-parameter adapterPosition: kotlin.Int\n```
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#adapterPosition.
+//                          display_name adapterPosition
 //                          documentation ```kt\npublic final val adapterPosition: kotlin.Int\n```
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#getAdapterPosition().
+//                          display_name adapterPosition
 //                          documentation ```kt\npublic final val adapterPosition: kotlin.Int\n```
 //                           ^^^ reference semanticdb maven . . kotlin/Int#
         val boundObject: Any
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#`<init>`().(boundObject)
+//                      display_name boundObject
 //                      documentation ```kt\nvalue-parameter boundObject: kotlin.Any\n```
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#boundObject.
+//                      display_name boundObject
 //                      documentation ```kt\npublic final val boundObject: kotlin.Any\n```
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#ClickedModelInfo#getBoundObject().
+//                      display_name boundObject
 //                      documentation ```kt\npublic final val boundObject: kotlin.Any\n```
 //                       ^^^ reference semanticdb maven . . kotlin/Any#
     )
@@ -251,10 +285,12 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
      */
     private val View.allViewsInHierarchy: Sequence<View>
 //                   ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#allViewsInHierarchy.
+//                                       display_name allViewsInHierarchy
 //                                       documentation ```kt\nprivate final val [Error type: Unresolved type for View].allViewsInHierarchy: kotlin.sequences.Sequence<[Error type: Unresolved type for View]>\n```\n\n----\n\n\n Returns a sequence of this View plus any and all children, recursively.\n
 //                                        ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/sequences/Sequence#
         get() {
 //      ^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getAllViewsInHierarchy().
+//          display_name get
 //          documentation ```kt\nprivate final fun [Error type: Unresolved type for View].`<get-allViewsInHierarchy>`(): kotlin.sequences.Sequence<[Error type: Unresolved type for View]>\n```
             return if (this is ViewGroup) {
 //                     ^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#allViewsInHierarchy.
@@ -271,14 +307,17 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
     /** Returns a [Sequence] over the child views in this view group. */
     internal val ViewGroup.children: Sequence<View>
 //                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#children.
+//                                  display_name children
 //                                  documentation ```kt\ninternal final val [Error type: Unresolved type for ViewGroup].children: kotlin.sequences.Sequence<[Error type: Unresolved type for View]>\n```\n\n----\n\n Returns a [Sequence] over the child views in this view group.
 //                                   ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/sequences/Sequence#
         get() = object : Sequence<View> {
 //      ^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getChildren().
+//          display_name get
 //          documentation ```kt\ninternal final fun [Error type: Unresolved type for ViewGroup].`<get-children>`(): kotlin.sequences.Sequence<[Error type: Unresolved type for View]>\n```
 //                       ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/sequences/Sequence#
             override fun iterator() = this@children.iterator()
 //                       ^^^^^^^^ definition local 6
+//                                display_name iterator
 //                                documentation ```kt\npublic open fun iterator(): [Error type: Return type for function cannot be resolved]\n```
 //                                relationship is_reference is_implementation semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/sequences/Sequence#iterator().
 //                                    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#children.
@@ -287,17 +326,22 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
     /** Returns a [MutableIterator] over the views in this view group. */
     internal operator fun ViewGroup.iterator() = object : MutableIterator<View> {
 //                                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#iterator().
+//                                           display_name iterator
 //                                           documentation ```kt\ninternal final operator fun [Error type: Unresolved type for ViewGroup].iterator(): kotlin.collections.MutableIterator<[Error type: Unresolved type for View]>\n```\n\n----\n\n Returns a [MutableIterator] over the views in this view group.
 //                                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . kotlin/collections/MutableIterator#
         private var index = 0
 //                  ^^^^^ definition local 7
+//                        display_name index
 //                        documentation ```kt\nprivate final var index: kotlin.Int\n```
 //                  ^^^^^ definition local 8
+//                        display_name index
 //                        documentation ```kt\nprivate final var index: kotlin.Int\n```
 //                  ^^^^^ definition local 9
+//                        display_name index
 //                        documentation ```kt\nprivate final var index: kotlin.Int\n```
         override fun hasNext() = index < childCount
 //                   ^^^^^^^ definition local 10
+//                           display_name hasNext
 //                           documentation ```kt\npublic open fun hasNext(): [Error type: Return type for function cannot be resolved]\n```
 //                           relationship is_reference is_implementation semanticdb maven . . kotlin/collections/Iterator#hasNext().
 //                           relationship is_reference is_implementation semanticdb maven . . kotlin/collections/MutableIterator#hasNext().
@@ -306,6 +350,7 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 //                               ^^^^^ reference local 9
         override fun next() = getChildAt(index++) ?: throw IndexOutOfBoundsException()
 //                   ^^^^ definition local 11
+//                        display_name next
 //                        documentation ```kt\npublic open fun next(): kotlin.Nothing\n```
 //                        relationship is_reference is_implementation semanticdb maven . . kotlin/collections/Iterator#next().
 //                        relationship is_reference is_implementation semanticdb maven . . kotlin/collections/MutableIterator#next().
@@ -315,6 +360,7 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 //                                            ^^ reference semanticdb maven . . kotlin/Int#inc().
         override fun remove() = removeViewAt(--index)
 //                   ^^^^^^ definition local 12
+//                          display_name remove
 //                          documentation ```kt\npublic open fun remove(): [Error type: Return type for function cannot be resolved]\n```
 //                          relationship is_reference is_implementation semanticdb maven . . kotlin/collections/MutableIterator#remove().
 //                                           ^^ reference semanticdb maven . . kotlin/Int#dec().
@@ -325,9 +371,11 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
     override fun equals(other: Any?): Boolean {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#equals().
+//                      display_name equals
 //                      documentation ```kt\npublic open fun equals(other: kotlin.Any?): kotlin.Boolean\n```
 //                      relationship is_reference is_implementation semanticdb maven . . kotlin/Any#equals().
 //                      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#equals().(other)
+//                            display_name other
 //                            documentation ```kt\nvalue-parameter other: kotlin.Any?\n```
 //                             ^^^ reference semanticdb maven . . kotlin/Any#
 //                                    ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
@@ -380,11 +428,13 @@ class WrappedEpoxyModelClickListener<T : EpoxyModel<*>, V> : OnClickListener, On
 
     override fun hashCode(): Int {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#hashCode().
+//                        display_name hashCode
 //                        documentation ```kt\npublic open fun hashCode(): kotlin.Int\n```
 //                        relationship is_reference is_implementation semanticdb maven . . kotlin/Any#hashCode().
 //                           ^^^ reference semanticdb maven . . kotlin/Int#
         var result = originalClickListener?.hashCode() ?: 0
 //          ^^^^^^ definition local 13
+//                 display_name result
 //                 documentation ```kt\nvar result: kotlin.Int\n```
 //                   ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#getOriginalClickListener().
 //                   ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelClickListener#originalClickListener.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/EpoxyModelPreloader.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/EpoxyModelPreloader.kt
index e9f24d70f..072e3e11c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/EpoxyModelPreloader.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/EpoxyModelPreloader.kt
@@ -19,24 +19,32 @@ import com.airbnb.epoxy.EpoxyModel
  */
 abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder>(
 //             ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
+//                                 display_name EpoxyModelPreloader
 //                                 documentation ```kt\npublic abstract class EpoxyModelPreloader<T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```\n\n----\n\n\n Describes how view content for an EpoxyModel should be preloaded.\n\n @param T The type of EpoxyModel that this preloader applies to\n @param U The type of view metadata to provide to the request builder.\n @param P The type of [PreloadRequestHolder] that will execute the preload request\n
 //             ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#`<init>`().
+//                                 display_name EpoxyModelPreloader
 //                                 documentation ```kt\npublic constructor EpoxyModelPreloader<T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder>(modelType: java.lang.Class<T>, preloadableViewIds: kotlin.collections.List<kotlin.Int>)\n```
 //                                 ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[T]
+//                                   display_name T
 //                                   documentation ```kt\n<T>\n```
 //                                                    ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[U]
+//                                                      display_name U
 //                                                      documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                                                        ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                                                       ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[P]
+//                                                                         display_name P
 //                                                                         documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                                           ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 
     val modelType: Class<T>,
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#`<init>`().(modelType)
+//                display_name modelType
 //                documentation ```kt\nvalue-parameter modelType: java.lang.Class<T>\n```
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#getModelType().
+//                display_name modelType
 //                documentation ```kt\npublic final val modelType: java.lang.Class<T>\n```
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#modelType.
+//                display_name modelType
 //                documentation ```kt\npublic final val modelType: java.lang.Class<T>\n```
 //                 ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                       ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[T]
@@ -47,10 +55,13 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
      */
     val preloadableViewIds: List<Int>
 //      ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#`<init>`().(preloadableViewIds)
+//                         display_name preloadableViewIds
 //                         documentation ```kt\nvalue-parameter preloadableViewIds: kotlin.collections.List<kotlin.Int>\n```\n\n----\n\n\n A list of view ids, one for each view that should be preloaded.\n This should be left empty if the EpoxyModel's type uses the [Preloadable] interface.\n
 //      ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#getPreloadableViewIds().
+//                         display_name preloadableViewIds
 //                         documentation ```kt\npublic final val preloadableViewIds: kotlin.collections.List<kotlin.Int>\n```\n\n----\n\n\n A list of view ids, one for each view that should be preloaded.\n This should be left empty if the EpoxyModel's type uses the [Preloadable] interface.\n
 //      ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#preloadableViewIds.
+//                         display_name preloadableViewIds
 //                         documentation ```kt\npublic final val preloadableViewIds: kotlin.collections.List<kotlin.Int>\n```\n\n----\n\n\n A list of view ids, one for each view that should be preloaded.\n This should be left empty if the EpoxyModel's type uses the [Preloadable] interface.\n
 //                          ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                               ^^^ reference semanticdb maven . . kotlin/Int#
@@ -68,8 +79,10 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
      */
     open fun viewSignature(epoxyModel: T): Any? = null
 //           ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#viewSignature().
+//                         display_name viewSignature
 //                         documentation ```kt\npublic open fun viewSignature(epoxyModel: T): kotlin.Any?\n```\n\n----\n\n\n An optional signature to differentiate views within the same model. This is useful if your EpoxyModel can contain varying amounts of preloadable views,\n or preloadable views of varying sizes.\n\n By default the model's class, span size, and layout resource, are used to differentiate views. This signature allows additional differentiation.\n For example, if your EpoxyModel shows an preloadable view that varies between portrait or landscape, this orientation will affect the view dimensions.\n In this case you could return a boolean here to differentiate the two cases so that the preloaded data has the correct orientation.\n\n The returned object can be anything, but it must implement [Object.hashCode]\n
 //                         ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#viewSignature().(epoxyModel)
+//                                    display_name epoxyModel
 //                                    documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[T]
 //                                         ^^^ reference semanticdb maven . . kotlin/Any#
@@ -83,8 +96,10 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
      */
     abstract fun buildViewMetadata(view: View): U
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#buildViewMetadata().
+//                                 display_name buildViewMetadata
 //                                 documentation ```kt\npublic abstract fun buildViewMetadata(view: [Error type: Unresolved type for View]): U\n```\n\n----\n\n\n Provide optional metadata about a view. This can be used in [EpoxyModelPreloader.buildRequest]\n\n A preload request works best if it exactly matches the actual request (in order to match cache keys exactly)\n Things such as request transformations, thumbnails, or crop type can affect the cache key.\n If your preloadable view is configurable you can capture those options via this metadata.\n
 //                                 ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#buildViewMetadata().(view)
+//                                      display_name view
 //                                      documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[U]
 
@@ -97,17 +112,21 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
      */
     abstract fun startPreload(
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#startPreload().
+//                            display_name startPreload
 //                            documentation ```kt\npublic abstract fun startPreload(epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<U>)\n```\n\n----\n\n\n Start a preload request with the given target.\n\n @param epoxyModel The EpoxyModel whose content is being preloaded.\n @param preloadTarget The target to ues to create and store the request.\n @param viewData Information about the view that will hold the preloaded content.\n
         epoxyModel: T,
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#startPreload().(epoxyModel)
+//                 display_name epoxyModel
 //                 documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[T]
         preloadTarget: P,
 //      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#startPreload().(preloadTarget)
+//                    display_name preloadTarget
 //                    documentation ```kt\nvalue-parameter preloadTarget: P\n```
 //                     ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[P]
         viewData: ViewData<U>
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#startPreload().(viewData)
+//               display_name viewData
 //               documentation ```kt\nvalue-parameter viewData: com.airbnb.epoxy.preload.ViewData<U>\n```
 //                ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewData#
 //                         ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#[U]
@@ -115,6 +134,7 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
 
     companion object {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion# 1:0
+//                     display_name Companion
 //                     documentation ```kt\npublic companion object\n```
 
         /**
@@ -127,28 +147,36 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
          */
         inline fun <reified T : EpoxyModel<*>, P : PreloadRequestHolder> with(
 //                          ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().[T]
+//                            display_name T
 //                            documentation ```kt\n<reified T>\n```
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().[P]
+//                                               display_name P
 //                                               documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                 ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().
+//                                                                            display_name with
 //                                                                            documentation ```kt\npublic final inline fun <reified T, P : com.airbnb.epoxy.preload.PreloadRequestHolder> with(preloadableViewIds: kotlin.collections.List<kotlin.Int> = ..., noinline doPreload: (epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<com.airbnb.epoxy.preload.ViewMetadata?>) -> kotlin.Unit): com.airbnb.epoxy.preload.EpoxyModelPreloader<T, com.airbnb.epoxy.preload.ViewMetadata?, P>\n```\n\n----\n\n\n Helper to create a [EpoxyModelPreloader].\n\n @param viewSignature see [EpoxyModelPreloader.viewSignature]\n @param preloadableViewIds see [EpoxyModelPreloader.preloadableViewIds]\n @param viewMetadata see [EpoxyModelPreloader.buildViewMetadata]\n @param doPreload see [EpoxyModelPreloader.startPreload]\n
             preloadableViewIds: List<Int> = emptyList(),
 //          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().(preloadableViewIds)
+//                             display_name preloadableViewIds
 //                             documentation ```kt\nvalue-parameter preloadableViewIds: kotlin.collections.List<kotlin.Int> = ...\n```
 //                              ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                                   ^^^ reference semanticdb maven . . kotlin/Int#
 //                                          ^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/collections/CollectionsKt#emptyList().
             noinline doPreload: (epoxyModel: T, preloadTarget: P, viewData: ViewData<ViewMetadata?>) -> Unit
 //                   ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().(doPreload)
+//                             display_name doPreload
 //                             documentation ```kt\nvalue-parameter noinline doPreload: (epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<com.airbnb.epoxy.preload.ViewMetadata?>) -> kotlin.Unit\n```
 //                               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().epoxyModel.
+//                                          display_name epoxyModel
 //                                          documentation ```kt\nval epoxyModel: T\n```
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().[T]
 //                                              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().preloadTarget.
+//                                                            display_name preloadTarget
 //                                                            documentation ```kt\nval preloadTarget: P\n```
 //                                                             ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().[P]
 //                                                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with().viewData.
+//                                                                         display_name viewData
 //                                                                         documentation ```kt\nval viewData: com.airbnb.epoxy.preload.ViewData<com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                                                                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewData#
 //                                                                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
@@ -184,46 +212,60 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
          */
         inline fun <reified T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder> with(
 //                          ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).[T]
+//                            display_name T
 //                            documentation ```kt\n<reified T>\n```
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).[U]
+//                                               display_name U
 //                                               documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                                                ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).[P]
+//                                                                  display_name P
 //                                                                  documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                                    ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                                                          ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).
+//                                                                                               display_name with
 //                                                                                               documentation ```kt\npublic final inline fun <reified T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder> with(preloadableViewIds: kotlin.collections.List<kotlin.Int> = ..., noinline viewMetadata: ([Error type: Unresolved type for View]) -> U, noinline viewSignature: (T) -> kotlin.Any? = ..., noinline doPreload: (epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<U>) -> kotlin.Unit): com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```\n\n----\n\n\n Helper to create a [EpoxyModelPreloader].\n\n @param viewSignature see [EpoxyModelPreloader.viewSignature]\n @param preloadableViewIds see [EpoxyModelPreloader.preloadableViewIds]\n @param viewMetadata see [EpoxyModelPreloader.buildViewMetadata]\n @param doPreload see [EpoxyModelPreloader.startPreload]\n
             preloadableViewIds: List<Int> = emptyList(),
 //          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).(preloadableViewIds)
+//                             display_name preloadableViewIds
 //                             documentation ```kt\nvalue-parameter preloadableViewIds: kotlin.collections.List<kotlin.Int> = ...\n```
 //                              ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                                   ^^^ reference semanticdb maven . . kotlin/Int#
 //                                          ^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/collections/CollectionsKt#emptyList().
             noinline viewMetadata: (View) -> U,
 //                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).(viewMetadata)
+//                                display_name viewMetadata
 //                                documentation ```kt\nvalue-parameter noinline viewMetadata: ([Error type: Unresolved type for View]) -> U\n```
 //                                  ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).`<no name provided>`.
+//                                       display_name T
 //                                       documentation ```kt\nval `<no name provided>`: T\n```
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).[U]
             noinline viewSignature: (T) -> Any? = { _ -> null },
 //                   ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).(viewSignature)
+//                                 display_name viewSignature
 //                                 documentation ```kt\nvalue-parameter noinline viewSignature: (T) -> kotlin.Any? = ...\n```
 //                                   ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).[T]
 //                                   ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).`<no name provided>`.
+//                                     display_name T
 //                                     documentation ```kt\nval `<no name provided>`: T\n```
 //                                         ^^^ reference semanticdb maven . . kotlin/Any#
 //                                                  ^ definition local 1
+//                                                    display_name _
 //                                                    documentation ```kt\nvalue-parameter `<anonymous parameter 0>`: T\n```
             noinline doPreload: (epoxyModel: T, preloadTarget: P, viewData: ViewData<U>) -> Unit
 //                   ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).(doPreload)
+//                             display_name doPreload
 //                             documentation ```kt\nvalue-parameter noinline doPreload: (epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<U>) -> kotlin.Unit\n```
 //                               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).epoxyModel.
+//                                          display_name epoxyModel
 //                                          documentation ```kt\nval epoxyModel: T\n```
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).[T]
 //                                              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).preloadTarget.
+//                                                            display_name preloadTarget
 //                                                            documentation ```kt\nval preloadTarget: P\n```
 //                                                             ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).[P]
 //                                                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).viewData.
+//                                                                         display_name viewData
 //                                                                         documentation ```kt\nval viewData: com.airbnb.epoxy.preload.ViewData<U>\n```
 //                                                                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewData#
 //                                                                                   ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+1).[U]
@@ -264,51 +306,66 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
          */
         fun <T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder> with(
 //           ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[T]
+//             display_name T
 //             documentation ```kt\n<T>\n```
 //                              ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[U]
+//                                display_name U
 //                                documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                                 ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[P]
+//                                                   display_name P
 //                                                   documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                     ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                                           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).
+//                                                                                display_name with
 //                                                                                documentation ```kt\npublic final fun <T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder> with(preloadableViewIds: kotlin.collections.List<kotlin.Int> = ..., epoxyModelClass: java.lang.Class<T>, viewMetadata: ([Error type: Unresolved type for View]) -> U, viewSignature: (T) -> kotlin.Any? = ..., doPreload: (epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<U>) -> kotlin.Unit): com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```\n\n----\n\n\n Helper to create a [EpoxyModelPreloader]. This is similar to the other helper methods but not inlined so it can be used with Java.\n\n @param epoxyModelClass The specific type of EpoxyModel that this preloader is for.\n @param viewSignature see [EpoxyModelPreloader.viewSignature]\n @param preloadableViewIds see [EpoxyModelPreloader.preloadableViewIds]\n @param viewMetadata see [EpoxyModelPreloader.buildViewMetadata]\n @param doPreload see [EpoxyModelPreloader.startPreload]\n
             preloadableViewIds: List<Int> = emptyList(),
 //          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).(preloadableViewIds)
+//                             display_name preloadableViewIds
 //                             documentation ```kt\nvalue-parameter preloadableViewIds: kotlin.collections.List<kotlin.Int> = ...\n```
 //                              ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                                   ^^^ reference semanticdb maven . . kotlin/Int#
 //                                          ^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/collections/CollectionsKt#emptyList().
             epoxyModelClass: Class<T>,
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).(epoxyModelClass)
+//                          display_name epoxyModelClass
 //                          documentation ```kt\nvalue-parameter epoxyModelClass: java.lang.Class<T>\n```
 //                           ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                 ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[T]
             viewMetadata: (View) -> U,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).(viewMetadata)
+//                       display_name viewMetadata
 //                       documentation ```kt\nvalue-parameter viewMetadata: ([Error type: Unresolved type for View]) -> U\n```
 //                         ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).`<no name provided>`.
+//                              display_name T
 //                              documentation ```kt\nval `<no name provided>`: T\n```
 //                                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[U]
             viewSignature: (T) -> Any? = { _ -> null },
 //          ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).(viewSignature)
+//                        display_name viewSignature
 //                        documentation ```kt\nvalue-parameter viewSignature: (T) -> kotlin.Any? = ...\n```
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[T]
 //                          ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).`<no name provided>`.
+//                            display_name T
 //                            documentation ```kt\nval `<no name provided>`: T\n```
 //                                ^^^ reference semanticdb maven . . kotlin/Any#
 //                                         ^ definition local 2
+//                                           display_name _
 //                                           documentation ```kt\nvalue-parameter `<anonymous parameter 0>`: T\n```
             doPreload: (epoxyModel: T, preloadTarget: P, viewData: ViewData<U>) -> Unit
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).(doPreload)
+//                    display_name doPreload
 //                    documentation ```kt\nvalue-parameter doPreload: (epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<U>) -> kotlin.Unit\n```
 //                      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).epoxyModel.
+//                                 display_name epoxyModel
 //                                 documentation ```kt\nval epoxyModel: T\n```
 //                                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[T]
 //                                     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).preloadTarget.
+//                                                   display_name preloadTarget
 //                                                   documentation ```kt\nval preloadTarget: P\n```
 //                                                    ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[P]
 //                                                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).viewData.
+//                                                                display_name viewData
 //                                                                documentation ```kt\nval viewData: com.airbnb.epoxy.preload.ViewData<U>\n```
 //                                                                 ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewData#
 //                                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[U]
@@ -332,18 +389,22 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
 
             override fun buildViewMetadata(view: View) = viewMetadata(view)
 //                       ^^^^^^^^^^^^^^^^^ definition local 3
+//                                         display_name buildViewMetadata
 //                                         documentation ```kt\npublic open fun buildViewMetadata(view: [Error type: Unresolved type for View]): U\n```
 //                                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#buildViewMetadata().
 //                                         ^^^^ definition local 4
+//                                              display_name view
 //                                              documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                                                       ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).(viewMetadata)
 //                                                                    ^^^^ reference local 4
 
             override fun viewSignature(epoxyModel: T) = viewSignature(epoxyModel)
 //                       ^^^^^^^^^^^^^ definition local 5
+//                                     display_name viewSignature
 //                                     documentation ```kt\npublic open fun viewSignature(epoxyModel: T): kotlin.Any?\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#viewSignature().
 //                                     ^^^^^^^^^^ definition local 6
+//                                                display_name epoxyModel
 //                                                documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                                                 ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[T]
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).(viewSignature)
@@ -351,15 +412,19 @@ abstract class EpoxyModelPreloader<T : EpoxyModel<*>, U : ViewMetadata?, P : Pre
 
             override fun startPreload(epoxyModel: T, preloadTarget: P, viewData: ViewData<U>) {
 //                       ^^^^^^^^^^^^ definition local 7
+//                                    display_name startPreload
 //                                    documentation ```kt\npublic open fun startPreload(epoxyModel: T, preloadTarget: P, viewData: com.airbnb.epoxy.preload.ViewData<U>)\n```
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#startPreload().
 //                                    ^^^^^^^^^^ definition local 8
+//                                               display_name epoxyModel
 //                                               documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                                                ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[T]
 //                                                   ^^^^^^^^^^^^^ definition local 9
+//                                                                 display_name preloadTarget
 //                                                                 documentation ```kt\nvalue-parameter preloadTarget: P\n```
 //                                                                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[P]
 //                                                                     ^^^^^^^^ definition local 10
+//                                                                              display_name viewData
 //                                                                              documentation ```kt\nvalue-parameter viewData: com.airbnb.epoxy.preload.ViewData<U>\n```
 //                                                                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewData#
 //                                                                                        ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#Companion#with(+2).[U]
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/EpoxyPreloader.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/EpoxyPreloader.kt
index 60f2287f7..5c8044c4f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/EpoxyPreloader.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/EpoxyPreloader.kt
@@ -61,37 +61,49 @@ import kotlin.math.min
  */
 class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#
+//                   display_name EpoxyPreloader
 //                   documentation ```kt\npublic final class EpoxyPreloader<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```\n\n----\n\n\n A scroll listener that prefetches view content.\n\n To use this, create implementations of [EpoxyModelPreloader] for each EpoxyModel class that you want to preload.\n Then, use the [EpoxyPreloader.with] methods to create an instance that preloads models of that type.\n Finally, add the resulting scroll listener to your RecyclerView.\n\n If you are using [com.airbnb.epoxy.EpoxyRecyclerView] then use [com.airbnb.epoxy.EpoxyRecyclerView.addPreloader]\n to setup the preloader as a listener.\n\n Otherwise there is a [RecyclerView.addEpoxyPreloader] extension for easy usage.\n
 //                   ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#[P]
+//                     display_name P
 //                     documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                       ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`().
+//                                                                 display_name EpoxyPreloader
 //                                                                 documentation ```kt\nprivate constructor EpoxyPreloader<P : com.airbnb.epoxy.preload.PreloadRequestHolder>(adapter: [Error type: Unresolved type for BaseEpoxyAdapter], preloadTargetFactory: () -> P, errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */, maxItemsToPreload: kotlin.Int, modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<*, *, out P>>)\n```
     private val adapter: BaseEpoxyAdapter,
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`().(adapter)
+//                      display_name adapter
 //                      documentation ```kt\nvalue-parameter adapter: [Error type: Unresolved type for BaseEpoxyAdapter]\n```
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#adapter.
+//                      display_name adapter
 //                      documentation ```kt\nprivate final val adapter: [Error type: Unresolved type for BaseEpoxyAdapter]\n```
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getAdapter().
+//                      display_name adapter
 //                      documentation ```kt\nprivate final val adapter: [Error type: Unresolved type for BaseEpoxyAdapter]\n```
     preloadTargetFactory: () -> P,
 //  ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`().(preloadTargetFactory)
+//                       display_name preloadTargetFactory
 //                       documentation ```kt\nvalue-parameter preloadTargetFactory: () -> P\n```
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#[P]
     errorHandler: PreloadErrorHandler,
 //  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`().(errorHandler)
+//               display_name errorHandler
 //               documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
     private val maxItemsToPreload: Int,
 //              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`().(maxItemsToPreload)
+//                                display_name maxItemsToPreload
 //                                documentation ```kt\nvalue-parameter maxItemsToPreload: kotlin.Int\n```
 //              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getMaxItemsToPreload().
+//                                display_name maxItemsToPreload
 //                                documentation ```kt\nprivate final val maxItemsToPreload: kotlin.Int\n```
 //              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#maxItemsToPreload.
+//                                display_name maxItemsToPreload
 //                                documentation ```kt\nprivate final val maxItemsToPreload: kotlin.Int\n```
 //                                 ^^^ reference semanticdb maven . . kotlin/Int#
     modelPreloaders: List<EpoxyModelPreloader<*, *, out P>>
 //  ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`().(modelPreloaders)
+//                  display_name modelPreloaders
 //                  documentation ```kt\nvalue-parameter modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<*, *, out P>>\n```
 //                   ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
@@ -100,10 +112,13 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     private var lastVisibleRange: IntRange = IntRange.EMPTY
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getLastVisibleRange().
+//                               display_name lastVisibleRange
 //                               documentation ```kt\nprivate final var lastVisibleRange: kotlin.ranges.IntRange\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#lastVisibleRange.
+//                               display_name lastVisibleRange
 //                               documentation ```kt\nprivate final var lastVisibleRange: kotlin.ranges.IntRange\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#setLastVisibleRange().
+//                               display_name lastVisibleRange
 //                               documentation ```kt\nprivate final var lastVisibleRange: kotlin.ranges.IntRange\n```
 //                                ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/IntRange#
 //                                           ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/IntRange#Companion#
@@ -111,10 +126,13 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 //                                                    ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/IntRange#Companion#getEMPTY().
     private var lastPreloadRange: IntProgression = IntRange.EMPTY
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getLastPreloadRange().
+//                               display_name lastPreloadRange
 //                               documentation ```kt\nprivate final var lastPreloadRange: kotlin.ranges.IntProgression\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#lastPreloadRange.
+//                               display_name lastPreloadRange
 //                               documentation ```kt\nprivate final var lastPreloadRange: kotlin.ranges.IntProgression\n```
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#setLastPreloadRange().
+//                               display_name lastPreloadRange
 //                               documentation ```kt\nprivate final var lastPreloadRange: kotlin.ranges.IntProgression\n```
 //                                ^^^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/IntProgression#
 //                                                 ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/IntRange#Companion#
@@ -122,25 +140,33 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 //                                                          ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/IntRange#Companion#getEMPTY().
     private var totalItemCount = -1
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getTotalItemCount().
+//                             display_name totalItemCount
 //                             documentation ```kt\nprivate final var totalItemCount: kotlin.Int\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#setTotalItemCount().
+//                             display_name totalItemCount
 //                             documentation ```kt\nprivate final var totalItemCount: kotlin.Int\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#totalItemCount.
+//                             display_name totalItemCount
 //                             documentation ```kt\nprivate final var totalItemCount: kotlin.Int\n```
 //                               ^ reference semanticdb maven . . kotlin/Int#unaryMinus().
     private var scrollState: Int = RecyclerView.SCROLL_STATE_IDLE
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getScrollState().
+//                          display_name scrollState
 //                          documentation ```kt\nprivate final var scrollState: kotlin.Int\n```
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#scrollState.
+//                          display_name scrollState
 //                          documentation ```kt\nprivate final var scrollState: kotlin.Int\n```
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#setScrollState().
+//                          display_name scrollState
 //                          documentation ```kt\nprivate final var scrollState: kotlin.Int\n```
 //                           ^^^ reference semanticdb maven . . kotlin/Int#
 
     private val modelPreloaders: Map<Class<out EpoxyModel<*>>, EpoxyModelPreloader<*, *, out P>> =
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getModelPreloaders().
+//                              display_name modelPreloaders
 //                              documentation ```kt\nprivate final val modelPreloaders: kotlin.collections.Map<java.lang.Class<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>>, com.airbnb.epoxy.preload.EpoxyModelPreloader<*, *, out P>>\n```
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#modelPreloaders.
+//                              display_name modelPreloaders
 //                              documentation ```kt\nprivate final val modelPreloaders: kotlin.collections.Map<java.lang.Class<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>>, com.airbnb.epoxy.preload.EpoxyModelPreloader<*, *, out P>>\n```
 //                               ^^^ reference semanticdb maven . . kotlin/collections/Map#
 //                                   ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
@@ -155,8 +181,10 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     private val requestHolderFactory =
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getRequestHolderFactory().
+//                                   display_name requestHolderFactory
 //                                   documentation ```kt\nprivate final val requestHolderFactory: com.airbnb.epoxy.preload.PreloadTargetProvider<P>\n```
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#requestHolderFactory.
+//                                   display_name requestHolderFactory
 //                                   documentation ```kt\nprivate final val requestHolderFactory: com.airbnb.epoxy.preload.PreloadTargetProvider<P>\n```
         PreloadTargetProvider(maxItemsToPreload, preloadTargetFactory)
 //      ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#`<init>`().
@@ -166,8 +194,10 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     private val viewDataCache = PreloadableViewDataProvider(adapter, errorHandler)
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getViewDataCache().
+//                            display_name viewDataCache
 //                            documentation ```kt\nprivate final val viewDataCache: com.airbnb.epoxy.preload.PreloadableViewDataProvider\n```
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#viewDataCache.
+//                            display_name viewDataCache
 //                            documentation ```kt\nprivate final val viewDataCache: com.airbnb.epoxy.preload.PreloadableViewDataProvider\n```
 //                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#`<init>`().
 //                                                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#adapter.
@@ -176,24 +206,30 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     constructor(
 //  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+1).
+//              display_name EpoxyPreloader
 //              documentation ```kt\npublic constructor EpoxyPreloader<P : com.airbnb.epoxy.preload.PreloadRequestHolder>(epoxyController: [Error type: Unresolved type for EpoxyController], requestHolderFactory: () -> P, errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */, maxItemsToPreload: kotlin.Int, modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<*, *, out P>>)\n```
         epoxyController: EpoxyController,
 //      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+1).(epoxyController)
+//                      display_name epoxyController
 //                      documentation ```kt\nvalue-parameter epoxyController: [Error type: Unresolved type for EpoxyController]\n```
         requestHolderFactory: () -> P,
 //      ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+1).(requestHolderFactory)
+//                           display_name requestHolderFactory
 //                           documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //                                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#[P]
         errorHandler: PreloadErrorHandler,
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+1).(errorHandler)
+//                   display_name errorHandler
 //                   documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                    ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
         maxItemsToPreload: Int,
 //      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+1).(maxItemsToPreload)
+//                        display_name maxItemsToPreload
 //                        documentation ```kt\nvalue-parameter maxItemsToPreload: kotlin.Int\n```
 //                         ^^^ reference semanticdb maven . . kotlin/Int#
         modelPreloaders: List<EpoxyModelPreloader<*, *, out P>>
 //      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+1).(modelPreloaders)
+//                      display_name modelPreloaders
 //                      documentation ```kt\nvalue-parameter modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<*, *, out P>>\n```
 //                       ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                            ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
@@ -213,24 +249,30 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     constructor(
 //  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+2).
+//              display_name EpoxyPreloader
 //              documentation ```kt\npublic constructor EpoxyPreloader<P : com.airbnb.epoxy.preload.PreloadRequestHolder>(adapter: [Error type: Unresolved type for EpoxyAdapter], requestHolderFactory: () -> P, errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */, maxItemsToPreload: kotlin.Int, modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<*, *, out P>>)\n```
         adapter: EpoxyAdapter,
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+2).(adapter)
+//              display_name adapter
 //              documentation ```kt\nvalue-parameter adapter: [Error type: Unresolved type for EpoxyAdapter]\n```
         requestHolderFactory: () -> P,
 //      ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+2).(requestHolderFactory)
+//                           display_name requestHolderFactory
 //                           documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //                                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#[P]
         errorHandler: PreloadErrorHandler,
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+2).(errorHandler)
+//                   display_name errorHandler
 //                   documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                    ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
         maxItemsToPreload: Int,
 //      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+2).(maxItemsToPreload)
+//                        display_name maxItemsToPreload
 //                        documentation ```kt\nvalue-parameter maxItemsToPreload: kotlin.Int\n```
 //                         ^^^ reference semanticdb maven . . kotlin/Int#
         modelPreloaders: List<EpoxyModelPreloader<*, *, out P>>
 //      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#`<init>`(+2).(modelPreloaders)
+//                      display_name modelPreloaders
 //                      documentation ```kt\nvalue-parameter modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<*, *, out P>>\n```
 //                       ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                            ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
@@ -262,10 +304,13 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#onScrollStateChanged().
+//                                    display_name onScrollStateChanged
 //                                    documentation ```kt\npublic open fun onScrollStateChanged(recyclerView: [Error type: Unresolved type for RecyclerView], newState: kotlin.Int)\n```
 //                                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#onScrollStateChanged().(recyclerView)
+//                                                 display_name recyclerView
 //                                                 documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
 //                                                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#onScrollStateChanged().(newState)
+//                                                                         display_name newState
 //                                                                         documentation ```kt\nvalue-parameter newState: kotlin.Int\n```
 //                                                                          ^^^ reference semanticdb maven . . kotlin/Int#
         scrollState = newState
@@ -277,13 +322,17 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#onScrolled().
+//                          display_name onScrolled
 //                          documentation ```kt\npublic open fun onScrolled(recyclerView: [Error type: Unresolved type for RecyclerView], dx: kotlin.Int, dy: kotlin.Int)\n```
 //                          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#onScrolled().(recyclerView)
+//                                       display_name recyclerView
 //                                       documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
 //                                                      ^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#onScrolled().(dx)
+//                                                         display_name dx
 //                                                         documentation ```kt\nvalue-parameter dx: kotlin.Int\n```
 //                                                          ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                               ^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#onScrolled().(dy)
+//                                                                  display_name dy
 //                                                                  documentation ```kt\nvalue-parameter dy: kotlin.Int\n```
 //                                                                   ^^^ reference semanticdb maven . . kotlin/Int#
         if (dx == 0 && dy == 0) {
@@ -317,14 +366,17 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
         val layoutManager = recyclerView.layoutManager as LinearLayoutManager
 //          ^^^^^^^^^^^^^ definition local 1
+//                        display_name layoutManager
 //                        documentation ```kt\nval layoutManager: [Error type: Unresolved type for LinearLayoutManager]\n```
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#onScrolled().(recyclerView)
         val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
 //          ^^^^^^^^^^^^^^^^^^^^ definition local 2
+//                               display_name firstVisiblePosition
 //                               documentation ```kt\nval firstVisiblePosition: [Error type: Return type for function cannot be resolved]\n```
 //                                 ^^^^^^^^^^^^^ reference local 1
         val lastVisiblePosition = layoutManager.findLastVisibleItemPosition()
 //          ^^^^^^^^^^^^^^^^^^^ definition local 3
+//                              display_name lastVisiblePosition
 //                              documentation ```kt\nval lastVisiblePosition: [Error type: Return type for function cannot be resolved]\n```
 //                                ^^^^^^^^^^^^^ reference local 1
 
@@ -350,6 +402,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
         val visibleRange = IntRange(firstVisiblePosition, lastVisiblePosition)
 //          ^^^^^^^^^^^^ definition local 4
+//                       display_name visibleRange
 //                       documentation ```kt\nval visibleRange: kotlin.ranges.IntRange\n```
 //                         ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/IntRange#`<init>`().
 //                                  ^^^^^^^^^^^^^^^^^^^^ reference local 2
@@ -365,6 +418,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
         val isIncreasing =
 //          ^^^^^^^^^^^^ definition local 5
+//                       display_name isIncreasing
 //                       documentation ```kt\nval isIncreasing: kotlin.Boolean\n```
             visibleRange.first > lastVisibleRange.first || visibleRange.last > lastVisibleRange.last
 //          ^^^^^^^^^^^^ reference local 4
@@ -388,6 +442,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
         val preloadRange =
 //          ^^^^^^^^^^^^ definition local 6
+//                       display_name preloadRange
 //                       documentation ```kt\nval preloadRange: kotlin.ranges.IntProgression\n```
             calculatePreloadRange(firstVisiblePosition, lastVisiblePosition, isIncreasing)
 //          ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#calculatePreloadRange().
@@ -427,6 +482,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
     private fun Int.isFling() = Math.abs(this) > FLING_THRESHOLD_PX
 //              ^^^ reference semanticdb maven . . kotlin/Int#
 //                  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#isFling().
+//                          display_name isFling
 //                          documentation ```kt\nprivate final fun kotlin.Int.isFling(): kotlin.Boolean\n```\n\n----\n\n\n @receiver The number of pixels scrolled.\n @return True if this distance is large enough to be considered a fast fling.\n
 //                              ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
 //                                   ^^^ reference semanticdb maven jdk 11 java/lang/Math#abs().
@@ -437,23 +493,28 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     private fun calculatePreloadRange(
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#calculatePreloadRange().
+//                                    display_name calculatePreloadRange
 //                                    documentation ```kt\nprivate final fun calculatePreloadRange(firstVisiblePosition: kotlin.Int, lastVisiblePosition: kotlin.Int, isIncreasing: kotlin.Boolean): kotlin.ranges.IntProgression\n```
         firstVisiblePosition: Int,
 //      ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#calculatePreloadRange().(firstVisiblePosition)
+//                           display_name firstVisiblePosition
 //                           documentation ```kt\nvalue-parameter firstVisiblePosition: kotlin.Int\n```
 //                            ^^^ reference semanticdb maven . . kotlin/Int#
         lastVisiblePosition: Int,
 //      ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#calculatePreloadRange().(lastVisiblePosition)
+//                          display_name lastVisiblePosition
 //                          documentation ```kt\nvalue-parameter lastVisiblePosition: kotlin.Int\n```
 //                           ^^^ reference semanticdb maven . . kotlin/Int#
         isIncreasing: Boolean
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#calculatePreloadRange().(isIncreasing)
+//                   display_name isIncreasing
 //                   documentation ```kt\nvalue-parameter isIncreasing: kotlin.Boolean\n```
 //                    ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
     ): IntProgression {
 //     ^^^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/IntProgression#
         val from = if (isIncreasing) lastVisiblePosition + 1 else firstVisiblePosition - 1
 //          ^^^^ definition local 8
+//               display_name from
 //               documentation ```kt\nval from: kotlin.Int\n```
 //                     ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#calculatePreloadRange().(isIncreasing)
 //                                   ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#calculatePreloadRange().(lastVisiblePosition)
@@ -462,6 +523,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 //                                                                                     ^ reference semanticdb maven . . kotlin/Int#minus(+3).
         val to = from + if (isIncreasing) maxItemsToPreload - 1 else 1 - maxItemsToPreload
 //          ^^ definition local 9
+//             display_name to
 //             documentation ```kt\nval to: kotlin.Int\n```
 //               ^^^^ reference local 8
 //                    ^ reference semanticdb maven . . kotlin/Int#plus(+3).
@@ -495,6 +557,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
     private fun Int.isInvalid() = this == RecyclerView.NO_POSITION || this >= totalItemCount
 //              ^^^ reference semanticdb maven . . kotlin/Int#
 //                  ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#isInvalid().
+//                            display_name isInvalid
 //                            documentation ```kt\nprivate final fun kotlin.Int.isInvalid(): kotlin.Boolean\n```\n\n----\n\n Check if an item index is valid. It may not be if the adapter is empty, or if adapter changes have been dispatched since the last layout pass.
 //                                ^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#isInvalid().
 //                                     ^^ reference semanticdb maven . . kotlin/Int#equals().
@@ -507,6 +570,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
     private fun Int.clampToAdapterRange() = min(totalItemCount - 1, max(this, 0))
 //              ^^^ reference semanticdb maven . . kotlin/Int#
 //                  ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#clampToAdapterRange().
+//                                      display_name clampToAdapterRange
 //                                      documentation ```kt\nprivate final fun kotlin.Int.clampToAdapterRange(): kotlin.Int\n```
 //                                          ^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/math/MathKt#min(+2).
 //                                              ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getTotalItemCount().
@@ -518,14 +582,17 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     private fun preloadAdapterPosition(position: Int) {
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#preloadAdapterPosition().
+//                                     display_name preloadAdapterPosition
 //                                     documentation ```kt\nprivate final fun preloadAdapterPosition(position: kotlin.Int)\n```
 //                                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#preloadAdapterPosition().(position)
+//                                              display_name position
 //                                              documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                               ^^^ reference semanticdb maven . . kotlin/Int#
         @Suppress("UNCHECKED_CAST")
 //       ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/Suppress#`<init>`().
         val epoxyModel = adapter.getModelForPositionInternal(position) as? EpoxyModel<Any>
 //          ^^^^^^^^^^ definition local 10
+//                     display_name epoxyModel
 //                     documentation ```kt\nval epoxyModel: kotlin.Nothing\n```
 //                       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#adapter.
 //                       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getAdapter().
@@ -537,6 +604,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 //       ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/Suppress#`<init>`().
         val preloader =
 //          ^^^^^^^^^ definition local 11
+//                    display_name preloader
 //                    documentation ```kt\nval preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<[Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, com.airbnb.epoxy.preload.ViewMetadata?, P>\n```
             modelPreloaders[epoxyModel::class.java] as? EpoxyModelPreloader<EpoxyModel<*>, ViewMetadata?, P>
 //          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getModelPreloaders().
@@ -559,9 +627,11 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
             .forEach { viewData ->
 //           ^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/collections/CollectionsKt#forEach(+10).
 //                     ^^^^^^^^ definition local 12
+//                              display_name viewData
 //                              documentation ```kt\nvalue-parameter viewData: com.airbnb.epoxy.preload.ViewData<com.airbnb.epoxy.preload.ViewMetadata?>\n```
                 val preloadTarget = requestHolderFactory.next()
 //                  ^^^^^^^^^^^^^ definition local 13
+//                                display_name preloadTarget
 //                                documentation ```kt\nval preloadTarget: P\n```
 //                                  ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getRequestHolderFactory().
 //                                  ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#requestHolderFactory.
@@ -580,6 +650,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
      */
     fun cancelPreloadRequests() {
 //      ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#cancelPreloadRequests().
+//                            display_name cancelPreloadRequests
 //                            documentation ```kt\npublic final fun cancelPreloadRequests()\n```\n\n----\n\n\n Cancels all current preload requests in progress.\n
         requestHolderFactory.clearAll()
 //      ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#getRequestHolderFactory().
@@ -589,6 +660,7 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
     companion object {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion# 1:0
+//                     display_name Companion
 //                     documentation ```kt\npublic companion object\n```
 
         /**
@@ -599,8 +671,10 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
          */
         private const val FLING_THRESHOLD_PX = 75
 //                        ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#FLING_THRESHOLD_PX.
+//                                           display_name FLING_THRESHOLD_PX
 //                                           documentation ```kt\nprivate const final val FLING_THRESHOLD_PX: kotlin.Int\n```\n\n----\n\n\n\n Represents a threshold for fast scrolling.\n This is a bit arbitrary and was determined by looking at values while flinging vs slow scrolling.\n Ideally it would be based on DP, but this is simpler.\n
 //                        ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#getFLING_THRESHOLD_PX().
+//                                           display_name FLING_THRESHOLD_PX
 //                                           documentation ```kt\nprivate const final val FLING_THRESHOLD_PX: kotlin.Int\n```\n\n----\n\n\n\n Represents a threshold for fast scrolling.\n This is a bit arbitrary and was determined by looking at values while flinging vs slow scrolling.\n Ideally it would be based on DP, but this is simpler.\n
 
         /**
@@ -615,27 +689,34 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
          */
         fun <P : PreloadRequestHolder> with(
 //           ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with().[P]
+//             display_name P
 //             documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //               ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with().
+//                                          display_name with
 //                                          documentation ```kt\npublic final fun <P : com.airbnb.epoxy.preload.PreloadRequestHolder> with(epoxyController: [Error type: Unresolved type for EpoxyController], requestHolderFactory: () -> P, errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */, maxItemsToPreload: kotlin.Int, modelPreloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, out com.airbnb.epoxy.preload.ViewMetadata?, out P>): com.airbnb.epoxy.preload.EpoxyPreloader<P>\n```\n\n----\n\n\n Helper to create a preload scroll listener. Add the result to your RecyclerView.\n for different models or content types.\n\n @param maxItemsToPreload How many items to prefetch ahead of the last bound item\n @param errorHandler Called when the preloader encounters an exception. By default this throws only\n if the app is not in a debuggle model\n @param modelPreloader Describes how view content for the EpoxyModel should be preloaded\n @param requestHolderFactory Should create and return a new [PreloadRequestHolder] each time it is invoked\n
             epoxyController: EpoxyController,
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with().(epoxyController)
+//                          display_name epoxyController
 //                          documentation ```kt\nvalue-parameter epoxyController: [Error type: Unresolved type for EpoxyController]\n```
             requestHolderFactory: () -> P,
 //          ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with().(requestHolderFactory)
+//                               display_name requestHolderFactory
 //                               documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with().[P]
             errorHandler: PreloadErrorHandler,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with().(errorHandler)
+//                       display_name errorHandler
 //                       documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
             maxItemsToPreload: Int,
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with().(maxItemsToPreload)
+//                            display_name maxItemsToPreload
 //                            documentation ```kt\nvalue-parameter maxItemsToPreload: kotlin.Int\n```
 //                             ^^^ reference semanticdb maven . . kotlin/Int#
             modelPreloader: EpoxyModelPreloader<out EpoxyModel<*>, out ViewMetadata?, out P>
 //          ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with().(modelPreloader)
+//                         display_name modelPreloader
 //                         documentation ```kt\nvalue-parameter modelPreloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, out com.airbnb.epoxy.preload.ViewMetadata?, out P>\n```
 //                          ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
 //                                                                     ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
@@ -659,27 +740,34 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
         fun <P : PreloadRequestHolder> with(
 //           ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+1).[P]
+//             display_name P
 //             documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //               ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+1).
+//                                          display_name with
 //                                          documentation ```kt\npublic final fun <P : com.airbnb.epoxy.preload.PreloadRequestHolder> with(epoxyController: [Error type: Unresolved type for EpoxyController], requestHolderFactory: () -> P, errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */, maxItemsToPreload: kotlin.Int, modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, out com.airbnb.epoxy.preload.ViewMetadata?, out P>>): com.airbnb.epoxy.preload.EpoxyPreloader<P>\n```
             epoxyController: EpoxyController,
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+1).(epoxyController)
+//                          display_name epoxyController
 //                          documentation ```kt\nvalue-parameter epoxyController: [Error type: Unresolved type for EpoxyController]\n```
             requestHolderFactory: () -> P,
 //          ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+1).(requestHolderFactory)
+//                               display_name requestHolderFactory
 //                               documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+1).[P]
             errorHandler: PreloadErrorHandler,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+1).(errorHandler)
+//                       display_name errorHandler
 //                       documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
             maxItemsToPreload: Int,
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+1).(maxItemsToPreload)
+//                            display_name maxItemsToPreload
 //                            documentation ```kt\nvalue-parameter maxItemsToPreload: kotlin.Int\n```
 //                             ^^^ reference semanticdb maven . . kotlin/Int#
             modelPreloaders: List<EpoxyModelPreloader<out EpoxyModel<*>, out ViewMetadata?, out P>>
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+1).(modelPreloaders)
+//                          display_name modelPreloaders
 //                          documentation ```kt\nvalue-parameter modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, out com.airbnb.epoxy.preload.ViewMetadata?, out P>>\n```
 //                           ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
@@ -706,27 +794,34 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
         /** Helper to create a preload scroll listener. Add the result to your RecyclerView. */
         fun <P : PreloadRequestHolder> with(
 //           ^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+2).[P]
+//             display_name P
 //             documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //               ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+2).
+//                                          display_name with
 //                                          documentation ```kt\npublic final fun <P : com.airbnb.epoxy.preload.PreloadRequestHolder> with(epoxyAdapter: [Error type: Unresolved type for EpoxyAdapter], requestHolderFactory: () -> P, errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */, maxItemsToPreload: kotlin.Int, modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, out com.airbnb.epoxy.preload.ViewMetadata?, out P>>): com.airbnb.epoxy.preload.EpoxyPreloader<P>\n```\n\n----\n\n Helper to create a preload scroll listener. Add the result to your RecyclerView.
             epoxyAdapter: EpoxyAdapter,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+2).(epoxyAdapter)
+//                       display_name epoxyAdapter
 //                       documentation ```kt\nvalue-parameter epoxyAdapter: [Error type: Unresolved type for EpoxyAdapter]\n```
             requestHolderFactory: () -> P,
 //          ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+2).(requestHolderFactory)
+//                               display_name requestHolderFactory
 //                               documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+2).[P]
             errorHandler: PreloadErrorHandler,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+2).(errorHandler)
+//                       display_name errorHandler
 //                       documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
             maxItemsToPreload: Int,
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+2).(maxItemsToPreload)
+//                            display_name maxItemsToPreload
 //                            documentation ```kt\nvalue-parameter maxItemsToPreload: kotlin.Int\n```
 //                             ^^^ reference semanticdb maven . . kotlin/Int#
             modelPreloaders: List<EpoxyModelPreloader<out EpoxyModel<*>, out ViewMetadata?, out P>>
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloader#Companion#with(+2).(modelPreloaders)
+//                          display_name modelPreloaders
 //                          documentation ```kt\nvalue-parameter modelPreloaders: kotlin.collections.List<com.airbnb.epoxy.preload.EpoxyModelPreloader<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>, out com.airbnb.epoxy.preload.ViewMetadata?, out P>>\n```
 //                           ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
@@ -754,13 +849,16 @@ class EpoxyPreloader<P : PreloadRequestHolder> private constructor(
 
 class EpoxyPreloadException(errorMessage: String) : RuntimeException(errorMessage)
 //    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloadException#
+//                          display_name EpoxyPreloadException
 //                          documentation ```kt\npublic final class EpoxyPreloadException : kotlin.RuntimeException /* = java.lang.RuntimeException */\n```
 //                          relationship is_reference is_implementation semanticdb maven . . kotlin/Throwable#
 //                          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Exception#
 //                          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/RuntimeException#
 //    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloadException#`<init>`().
+//                          display_name EpoxyPreloadException
 //                          documentation ```kt\npublic constructor EpoxyPreloadException(errorMessage: kotlin.String)\n```
 //                          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloadException#`<init>`().(errorMessage)
+//                                       display_name errorMessage
 //                                       documentation ```kt\nvalue-parameter errorMessage: kotlin.String\n```
 //                                        ^^^^^^ reference semanticdb maven . . kotlin/String#
 //                                                  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . kotlin/RuntimeException#`<init>`(+1).
@@ -768,10 +866,13 @@ class EpoxyPreloadException(errorMessage: String) : RuntimeException(errorMessag
 
 typealias PreloadErrorHandler = (Context, RuntimeException) -> Unit
 //        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
+//                            display_name PreloadErrorHandler
 //                            documentation ```kt\npublic typealias PreloadErrorHandler = ([Error type: Unresolved type for Context], kotlin.RuntimeException) -> kotlin.Unit\n```
 //                               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloaderKt#`<no name provided>`.
+//                                       display_name RuntimeException
 //                                       documentation ```kt\nval `<no name provided>`: kotlin.RuntimeException\n```
 //                                        ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/EpoxyPreloaderKt#`<no name provided>`.
+//                                                         display_name RuntimeException
 //                                                         documentation ```kt\nval `<no name provided>`: kotlin.RuntimeException\n```
 //                                        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . kotlin/RuntimeException#
 //                                                             ^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/Unit#
@@ -783,60 +884,79 @@ typealias PreloadErrorHandler = (Context, RuntimeException) -> Unit
  */
 class ViewData<out U : ViewMetadata?>(
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#
+//             display_name ViewData
 //             documentation ```kt\npublic final class ViewData<out U : com.airbnb.epoxy.preload.ViewMetadata?>\n```\n\n----\n\n\n Data about an image view to be preloaded. This data is used to construct a Glide image request.\n\n @param metadata Any custom, additional data that the [EpoxyModelPreloader] chooses to provide that may be necessary to create the image request.\n
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#`<init>`().
+//             display_name ViewData
 //             documentation ```kt\npublic constructor ViewData<out U : com.airbnb.epoxy.preload.ViewMetadata?>(viewId: kotlin.Int, width: kotlin.Int, height: kotlin.Int, metadata: U)\n```
 //                 ^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#[U]
+//                   display_name U
 //                   documentation ```kt\n<out U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                     ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
     @IdRes val viewId: Int,
 //   ^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IdRes#`<init>`().
 //             ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#`<init>`().(viewId)
+//                    display_name viewId
 //                    documentation ```kt\nvalue-parameter viewId: kotlin.Int\n```
 //             ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#getViewId().
+//                    display_name viewId
 //                    documentation ```kt\npublic final val viewId: kotlin.Int\n```
 //             ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#viewId.
+//                    display_name viewId
 //                    documentation ```kt\npublic final val viewId: kotlin.Int\n```
 //                     ^^^ reference semanticdb maven . . kotlin/Int#
     @Px val width: Int,
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#`<init>`().(width)
+//                display_name width
 //                documentation ```kt\nvalue-parameter width: kotlin.Int\n```
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#getWidth().
+//                display_name width
 //                documentation ```kt\npublic final val width: kotlin.Int\n```
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#width.
+//                display_name width
 //                documentation ```kt\npublic final val width: kotlin.Int\n```
 //                 ^^^ reference semanticdb maven . . kotlin/Int#
     @Px val height: Int,
 //   ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#`<init>`().
 //          ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#`<init>`().(height)
+//                 display_name height
 //                 documentation ```kt\nvalue-parameter height: kotlin.Int\n```
 //          ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#getHeight().
+//                 display_name height
 //                 documentation ```kt\npublic final val height: kotlin.Int\n```
 //          ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#height.
+//                 display_name height
 //                 documentation ```kt\npublic final val height: kotlin.Int\n```
 //                  ^^^ reference semanticdb maven . . kotlin/Int#
     val metadata: U
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#`<init>`().(metadata)
+//               display_name metadata
 //               documentation ```kt\nvalue-parameter metadata: U\n```
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#getMetadata().
+//               display_name metadata
 //               documentation ```kt\npublic final val metadata: U\n```
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewData#metadata.
+//               display_name metadata
 //               documentation ```kt\npublic final val metadata: U\n```
 //                ^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewData#[U]
 )
 
 interface ViewMetadata {
 //        ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
+//                     display_name ViewMetadata
 //                     documentation ```kt\npublic interface ViewMetadata\n```
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#
     companion object {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#Companion# 1:0
+//                     display_name Companion
 //                     documentation ```kt\npublic companion object\n```
         fun getDefault(view: View): ViewMetadata? {
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#Companion#getDefault().
+//                     display_name getDefault
 //                     documentation ```kt\npublic final fun getDefault(view: [Error type: Unresolved type for View]): com.airbnb.epoxy.preload.ViewMetadata?\n```
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#Companion#getDefault().(view)
+//                          display_name view
 //                          documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
             return when (view) {
@@ -856,16 +976,21 @@ interface ViewMetadata {
  */
 open class ImageViewMetadata(
 //         ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#
+//                           display_name ImageViewMetadata
 //                           documentation ```kt\npublic open class ImageViewMetadata : com.airbnb.epoxy.preload.ViewMetadata\n```\n\n----\n\n\n Default implementation of [ViewMetadata] for an ImageView.\n This data can help the preload request know how to configure itself.\n
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //         ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#`<init>`().
+//                           display_name ImageViewMetadata
 //                           documentation ```kt\npublic constructor ImageViewMetadata(scaleType: [Error type: Unresolved type for ImageView.ScaleType])\n```
     val scaleType: ImageView.ScaleType
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#`<init>`().(scaleType)
+//                display_name scaleType
 //                documentation ```kt\nvalue-parameter scaleType: [Error type: Unresolved type for ImageView.ScaleType]\n```
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#getScaleType().
+//                display_name scaleType
 //                documentation ```kt\npublic final val scaleType: [Error type: Unresolved type for ImageView.ScaleType]\n```
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/ImageViewMetadata#scaleType.
+//                display_name scaleType
 //                documentation ```kt\npublic final val scaleType: [Error type: Unresolved type for ImageView.ScaleType]\n```
 ) : ViewMetadata
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloadTargetProvider.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloadTargetProvider.kt
index ea004d3b4..be23fd609 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloadTargetProvider.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloadTargetProvider.kt
@@ -11,25 +11,32 @@ import java.util.ArrayDeque
 
 internal class PreloadTargetProvider<P : PreloadRequestHolder>(
 //             ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#
+//                                   display_name PreloadTargetProvider
 //                                   documentation ```kt\ninternal final class PreloadTargetProvider<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //             ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#`<init>`().
+//                                   display_name PreloadTargetProvider
 //                                   documentation ```kt\npublic constructor PreloadTargetProvider<P : com.airbnb.epoxy.preload.PreloadRequestHolder>(maxPreload: kotlin.Int, requestHolderFactory: () -> P)\n```
 //                                   ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#[P]
+//                                     display_name P
 //                                     documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                       ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
     maxPreload: Int,
 //  ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#`<init>`().(maxPreload)
+//             display_name maxPreload
 //             documentation ```kt\nvalue-parameter maxPreload: kotlin.Int\n```
 //              ^^^ reference semanticdb maven . . kotlin/Int#
     requestHolderFactory: () -> P
 //  ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#`<init>`().(requestHolderFactory)
+//                       display_name requestHolderFactory
 //                       documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#[P]
 ) {
     private val queue = ArrayDeque<P>((0 until maxPreload).map { requestHolderFactory() })
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#getQueue().
+//                    display_name queue
 //                    documentation ```kt\nprivate final val queue: java.util.ArrayDeque<P>\n```
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#queue.
+//                    display_name queue
 //                    documentation ```kt\nprivate final val queue: java.util.ArrayDeque<P>\n```
 //                      ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayDeque#`<init>`(+2).
 //                                 ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#[P]
@@ -40,10 +47,12 @@ internal class PreloadTargetProvider<P : PreloadRequestHolder>(
 
     internal fun next(): P {
 //               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#next().
+//                    display_name next
 //                    documentation ```kt\ninternal final fun next(): P\n```
 //                       ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#[P]
         val result = queue.poll()
 //          ^^^^^^ definition local 0
+//                 display_name result
 //                 documentation ```kt\nval result: P!\n```
 //                   ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#getQueue().
 //                   ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#queue.
@@ -62,6 +71,7 @@ internal class PreloadTargetProvider<P : PreloadRequestHolder>(
 
     fun clearAll() {
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#clearAll().
+//               display_name clearAll
 //               documentation ```kt\npublic final fun clearAll()\n```
         queue.forEach { it.clear() }
 //      ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadTargetProvider#getQueue().
@@ -84,9 +94,11 @@ internal class PreloadTargetProvider<P : PreloadRequestHolder>(
  */
 interface PreloadRequestHolder {
 //        ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
+//                             display_name PreloadRequestHolder
 //                             documentation ```kt\npublic interface PreloadRequestHolder\n```\n\n----\n\n\n This is responsible for holding details for a preloading request.\n Your implementation can do anything it wants with the request, but it must\n cancel and clear itself when [clear] is called.\n\n It is also recommended that your implementation calls [clear] when your request finishes loading\n to avoid unnecessarily hanging onto the request result (assuming the result is also stored in\n cache). Otherwise this holder can be stored in a pool for later use and may leak the preloaded\n data.\n
     /** Clear any ongoing preload request. */
     fun clear()
 //      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#clear().
+//            display_name clear
 //            documentation ```kt\npublic abstract fun clear()\n```\n\n----\n\n Clear any ongoing preload request.
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/Preloadable.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/Preloadable.kt
index 0aa8d889d..0a4d2bdb5 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/Preloadable.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/Preloadable.kt
@@ -14,11 +14,14 @@ import android.view.View
  */
 interface Preloadable {
 //        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/Preloadable#
+//                    display_name Preloadable
 //                    documentation ```kt\npublic interface Preloadable\n```\n\n----\n\n\n Declares Views that should be preloaded. This can either be implemented by a custom view or by an [EpoxyHolder].\n\n The preloadable views can be recursive ie if [Preloadable.viewsToPreload] includes any views that are themselves Preloadable those nested\n views will instead by used.\n
     val viewsToPreload: List<View>
 //      ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/Preloadable#getViewsToPreload().
+//                     display_name viewsToPreload
 //                     documentation ```kt\npublic abstract val viewsToPreload: kotlin.collections.List<[Error type: Unresolved type for View]>\n```
 //      ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/Preloadable#viewsToPreload.
+//                     display_name viewsToPreload
 //                     documentation ```kt\npublic abstract val viewsToPreload: kotlin.collections.List<[Error type: Unresolved type for View]>\n```
 //                      ^^^^ reference semanticdb maven . . kotlin/collections/List#
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloadableViewDataProvider.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloadableViewDataProvider.kt
index 4d96f715b..3e0295875 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloadableViewDataProvider.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloadableViewDataProvider.kt
@@ -37,22 +37,30 @@ import com.airbnb.epoxy.viewTypeInternal
  */
 internal class PreloadableViewDataProvider(
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#
+//                                         display_name PreloadableViewDataProvider
 //                                         documentation ```kt\ninternal final class PreloadableViewDataProvider\n```\n\n----\n\n\n In order to preload content we need to know the size of the view that they it be loaded into.\n This class provides the view size, as well as other view metadata that might be necessary to construct the preload request.\n
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#`<init>`().
+//                                         display_name PreloadableViewDataProvider
 //                                         documentation ```kt\npublic constructor PreloadableViewDataProvider(adapter: [Error type: Unresolved type for BaseEpoxyAdapter], errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */)\n```
     val adapter: BaseEpoxyAdapter,
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#`<init>`().(adapter)
+//              display_name adapter
 //              documentation ```kt\nvalue-parameter adapter: [Error type: Unresolved type for BaseEpoxyAdapter]\n```
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#adapter.
+//              display_name adapter
 //              documentation ```kt\npublic final val adapter: [Error type: Unresolved type for BaseEpoxyAdapter]\n```
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#getAdapter().
+//              display_name adapter
 //              documentation ```kt\npublic final val adapter: [Error type: Unresolved type for BaseEpoxyAdapter]\n```
     val errorHandler: PreloadErrorHandler
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#`<init>`().(errorHandler)
+//                   display_name errorHandler
 //                   documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#errorHandler.
+//                   display_name errorHandler
 //                   documentation ```kt\npublic final val errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#getErrorHandler().
+//                   display_name errorHandler
 //                   documentation ```kt\npublic final val errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */\n```
 //                    ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
 ) {
@@ -63,48 +71,64 @@ internal class PreloadableViewDataProvider(
      */
     private data class CacheKey(
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#
+//                              display_name CacheKey
 //                              documentation ```kt\nprivate final data class CacheKey\n```\n\n----\n\n\n A given model class might have different sized preloadable views depending on configuration.\n We use this cache key to separate view configurations.\n
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#`<init>`().
+//                              display_name CacheKey
 //                              documentation ```kt\npublic constructor CacheKey(epoxyModelClass: java.lang.Class<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>>, spanSize: kotlin.Int, viewType: kotlin.Int, signature: kotlin.Any?)\n```
         val epoxyModelClass: Class<out EpoxyModel<*>>,
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#`<init>`().(epoxyModelClass)
+//                          display_name epoxyModelClass
 //                          documentation ```kt\nvalue-parameter epoxyModelClass: java.lang.Class<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>>\n```
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#epoxyModelClass.
+//                          display_name epoxyModelClass
 //                          documentation ```kt\npublic final val epoxyModelClass: java.lang.Class<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>>\n```
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#getEpoxyModelClass().
+//                          display_name epoxyModelClass
 //                          documentation ```kt\npublic final val epoxyModelClass: java.lang.Class<out [Error type: Unresolved type for EpoxyModel<*>]<out [Error type: Error type projection]>>\n```
 //                           ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
         val spanSize: Int,
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#`<init>`().(spanSize)
+//                   display_name spanSize
 //                   documentation ```kt\nvalue-parameter spanSize: kotlin.Int\n```
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#getSpanSize().
+//                   display_name spanSize
 //                   documentation ```kt\npublic final val spanSize: kotlin.Int\n```
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#spanSize.
+//                   display_name spanSize
 //                   documentation ```kt\npublic final val spanSize: kotlin.Int\n```
 //                    ^^^ reference semanticdb maven . . kotlin/Int#
         val viewType: Int,
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#`<init>`().(viewType)
+//                   display_name viewType
 //                   documentation ```kt\nvalue-parameter viewType: kotlin.Int\n```
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#getViewType().
+//                   display_name viewType
 //                   documentation ```kt\npublic final val viewType: kotlin.Int\n```
 //          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#viewType.
+//                   display_name viewType
 //                   documentation ```kt\npublic final val viewType: kotlin.Int\n```
 //                    ^^^ reference semanticdb maven . . kotlin/Int#
         /** An optional, custom signature provided by the model preloader. This allows the user to specify custom cache mixins */
         val signature: Any?
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#`<init>`().(signature)
+//                    display_name signature
 //                    documentation ```kt\nvalue-parameter signature: kotlin.Any?\n```\n\n----\n\n An optional, custom signature provided by the model preloader. This allows the user to specify custom cache mixins
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#getSignature().
+//                    display_name signature
 //                    documentation ```kt\npublic final val signature: kotlin.Any?\n```\n\n----\n\n An optional, custom signature provided by the model preloader. This allows the user to specify custom cache mixins
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#signature.
+//                    display_name signature
 //                    documentation ```kt\npublic final val signature: kotlin.Any?\n```\n\n----\n\n An optional, custom signature provided by the model preloader. This allows the user to specify custom cache mixins
 //                     ^^^ reference semanticdb maven . . kotlin/Any#
     )
 
     private val cache = mutableMapOf<CacheKey, List<ViewData<*>>?>()
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cache.
+//                    display_name cache
 //                    documentation ```kt\nprivate final val cache: kotlin.collections.MutableMap<com.airbnb.epoxy.preload.PreloadableViewDataProvider.CacheKey, kotlin.collections.List<com.airbnb.epoxy.preload.ViewData<*>>?>\n```
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#getCache().
+//                    display_name cache
 //                    documentation ```kt\nprivate final val cache: kotlin.collections.MutableMap<com.airbnb.epoxy.preload.PreloadableViewDataProvider.CacheKey, kotlin.collections.List<com.airbnb.epoxy.preload.ViewData<*>>?>\n```
 //                      ^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/collections/MapsKt#mutableMapOf().
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#
@@ -114,17 +138,22 @@ internal class PreloadableViewDataProvider(
     /** @return A list containing the data necessary to load each view in the given model. */
     fun <T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder> dataForModel(
 //       ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().[T]
+//         display_name T
 //         documentation ```kt\n<T>\n```
 //                          ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().[U]
+//                            display_name U
 //                            documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().[P]
+//                                               display_name P
 //                                               documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                 ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().
+//                                                                                    display_name dataForModel
 //                                                                                    documentation ```kt\npublic final fun <T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder> dataForModel(preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>, epoxyModel: T, position: kotlin.Int): kotlin.collections.List<com.airbnb.epoxy.preload.ViewData<U>>\n```\n\n----\n\n @return A list containing the data necessary to load each view in the given model.
         preloader: EpoxyModelPreloader<T, U, P>,
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().(preloader)
+//                display_name preloader
 //                documentation ```kt\nvalue-parameter preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```
 //                 ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().[T]
@@ -132,10 +161,12 @@ internal class PreloadableViewDataProvider(
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().[P]
         epoxyModel: T,
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().(epoxyModel)
+//                 display_name epoxyModel
 //                 documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().[T]
         position: Int
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().(position)
+//               display_name position
 //               documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                ^^^ reference semanticdb maven . . kotlin/Int#
     ): List<ViewData<U>> {
@@ -144,6 +175,7 @@ internal class PreloadableViewDataProvider(
 //                   ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().[U]
         val cacheKey = cacheKey(preloader, epoxyModel, position)
 //          ^^^^^^^^ definition local 0
+//                   display_name cacheKey
 //                   documentation ```kt\nval cacheKey: com.airbnb.epoxy.preload.PreloadableViewDataProvider.CacheKey\n```
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cacheKey().
 //                              ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#dataForModel().(preloader)
@@ -173,26 +205,32 @@ internal class PreloadableViewDataProvider(
 
     private fun <T : EpoxyModel<*>> cacheKey(
 //               ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cacheKey().[T]
+//                 display_name T
 //                 documentation ```kt\n<T>\n```
 //                                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cacheKey().
+//                                           display_name cacheKey
 //                                           documentation ```kt\nprivate final fun <T> cacheKey(preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, *, *>, epoxyModel: T, position: kotlin.Int): com.airbnb.epoxy.preload.PreloadableViewDataProvider.CacheKey\n```
         preloader: EpoxyModelPreloader<T, *, *>,
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cacheKey().(preloader)
+//                display_name preloader
 //                documentation ```kt\nvalue-parameter preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, *, *>\n```
 //                 ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cacheKey().[T]
         epoxyModel: T,
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cacheKey().(epoxyModel)
+//                 display_name epoxyModel
 //                 documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cacheKey().[T]
         position: Int
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#cacheKey().(position)
+//               display_name position
 //               documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                ^^^ reference semanticdb maven . . kotlin/Int#
     ): CacheKey {
 //     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#
         val modelSpanSize = if (adapter.isMultiSpan) {
 //          ^^^^^^^^^^^^^ definition local 1
+//                        display_name modelSpanSize
 //                        documentation ```kt\nval modelSpanSize: kotlin.Int\n```
 //                              ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#adapter.
 //                              ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#getAdapter().
@@ -225,17 +263,22 @@ internal class PreloadableViewDataProvider(
 
     private fun <T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder> findViewData(
 //               ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().[T]
+//                 display_name T
 //                 documentation ```kt\n<T>\n```
 //                                  ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().[U]
+//                                    display_name U
 //                                    documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                                     ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().[P]
+//                                                       display_name P
 //                                                       documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                                               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().
+//                                                                                            display_name findViewData
 //                                                                                            documentation ```kt\nprivate final fun <T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder> findViewData(preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>, epoxyModel: T, cacheKey: com.airbnb.epoxy.preload.PreloadableViewDataProvider.CacheKey): kotlin.collections.List<com.airbnb.epoxy.preload.ViewData<U>>?\n```
         preloader: EpoxyModelPreloader<T, U, P>,
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().(preloader)
+//                display_name preloader
 //                documentation ```kt\nvalue-parameter preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```
 //                 ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().[T]
@@ -243,10 +286,12 @@ internal class PreloadableViewDataProvider(
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().[P]
         epoxyModel: T,
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().(epoxyModel)
+//                 display_name epoxyModel
 //                 documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().[T]
         cacheKey: CacheKey
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViewData().(cacheKey)
+//               display_name cacheKey
 //               documentation ```kt\nvalue-parameter cacheKey: com.airbnb.epoxy.preload.PreloadableViewDataProvider.CacheKey\n```
 //                ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#CacheKey#
     ): List<ViewData<U>>? {
@@ -260,11 +305,13 @@ internal class PreloadableViewDataProvider(
 
         val holderMatch = adapter.boundViewHoldersInternal().find {
 //          ^^^^^^^^^^^ definition local 2
+//                      display_name holderMatch
 //                      documentation ```kt\nval holderMatch: [Error type: Return type for function cannot be resolved]\n```
 //                        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#adapter.
 //                        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#getAdapter().
             val boundModel = it.model
 //              ^^^^^^^^^^ definition local 3
+//                         display_name boundModel
 //                         documentation ```kt\nval boundModel: [Error type: Error property type]\n```
             if (boundModel::class == epoxyModel::class) {
 //              ^^^^^^^^^^ reference local 3
@@ -288,16 +335,19 @@ internal class PreloadableViewDataProvider(
 
         val rootView = holderMatch?.itemView ?: return null
 //          ^^^^^^^^ definition local 4
+//                   display_name rootView
 //                   documentation ```kt\nval rootView: kotlin.Nothing\n```
 //                     ^^^^^^^^^^^ reference local 2
 
         val boundObject = holderMatch.objectToBindInternal() // Allows usage of view holder models
 //          ^^^^^^^^^^^ definition local 5
+//                      display_name boundObject
 //                      documentation ```kt\nval boundObject: [Error type: Return type for function cannot be resolved]\n```
 //                        ^^^^^^^^^^^ reference local 2
 
         val preloadableViews: List<View> = when {
 //          ^^^^^^^^^^^^^^^^ definition local 6
+//                           display_name preloadableViews
 //                           documentation ```kt\nval preloadableViews: kotlin.collections.List<[Error type: Unresolved type for View]>\n```
 //                            ^^^^ reference semanticdb maven . . kotlin/collections/List#
             preloader.preloadableViewIds.isNotEmpty() -> rootView.findViews(
@@ -348,16 +398,20 @@ internal class PreloadableViewDataProvider(
     /** Returns child views with the given view ids. */
     private fun <T : EpoxyModel<*>> View.findViews(
 //               ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViews().[T]
+//                 display_name T
 //                 documentation ```kt\n<T>\n```
 //                                       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViews().
+//                                                 display_name findViews
 //                                                 documentation ```kt\nprivate final fun <T> [Error type: Unresolved type for View].findViews(viewIds: kotlin.collections.List<kotlin.Int>, epoxyModel: T): kotlin.collections.List<[Error type: Unresolved type for View]>\n```\n\n----\n\n Returns child views with the given view ids.
         viewIds: List<Int>,
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViews().(viewIds)
+//              display_name viewIds
 //              documentation ```kt\nvalue-parameter viewIds: kotlin.collections.List<kotlin.Int>\n```
 //               ^^^^ reference semanticdb maven . . kotlin/collections/List#
 //                    ^^^ reference semanticdb maven . . kotlin/Int#
         epoxyModel: T
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViews().(epoxyModel)
+//                 display_name epoxyModel
 //                 documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViews().[T]
     ): List<View> {
@@ -366,6 +420,7 @@ internal class PreloadableViewDataProvider(
 //             ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#findViews().(viewIds)
 //                     ^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/collections/CollectionsKt#mapNotNull(+1).
 //                                  ^^ definition local 7
+//                                     display_name id
 //                                     documentation ```kt\nvalue-parameter id: kotlin.Int\n```
             findViewById<View>(id).apply {
 //                             ^^ reference local 7
@@ -380,9 +435,11 @@ internal class PreloadableViewDataProvider(
     /** If a View with the [Preloadable] interface is used we want to get all of the preloadable views contained in that Preloadable instead. */
     private fun <T : View> T.recursePreloadableViews(): List<View> {
 //               ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#recursePreloadableViews().[T]
+//                 display_name T
 //                 documentation ```kt\n<T>\n```
 //                         ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#recursePreloadableViews().[T]
 //                           ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#recursePreloadableViews().
+//                                                   display_name recursePreloadableViews
 //                                                   documentation ```kt\nprivate final fun <T> T.recursePreloadableViews(): kotlin.collections.List<[Error type: Unresolved type for View]>\n```\n\n----\n\n If a View with the [Preloadable] interface is used we want to get all of the preloadable views contained in that Preloadable instead.
 //                                                      ^^^^ reference semanticdb maven . . kotlin/collections/List#
         return if (this is Preloadable) {
@@ -400,17 +457,22 @@ internal class PreloadableViewDataProvider(
 
     private fun <T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder> View.buildData(
 //               ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().[T]
+//                 display_name T
 //                 documentation ```kt\n<T>\n```
 //                                  ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().[U]
+//                                    display_name U
 //                                    documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                                     ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().[P]
+//                                                       display_name P
 //                                                       documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                                         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                                                    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().
+//                                                                                              display_name buildData
 //                                                                                              documentation ```kt\nprivate final fun <T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder> [Error type: Unresolved type for View].buildData(preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>, epoxyModel: T): com.airbnb.epoxy.preload.ViewData<U>?\n```
         preloader: EpoxyModelPreloader<T, U, P>,
 //      ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().(preloader)
+//                display_name preloader
 //                documentation ```kt\nvalue-parameter preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```
 //                 ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().[T]
@@ -418,6 +480,7 @@ internal class PreloadableViewDataProvider(
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().[P]
         epoxyModel: T
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().(epoxyModel)
+//                 display_name epoxyModel
 //                 documentation ```kt\nvalue-parameter epoxyModel: T\n```
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadableViewDataProvider#buildData().[T]
     ): ViewData<U>? {
@@ -428,9 +491,11 @@ internal class PreloadableViewDataProvider(
         // TODO: We could support size overrides by allowing the preloader to specify a size override callback
         val width = width - paddingLeft - paddingRight
 //          ^^^^^ definition local 8
+//                display_name width
 //                documentation ```kt\nval width: [Error type: Return type for function cannot be resolved]\n```
         val height = height - paddingTop - paddingBottom
 //          ^^^^^^ definition local 9
+//                 display_name height
 //                 documentation ```kt\nval height: [Error type: Return type for function cannot be resolved]\n```
 
         if (width <= 0 || height <= 0) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloaderExtensions.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloaderExtensions.kt
index 551f61668..60724c296 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloaderExtensions.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/preload/PreloaderExtensions.kt
@@ -35,34 +35,44 @@ import com.airbnb.epoxy.utils.isDebuggable
  */
 fun <T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder> RecyclerView.addEpoxyPreloader(
 //   ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().[T]
+//     display_name T
 //     documentation ```kt\n<T>\n```
 //                      ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().[U]
+//                        display_name U
 //                        documentation ```kt\n<U : com.airbnb.epoxy.preload.ViewMetadata?>\n```
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/ViewMetadata#
 //                                         ^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().[P]
+//                                           display_name P
 //                                           documentation ```kt\n<P : com.airbnb.epoxy.preload.PreloadRequestHolder>\n```
 //                                             ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadRequestHolder#
 //                                                                                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().
+//                                                                                                  display_name addEpoxyPreloader
 //                                                                                                  documentation ```kt\npublic fun <T, U : com.airbnb.epoxy.preload.ViewMetadata?, P : com.airbnb.epoxy.preload.PreloadRequestHolder> [Error type: Unresolved type for RecyclerView].addEpoxyPreloader(epoxyController: [Error type: Unresolved type for EpoxyController], maxPreloadDistance: kotlin.Int = ..., errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */ = ..., preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>, requestHolderFactory: () -> P)\n```\n\n----\n\n\n Helper to create and add an [EpoxyPreloader] to this RecyclerView.\n\n If you are using [com.airbnb.epoxy.EpoxyRecyclerView], prefer[com.airbnb.epoxy.EpoxyRecyclerView.addPreloader]\n instead.\n\n @param maxPreloadDistance How many items to prefetch ahead of the last bound item\n @param errorHandler Called when the preloader encounters an exception. By default this throws only\n if the app is not in a debuggle model\n @param preloader Describes how view content for the EpoxyModel should be preloaded\n @param requestHolderFactory Should create and return a new [PreloadRequestHolder] each time it is invoked\n
     epoxyController: EpoxyController,
 //  ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().(epoxyController)
+//                  display_name epoxyController
 //                  documentation ```kt\nvalue-parameter epoxyController: [Error type: Unresolved type for EpoxyController]\n```
     maxPreloadDistance: Int = 3,
 //  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().(maxPreloadDistance)
+//                     display_name maxPreloadDistance
 //                     documentation ```kt\nvalue-parameter maxPreloadDistance: kotlin.Int = ...\n```
 //                      ^^^ reference semanticdb maven . . kotlin/Int#
     errorHandler: PreloadErrorHandler = { context, err -> if (!context.isDebuggable) throw err },
 //  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().(errorHandler)
+//               display_name errorHandler
 //               documentation ```kt\nvalue-parameter errorHandler: com.airbnb.epoxy.preload.PreloadErrorHandler /* = ([Error type: Unresolved type for Context], kotlin.RuntimeException /* = java.lang.RuntimeException */) -> kotlin.Unit */ = ...\n```
 //                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloadErrorHandler#
 //                                        ^^^^^^^ definition local 0
+//                                                display_name context
 //                                                documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
 //                                                 ^^^ definition local 1
+//                                                     display_name err
 //                                                     documentation ```kt\nvalue-parameter err: kotlin.RuntimeException /* = java.lang.RuntimeException */\n```
 //                                                             ^^^^^^^ reference local 0
 //                                                                                         ^^^ reference local 1
     preloader: EpoxyModelPreloader<T, U, P>,
 //  ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().(preloader)
+//            display_name preloader
 //            documentation ```kt\nvalue-parameter preloader: com.airbnb.epoxy.preload.EpoxyModelPreloader<T, U, P>\n```
 //             ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/preload/EpoxyModelPreloader#
 //                                 ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().[T]
@@ -70,6 +80,7 @@ fun <T : EpoxyModel<*>, U : ViewMetadata?, P : PreloadRequestHolder> RecyclerVie
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().[P]
     requestHolderFactory: () -> P
 //  ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().(requestHolderFactory)
+//                       display_name requestHolderFactory
 //                       documentation ```kt\nvalue-parameter requestHolderFactory: () -> P\n```
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/preload/PreloaderExtensionsKt#addEpoxyPreloader().[P]
 ) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks.kt
index 953e5691d..1dbc34016 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks.kt
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView
  */
 interface StickyHeaderCallbacks {
 //        ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks#
+//                              display_name StickyHeaderCallbacks
 //                              documentation ```kt\npublic interface StickyHeaderCallbacks\n```\n\n----\n\n\n Adds sticky headers capabilities to any [RecyclerView.Adapter]\n combined with [StickyHeaderLinearLayoutManager].\n
 
     /**
@@ -22,8 +23,10 @@ interface StickyHeaderCallbacks {
      */
     fun isStickyHeader(position: Int): Boolean
 //      ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks#isStickyHeader().
+//                     display_name isStickyHeader
 //                     documentation ```kt\npublic abstract fun isStickyHeader(position: kotlin.Int): kotlin.Boolean\n```\n\n----\n\n\n Return true if the view at the specified [position] needs to be sticky\n else false.\n
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks#isStickyHeader().(position)
+//                              display_name position
 //                              documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                               ^^^ reference semanticdb maven . . kotlin/Int#
 //                                     ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
@@ -40,8 +43,10 @@ interface StickyHeaderCallbacks {
      */
     fun setupStickyHeaderView(stickyHeader: View) = Unit
 //      ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks#setupStickyHeaderView().
+//                            display_name setupStickyHeaderView
 //                            documentation ```kt\npublic open fun setupStickyHeaderView(stickyHeader: [Error type: Unresolved type for View])\n```\n\n----\n\n\n Callback to adjusts any necessary properties of the [stickyHeader] view\n that is being used as a sticky, eg. elevation.\n Default behaviour is no-op.\n\n [teardownStickyHeaderView] will be called sometime after this method\n and before any other calls to this method go through.\n
 //                            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks#setupStickyHeaderView().(stickyHeader)
+//                                         display_name stickyHeader
 //                                         documentation ```kt\nvalue-parameter stickyHeader: [Error type: Unresolved type for View]\n```
 //                                                  ^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/Unit#
 
@@ -53,8 +58,10 @@ interface StickyHeaderCallbacks {
      */
     fun teardownStickyHeaderView(stickyHeader: View) = Unit
 //      ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks#teardownStickyHeaderView().
+//                               display_name teardownStickyHeaderView
 //                               documentation ```kt\npublic open fun teardownStickyHeaderView(stickyHeader: [Error type: Unresolved type for View])\n```\n\n----\n\n\n Callback to revert any properties changed in [setupStickyHeaderView].\n Default behaviour is no-op.\n\n Called after [setupStickyHeaderView].\n
 //                               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderCallbacks#teardownStickyHeaderView().(stickyHeader)
+//                                            display_name stickyHeader
 //                                            documentation ```kt\nvalue-parameter stickyHeader: [Error type: Unresolved type for View]\n```
 //                                                     ^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/Unit#
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager.kt
index 7e6e285cc..0d72dd74e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager.kt
@@ -41,19 +41,24 @@ import kotlinx.android.parcel.Parcelize
  */
 class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#
+//                                    display_name StickyHeaderLinearLayoutManager
 //                                    documentation ```kt\npublic final class StickyHeaderLinearLayoutManager\n```\n\n----\n\n\n Adds sticky headers capabilities to your [RecyclerView.Adapter].\n The adapter / controller must override [StickyHeaderCallbacks.isStickyHeader] to\n indicate which items are sticky.\n\n Example usage:\n ```\n  class StickyHeaderController() : EpoxyController() {\n      override fun isStickyHeader(position: Int) {\n          // Write your logic to tell which item is sticky.\n      }\n  }\n ```\n
 //                                     ^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/jvm/JvmOverloads#`<init>`().
 //                                                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#`<init>`().
+//                                                              display_name StickyHeaderLinearLayoutManager
 //                                                              documentation ```kt\npublic constructor StickyHeaderLinearLayoutManager(context: [Error type: Unresolved type for Context], orientation: kotlin.Int = ..., reverseLayout: kotlin.Boolean = ...)\n```
     context: Context,
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#`<init>`().(context)
+//          display_name context
 //          documentation ```kt\nvalue-parameter context: [Error type: Unresolved type for Context]\n```
     orientation: Int = RecyclerView.VERTICAL,
 //  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#`<init>`().(orientation)
+//              display_name orientation
 //              documentation ```kt\nvalue-parameter orientation: kotlin.Int = ...\n```
 //               ^^^ reference semanticdb maven . . kotlin/Int#
     reverseLayout: Boolean = false
 //  ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#`<init>`().(reverseLayout)
+//                display_name reverseLayout
 //                documentation ```kt\nvalue-parameter reverseLayout: kotlin.Boolean = ...\n```
 //                 ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
 ) : LinearLayoutManager(context, orientation, reverseLayout) {
@@ -63,81 +68,108 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     private var adapter: BaseEpoxyAdapter? = null
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#adapter.
+//                      display_name adapter
 //                      documentation ```kt\nprivate final var adapter: [Error type: Unresolved type for BaseEpoxyAdapter]?\n```
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getAdapter().
+//                      display_name adapter
 //                      documentation ```kt\nprivate final var adapter: [Error type: Unresolved type for BaseEpoxyAdapter]?\n```
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setAdapter().
+//                      display_name setAdapter
 //                      documentation ```kt\nprivate final fun setAdapter(newAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?)\n```
 
     // Translation for header
     private var translationX: Float = 0f
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getTranslationX().
+//                           display_name translationX
 //                           documentation ```kt\nprivate final var translationX: kotlin.Float\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setTranslationX().
+//                           display_name translationX
 //                           documentation ```kt\nprivate final var translationX: kotlin.Float\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#translationX.
+//                           display_name translationX
 //                           documentation ```kt\nprivate final var translationX: kotlin.Float\n```
 //                            ^^^^^ reference semanticdb maven . . kotlin/Float#
     private var translationY: Float = 0f
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getTranslationY().
+//                           display_name translationY
 //                           documentation ```kt\nprivate final var translationY: kotlin.Float\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setTranslationY().
+//                           display_name translationY
 //                           documentation ```kt\nprivate final var translationY: kotlin.Float\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#translationY.
+//                           display_name translationY
 //                           documentation ```kt\nprivate final var translationY: kotlin.Float\n```
 //                            ^^^^^ reference semanticdb maven . . kotlin/Float#
 
     // Header positions for the currently displayed list and their observer.
     private val headerPositions = mutableListOf<Int>()
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
+//                              display_name headerPositions
 //                              documentation ```kt\nprivate final val headerPositions: kotlin.collections.MutableList<kotlin.Int>\n```
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
+//                              display_name headerPositions
 //                              documentation ```kt\nprivate final val headerPositions: kotlin.collections.MutableList<kotlin.Int>\n```
 //                                ^^^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/collections/CollectionsKt#mutableListOf().
 //                                              ^^^ reference semanticdb maven . . kotlin/Int#
     private val headerPositionsObserver = HeaderPositionsAdapterDataObserver()
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositionsObserver().
+//                                      display_name headerPositionsObserver
 //                                      documentation ```kt\nprivate final val headerPositionsObserver: com.airbnb.epoxy.stickyheader.StickyHeaderLinearLayoutManager.HeaderPositionsAdapterDataObserver\n```
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositionsObserver.
+//                                      display_name headerPositionsObserver
 //                                      documentation ```kt\nprivate final val headerPositionsObserver: com.airbnb.epoxy.stickyheader.StickyHeaderLinearLayoutManager.HeaderPositionsAdapterDataObserver\n```
 //                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#`<init>`().
 
     // Sticky header's ViewHolder and dirty state.
     private var stickyHeader: View? = null
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getStickyHeader().
+//                           display_name stickyHeader
 //                           documentation ```kt\nprivate final var stickyHeader: [Error type: Unresolved type for View]?\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setStickyHeader().
+//                           display_name stickyHeader
 //                           documentation ```kt\nprivate final var stickyHeader: [Error type: Unresolved type for View]?\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#stickyHeader.
+//                           display_name stickyHeader
 //                           documentation ```kt\nprivate final var stickyHeader: [Error type: Unresolved type for View]?\n```
     private var stickyHeaderPosition = RecyclerView.NO_POSITION
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getStickyHeaderPosition().
+//                                   display_name stickyHeaderPosition
 //                                   documentation ```kt\nprivate final var stickyHeaderPosition: [Error type: Error property type]\n```
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setStickyHeaderPosition().
+//                                   display_name stickyHeaderPosition
 //                                   documentation ```kt\nprivate final var stickyHeaderPosition: [Error type: Error property type]\n```
 //              ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#stickyHeaderPosition.
+//                                   display_name stickyHeaderPosition
 //                                   documentation ```kt\nprivate final var stickyHeaderPosition: [Error type: Error property type]\n```
 
     // Save / Restore scroll state
     private var scrollPosition = RecyclerView.NO_POSITION
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getScrollPosition().
+//                             display_name scrollPosition
 //                             documentation ```kt\nprivate final var scrollPosition: [Error type: Error property type]\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollPosition.
+//                             display_name scrollPosition
 //                             documentation ```kt\nprivate final var scrollPosition: [Error type: Error property type]\n```
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setScrollPosition().
+//                             display_name scrollPosition
 //                             documentation ```kt\nprivate final var scrollPosition: [Error type: Error property type]\n```
     private var scrollOffset = 0
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getScrollOffset().
+//                           display_name scrollOffset
 //                           documentation ```kt\nprivate final var scrollOffset: kotlin.Int\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollOffset.
+//                           display_name scrollOffset
 //                           documentation ```kt\nprivate final var scrollOffset: kotlin.Int\n```
 //              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setScrollOffset().
+//                           display_name scrollOffset
 //                           documentation ```kt\nprivate final var scrollOffset: kotlin.Int\n```
 
     override fun onAttachedToWindow(recyclerView: RecyclerView) {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onAttachedToWindow().
+//                                  display_name onAttachedToWindow
 //                                  documentation ```kt\npublic open fun onAttachedToWindow(recyclerView: [Error type: Unresolved type for RecyclerView])\n```
 //                                  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onAttachedToWindow().(recyclerView)
+//                                               display_name recyclerView
 //                                               documentation ```kt\nvalue-parameter recyclerView: [Error type: Unresolved type for RecyclerView]\n```
         super.onAttachedToWindow(recyclerView)
 //      ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -149,10 +181,13 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun onAdapterChanged(oldAdapter: RecyclerView.Adapter<*>?, newAdapter: RecyclerView.Adapter<*>?) {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onAdapterChanged().
+//                                display_name onAdapterChanged
 //                                documentation ```kt\npublic open fun onAdapterChanged(oldAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?, newAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?)\n```
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onAdapterChanged().(oldAdapter)
+//                                           display_name oldAdapter
 //                                           documentation ```kt\nvalue-parameter oldAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```
 //                                                                      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onAdapterChanged().(newAdapter)
+//                                                                                 display_name newAdapter
 //                                                                                 documentation ```kt\nvalue-parameter newAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```
         super.onAdapterChanged(oldAdapter, newAdapter)
 //      ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -167,8 +202,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //   ^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/Suppress#`<init>`().
     private fun setAdapter(newAdapter: RecyclerView.Adapter<*>?) {
 //              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setAdapter().
+//                         display_name setAdapter
 //                         documentation ```kt\nprivate final fun setAdapter(newAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?)\n```
 //                         ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setAdapter().(newAdapter)
+//                                    display_name newAdapter
 //                                    documentation ```kt\nvalue-parameter newAdapter: [Error type: Unresolved type for RecyclerView.Adapter<*>]<out [Error type: Error type projection]>?\n```
         adapter?.unregisterAdapterDataObserver(headerPositionsObserver)
 //      ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#adapter.
@@ -207,6 +244,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun onSaveInstanceState(): Parcelable {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onSaveInstanceState().
+//                                   display_name onSaveInstanceState
 //                                   documentation ```kt\npublic open fun onSaveInstanceState(): [Error type: Unresolved type for Parcelable]\n```
         return SavedState(
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#`<init>`().
@@ -228,8 +266,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun onRestoreInstanceState(state: Parcelable?) {
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onRestoreInstanceState().
+//                                      display_name onRestoreInstanceState
 //                                      documentation ```kt\npublic open fun onRestoreInstanceState(state: [Error type: Unresolved type for Parcelable]?)\n```
 //                                      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onRestoreInstanceState().(state)
+//                                            display_name state
 //                                            documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for Parcelable]?\n```
         (state as? SavedState)?.let {
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onRestoreInstanceState().(state)
@@ -259,17 +299,22 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun scrollVerticallyBy(dy: Int, recycler: RecyclerView.Recycler, state: RecyclerView.State?): Int {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollVerticallyBy().
+//                                  display_name scrollVerticallyBy
 //                                  documentation ```kt\npublic open fun scrollVerticallyBy(dy: kotlin.Int, recycler: [Error type: Unresolved type for RecyclerView.Recycler], state: [Error type: Unresolved type for RecyclerView.State]?): kotlin.Int\n```
 //                                  ^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollVerticallyBy().(dy)
+//                                     display_name dy
 //                                     documentation ```kt\nvalue-parameter dy: kotlin.Int\n```
 //                                      ^^^ reference semanticdb maven . . kotlin/Int#
 //                                           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollVerticallyBy().(recycler)
+//                                                    display_name recycler
 //                                                    documentation ```kt\nvalue-parameter recycler: [Error type: Unresolved type for RecyclerView.Recycler]\n```
 //                                                                            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollVerticallyBy().(state)
+//                                                                                  display_name state
 //                                                                                  documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]?\n```
 //                                                                                                         ^^^ reference semanticdb maven . . kotlin/Int#
         val scrolled = restoreView { super.scrollVerticallyBy(dy, recycler, state) }
 //          ^^^^^^^^ definition local 1
+//                   display_name scrolled
 //                   documentation ```kt\nval scrolled: kotlin.Unit\n```
 //                     ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
 //                                   ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -289,17 +334,22 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun scrollHorizontallyBy(dx: Int, recycler: RecyclerView.Recycler, state: RecyclerView.State?): Int {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollHorizontallyBy().
+//                                    display_name scrollHorizontallyBy
 //                                    documentation ```kt\npublic open fun scrollHorizontallyBy(dx: kotlin.Int, recycler: [Error type: Unresolved type for RecyclerView.Recycler], state: [Error type: Unresolved type for RecyclerView.State]?): kotlin.Int\n```
 //                                    ^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollHorizontallyBy().(dx)
+//                                       display_name dx
 //                                       documentation ```kt\nvalue-parameter dx: kotlin.Int\n```
 //                                        ^^^ reference semanticdb maven . . kotlin/Int#
 //                                             ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollHorizontallyBy().(recycler)
+//                                                      display_name recycler
 //                                                      documentation ```kt\nvalue-parameter recycler: [Error type: Unresolved type for RecyclerView.Recycler]\n```
 //                                                                              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollHorizontallyBy().(state)
+//                                                                                    display_name state
 //                                                                                    documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]?\n```
 //                                                                                                           ^^^ reference semanticdb maven . . kotlin/Int#
         val scrolled = restoreView { super.scrollHorizontallyBy(dx, recycler, state) }
 //          ^^^^^^^^ definition local 2
+//                   display_name scrolled
 //                   documentation ```kt\nval scrolled: kotlin.Unit\n```
 //                     ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
 //                                   ^^^^^ reference semanticdb maven . . kotlin/Any#
@@ -319,10 +369,13 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun onLayoutChildren(recycler: RecyclerView.Recycler, state: RecyclerView.State) {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onLayoutChildren().
+//                                display_name onLayoutChildren
 //                                documentation ```kt\npublic open fun onLayoutChildren(recycler: [Error type: Unresolved type for RecyclerView.Recycler], state: [Error type: Unresolved type for RecyclerView.State])\n```
 //                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onLayoutChildren().(recycler)
+//                                         display_name recycler
 //                                         documentation ```kt\nvalue-parameter recycler: [Error type: Unresolved type for RecyclerView.Recycler]\n```
 //                                                                 ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onLayoutChildren().(state)
+//                                                                       display_name state
 //                                                                       documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]\n```
         restoreView { super.onLayoutChildren(recycler, state) }
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -339,8 +392,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun scrollToPosition(position: Int) = scrollToPositionWithOffset(position, INVALID_OFFSET)
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPosition().
+//                                display_name scrollToPosition
 //                                documentation ```kt\npublic open fun scrollToPosition(position: kotlin.Int)\n```
 //                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPosition().(position)
+//                                         display_name position
 //                                         documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                          ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset().
@@ -348,11 +403,14 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun scrollToPositionWithOffset(position: Int, offset: Int) = scrollToPositionWithOffset(position, offset, true)
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset().
+//                                          display_name scrollToPositionWithOffset
 //                                          documentation ```kt\npublic open fun scrollToPositionWithOffset(position: kotlin.Int, offset: kotlin.Int)\n```
 //                                          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset().(position)
+//                                                   display_name position
 //                                                   documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                                    ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                         ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset().(offset)
+//                                                                display_name offset
 //                                                                documentation ```kt\nvalue-parameter offset: kotlin.Int\n```
 //                                                                 ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset(+1).
@@ -361,14 +419,18 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     private fun scrollToPositionWithOffset(position: Int, offset: Int, adjustForStickyHeader: Boolean) {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset(+1).
+//                                         display_name scrollToPositionWithOffset
 //                                         documentation ```kt\nprivate final fun scrollToPositionWithOffset(position: kotlin.Int, offset: kotlin.Int, adjustForStickyHeader: kotlin.Boolean)\n```
 //                                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset(+1).(position)
+//                                                  display_name position
 //                                                  documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                                   ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                        ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset(+1).(offset)
+//                                                               display_name offset
 //                                                               documentation ```kt\nvalue-parameter offset: kotlin.Int\n```
 //                                                                ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset(+1).(adjustForStickyHeader)
+//                                                                                           display_name adjustForStickyHeader
 //                                                                                           documentation ```kt\nvalue-parameter adjustForStickyHeader: kotlin.Boolean\n```
 //                                                                                            ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         // Reset pending scroll.
@@ -389,6 +451,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
         // There is no header above or the position is a header.
         val headerIndex = findHeaderIndexOrBefore(position)
 //          ^^^^^^^^^^^ definition local 3
+//                      display_name headerIndex
 //                      documentation ```kt\nval headerIndex: kotlin.Int\n```
 //                        ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrBefore().
 //                                                ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset(+1).(position)
@@ -435,6 +498,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                                                 ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#stickyHeaderPosition.
             val adjustedOffset = (if (offset != INVALID_OFFSET) offset else 0) + stickyHeader!!.height
 //              ^^^^^^^^^^^^^^ definition local 4
+//                             display_name adjustedOffset
 //                             documentation ```kt\nval adjustedOffset: [Error type: Not found recorded type for (if (offset != INVALID_OFFSET) offset else 0) + stickyHeader!!.height]\n```
 //                                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrollToPositionWithOffset(+1).(offset)
 //                                           ^^ reference semanticdb maven . . kotlin/Int#equals().
@@ -465,8 +529,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun computeVerticalScrollExtent(state: RecyclerView.State): Int = restoreView { super.computeVerticalScrollExtent(state) }
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeVerticalScrollExtent().
+//                                           display_name computeVerticalScrollExtent
 //                                           documentation ```kt\npublic open fun computeVerticalScrollExtent(state: [Error type: Unresolved type for RecyclerView.State]): kotlin.Int\n```
 //                                           ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeVerticalScrollExtent().(state)
+//                                                 display_name state
 //                                                 documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]\n```
 //                                                                       ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                             ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -475,8 +541,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun computeVerticalScrollOffset(state: RecyclerView.State): Int = restoreView { super.computeVerticalScrollOffset(state) }
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeVerticalScrollOffset().
+//                                           display_name computeVerticalScrollOffset
 //                                           documentation ```kt\npublic open fun computeVerticalScrollOffset(state: [Error type: Unresolved type for RecyclerView.State]): kotlin.Int\n```
 //                                           ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeVerticalScrollOffset().(state)
+//                                                 display_name state
 //                                                 documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]\n```
 //                                                                       ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                             ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -485,8 +553,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun computeVerticalScrollRange(state: RecyclerView.State): Int = restoreView { super.computeVerticalScrollRange(state) }
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeVerticalScrollRange().
+//                                          display_name computeVerticalScrollRange
 //                                          documentation ```kt\npublic open fun computeVerticalScrollRange(state: [Error type: Unresolved type for RecyclerView.State]): kotlin.Int\n```
 //                                          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeVerticalScrollRange().(state)
+//                                                display_name state
 //                                                documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]\n```
 //                                                                      ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                            ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -495,8 +565,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun computeHorizontalScrollExtent(state: RecyclerView.State): Int = restoreView { super.computeHorizontalScrollExtent(state) }
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeHorizontalScrollExtent().
+//                                             display_name computeHorizontalScrollExtent
 //                                             documentation ```kt\npublic open fun computeHorizontalScrollExtent(state: [Error type: Unresolved type for RecyclerView.State]): kotlin.Int\n```
 //                                             ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeHorizontalScrollExtent().(state)
+//                                                   display_name state
 //                                                   documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]\n```
 //                                                                         ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -505,8 +577,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun computeHorizontalScrollOffset(state: RecyclerView.State): Int = restoreView { super.computeHorizontalScrollOffset(state) }
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeHorizontalScrollOffset().
+//                                             display_name computeHorizontalScrollOffset
 //                                             documentation ```kt\npublic open fun computeHorizontalScrollOffset(state: [Error type: Unresolved type for RecyclerView.State]): kotlin.Int\n```
 //                                             ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeHorizontalScrollOffset().(state)
+//                                                   display_name state
 //                                                   documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]\n```
 //                                                                         ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -515,8 +589,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun computeHorizontalScrollRange(state: RecyclerView.State): Int = restoreView { super.computeHorizontalScrollRange(state) }
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeHorizontalScrollRange().
+//                                            display_name computeHorizontalScrollRange
 //                                            documentation ```kt\npublic open fun computeHorizontalScrollRange(state: [Error type: Unresolved type for RecyclerView.State]): kotlin.Int\n```
 //                                            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeHorizontalScrollRange().(state)
+//                                                  display_name state
 //                                                  documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]\n```
 //                                                                        ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                              ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -525,8 +601,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun computeScrollVectorForPosition(targetPosition: Int): PointF? = restoreView { super.computeScrollVectorForPosition(targetPosition) }
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeScrollVectorForPosition().
+//                                              display_name computeScrollVectorForPosition
 //                                              documentation ```kt\npublic open fun computeScrollVectorForPosition(targetPosition: kotlin.Int): [Error type: Unresolved type for PointF]?\n```
 //                                              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#computeScrollVectorForPosition().(targetPosition)
+//                                                             display_name targetPosition
 //                                                             documentation ```kt\nvalue-parameter targetPosition: kotlin.Int\n```
 //                                                              ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                              ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -535,19 +613,24 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     override fun onFocusSearchFailed(
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onFocusSearchFailed().
+//                                   display_name onFocusSearchFailed
 //                                   documentation ```kt\npublic open fun onFocusSearchFailed(focused: [Error type: Unresolved type for View], focusDirection: kotlin.Int, recycler: [Error type: Unresolved type for RecyclerView.Recycler], state: [Error type: Unresolved type for RecyclerView.State]): [Error type: Unresolved type for View]?\n```
         focused: View,
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onFocusSearchFailed().(focused)
+//              display_name focused
 //              documentation ```kt\nvalue-parameter focused: [Error type: Unresolved type for View]\n```
         focusDirection: Int,
 //      ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onFocusSearchFailed().(focusDirection)
+//                     display_name focusDirection
 //                     documentation ```kt\nvalue-parameter focusDirection: kotlin.Int\n```
 //                      ^^^ reference semanticdb maven . . kotlin/Int#
         recycler: RecyclerView.Recycler,
 //      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onFocusSearchFailed().(recycler)
+//               display_name recycler
 //               documentation ```kt\nvalue-parameter recycler: [Error type: Unresolved type for RecyclerView.Recycler]\n```
         state: RecyclerView.State
 //      ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#onFocusSearchFailed().(state)
+//            display_name state
 //            documentation ```kt\nvalue-parameter state: [Error type: Unresolved type for RecyclerView.State]\n```
     ): View? = restoreView { super.onFocusSearchFailed(focused, focusDirection, recycler, state) }
 //             ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
@@ -563,10 +646,13 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun <T> restoreView(operation: () -> T): T {
 //               ^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().[T]
+//                 display_name T
 //                 documentation ```kt\n<T>\n```
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().
+//                              display_name restoreView
 //                              documentation ```kt\nprivate final fun <T> restoreView(operation: () -> T): T\n```\n\n----\n\n\n Perform the [operation] without the sticky header view by\n detaching the view -> performing operation -> detaching the view.\n
 //                              ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().(operation)
+//                                        display_name operation
 //                                        documentation ```kt\nvalue-parameter operation: () -> T\n```
 //                                               ^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().[T]
 //                                                   ^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().[T]
@@ -577,6 +663,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#
         val result = operation()
 //          ^^^^^^ definition local 5
+//                 display_name result
 //                 documentation ```kt\nval result: T\n```
 //                   ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#restoreView().(operation)
         stickyHeader?.let(this::attachView)
@@ -595,8 +682,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     fun setStickyHeaderTranslationY(translationY: Float) {
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setStickyHeaderTranslationY().
+//                                  display_name setStickyHeaderTranslationY
 //                                  documentation ```kt\npublic final fun setStickyHeaderTranslationY(translationY: kotlin.Float)\n```\n\n----\n\n\n Offsets the vertical location of the sticky header relative to the its default position.\n
 //                                  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setStickyHeaderTranslationY().(translationY)
+//                                               display_name translationY
 //                                               documentation ```kt\nvalue-parameter translationY: kotlin.Float\n```
 //                                                ^^^^^ reference semanticdb maven . . kotlin/Float#
         this.translationY = translationY
@@ -613,8 +702,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     fun setStickyHeaderTranslationX(translationX: Float) {
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setStickyHeaderTranslationX().
+//                                  display_name setStickyHeaderTranslationX
 //                                  documentation ```kt\npublic final fun setStickyHeaderTranslationX(translationX: kotlin.Float)\n```\n\n----\n\n\n Offsets the horizontal location of the sticky header relative to the its default position.\n
 //                                  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setStickyHeaderTranslationX().(translationX)
+//                                               display_name translationX
 //                                               documentation ```kt\nvalue-parameter translationX: kotlin.Float\n```
 //                                                ^^^^^ reference semanticdb maven . . kotlin/Float#
         this.translationX = translationX
@@ -631,8 +722,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     fun isStickyHeader(view: View): Boolean = view === stickyHeader
 //      ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#isStickyHeader().
+//                     display_name isStickyHeader
 //                     documentation ```kt\npublic final fun isStickyHeader(view: [Error type: Unresolved type for View]): kotlin.Boolean\n```\n\n----\n\n\n Returns true if `view` is the current sticky header.\n
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#isStickyHeader().(view)
+//                          display_name view
 //                          documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                                  ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
 //                                            ^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#isStickyHeader().(view)
@@ -645,14 +738,18 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun updateStickyHeader(recycler: RecyclerView.Recycler, layout: Boolean) {
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#updateStickyHeader().
+//                                 display_name updateStickyHeader
 //                                 documentation ```kt\nprivate final fun updateStickyHeader(recycler: [Error type: Unresolved type for RecyclerView.Recycler], layout: kotlin.Boolean)\n```\n\n----\n\n\n Updates the sticky header state (creation, binding, display), to be called whenever there's a layout or scroll\n
 //                                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#updateStickyHeader().(recycler)
+//                                          display_name recycler
 //                                          documentation ```kt\nvalue-parameter recycler: [Error type: Unresolved type for RecyclerView.Recycler]\n```
 //                                                                  ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#updateStickyHeader().(layout)
+//                                                                         display_name layout
 //                                                                         documentation ```kt\nvalue-parameter layout: kotlin.Boolean\n```
 //                                                                          ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         val headerCount = headerPositions.size
 //          ^^^^^^^^^^^ definition local 6
+//                      display_name headerCount
 //                      documentation ```kt\nval headerCount: kotlin.Int\n```
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -660,6 +757,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                        ^^^^ reference semanticdb maven . . kotlin/collections/MutableList#size.
         val childCount = childCount
 //          ^^^^^^^^^^ definition local 7
+//                     display_name childCount
 //                     documentation ```kt\nval childCount: [Error type: Not found recorded type for childCount]\n```
         if (headerCount > 0 && childCount > 0) {
 //          ^^^^^^^^^^^ reference local 6
@@ -668,26 +766,32 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
             // Find first valid child.
             var anchorView: View? = null
 //              ^^^^^^^^^^ definition local 8
+//                         display_name anchorView
 //                         documentation ```kt\nvar anchorView: [Error type: Unresolved type for View]?\n```
             var anchorIndex = -1
 //              ^^^^^^^^^^^ definition local 9
+//                          display_name anchorIndex
 //                          documentation ```kt\nvar anchorIndex: kotlin.Int\n```
 //                            ^ reference semanticdb maven . . kotlin/Int#unaryMinus().
             var anchorPos = -1
 //              ^^^^^^^^^ definition local 10
+//                        display_name anchorPos
 //                        documentation ```kt\nvar anchorPos: kotlin.Int\n```
 //                          ^ reference semanticdb maven . . kotlin/Int#unaryMinus().
             for (i in 0 until childCount) {
 //               ^ definition local 11
+//                 display_name i
 //                 documentation ```kt\nval i: kotlin.Int\n```
 //                      ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/RangesKt#until(+6).
 //                            ^^^^^^^^^^ reference local 7
                 val child = getChildAt(i)
 //                  ^^^^^ definition local 12
+//                        display_name child
 //                        documentation ```kt\nval child: [Error type: Not found recorded type for getChildAt(i)]\n```
 //                                     ^ reference local 11
                 val params = child!!.layoutParams as RecyclerView.LayoutParams
 //                  ^^^^^^ definition local 13
+//                         display_name params
 //                         documentation ```kt\nval params: [Error type: Unresolved type for RecyclerView.LayoutParams]\n```
 //                           ^^^^^ reference local 12
                 if (isViewValidAnchor(child, params)) {
@@ -713,11 +817,13 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                                 ^ reference semanticdb maven . . kotlin/Int#unaryMinus().
                 val headerIndex = findHeaderIndexOrBefore(anchorPos)
 //                  ^^^^^^^^^^^ definition local 14
+//                              display_name headerIndex
 //                              documentation ```kt\nval headerIndex: kotlin.Int\n```
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrBefore().
 //                                                        ^^^^^^^^^ reference local 10
                 val headerPos = if (headerIndex != -1) headerPositions[headerIndex] else -1
 //                  ^^^^^^^^^ definition local 15
+//                            display_name headerPos
 //                            documentation ```kt\nval headerPos: kotlin.Int\n```
 //                                  ^^^^^^^^^^^ reference local 14
 //                                              ^^ reference semanticdb maven . . kotlin/Int#equals().
@@ -728,6 +834,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                                                                       ^ reference semanticdb maven . . kotlin/Int#unaryMinus().
                 val nextHeaderPos = if (headerCount > headerIndex + 1) headerPositions[headerIndex + 1] else -1
 //                  ^^^^^^^^^^^^^ definition local 16
+//                                display_name nextHeaderPos
 //                                documentation ```kt\nval nextHeaderPos: kotlin.Int\n```
 //                                      ^^^^^^^^^^^ reference local 6
 //                                                  ^ reference semanticdb maven . . kotlin/Int#compareTo(+3).
@@ -807,12 +914,14 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#stickyHeader.
                         val nextHeaderView: View? = if (nextHeaderPos != -1) {
 //                          ^^^^^^^^^^^^^^ definition local 17
+//                                         display_name nextHeaderView
 //                                         documentation ```kt\nval nextHeaderView: [Error type: Unresolved type for View]?\n```
 //                                                      ^^^^^^^^^^^^^ reference local 16
 //                                                                    ^^ reference semanticdb maven . . kotlin/Int#equals().
 //                                                                       ^ reference semanticdb maven . . kotlin/Int#unaryMinus().
                             val nextHeaderView = getChildAt(anchorIndex + (nextHeaderPos - anchorPos))
 //                              ^^^^^^^^^^^^^^ definition local 18
+//                                             display_name nextHeaderView
 //                                             documentation ```kt\nval nextHeaderView: [Error type: Not found recorded type for getChildAt(anchorIndex + (nextHeaderPos - anchorPos))]\n```
 //                                                          ^^^^^^^^^^^ reference local 9
 //                                                                      ^ reference semanticdb maven . . kotlin/Int#plus(+3).
@@ -855,14 +964,18 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun createStickyHeader(recycler: RecyclerView.Recycler, position: Int) {
 //              ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#createStickyHeader().
+//                                 display_name createStickyHeader
 //                                 documentation ```kt\nprivate final fun createStickyHeader(recycler: [Error type: Unresolved type for RecyclerView.Recycler], position: kotlin.Int)\n```\n\n----\n\n\n Creates [RecyclerView.ViewHolder] for [position], including measure / layout, and assigns it to\n [stickyHeader].\n
 //                                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#createStickyHeader().(recycler)
+//                                          display_name recycler
 //                                          documentation ```kt\nvalue-parameter recycler: [Error type: Unresolved type for RecyclerView.Recycler]\n```
 //                                                                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#createStickyHeader().(position)
+//                                                                           display_name position
 //                                                                           documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                                                            ^^^ reference semanticdb maven . . kotlin/Int#
         val stickyHeader = recycler.getViewForPosition(position)
 //          ^^^^^^^^^^^^ definition local 19
+//                       display_name stickyHeader
 //                       documentation ```kt\nval stickyHeader: [Error type: Return type for function cannot be resolved]\n```
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#createStickyHeader().(recycler)
 //                                                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#createStickyHeader().(position)
@@ -905,12 +1018,16 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun bindStickyHeader(recycler: RecyclerView.Recycler, stickyHeader: View, position: Int) {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#bindStickyHeader().
+//                               display_name bindStickyHeader
 //                               documentation ```kt\nprivate final fun bindStickyHeader(recycler: [Error type: Unresolved type for RecyclerView.Recycler], stickyHeader: [Error type: Unresolved type for View], position: kotlin.Int)\n```\n\n----\n\n\n Binds the [stickyHeader] for the given [position].\n
 //                               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#bindStickyHeader().(recycler)
+//                                        display_name recycler
 //                                        documentation ```kt\nvalue-parameter recycler: [Error type: Unresolved type for RecyclerView.Recycler]\n```
 //                                                                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#bindStickyHeader().(stickyHeader)
+//                                                                             display_name stickyHeader
 //                                                                             documentation ```kt\nvalue-parameter stickyHeader: [Error type: Unresolved type for View]\n```
 //                                                                                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#bindStickyHeader().(position)
+//                                                                                             display_name position
 //                                                                                             documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                                                                              ^^^ reference semanticdb maven . . kotlin/Int#
         // Bind the sticky header.
@@ -936,6 +1053,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#bindStickyHeader().(stickyHeader)
                 override fun onGlobalLayout() {
 //                           ^^^^^^^^^^^^^^ definition local 20
+//                                          display_name onGlobalLayout
 //                                          documentation ```kt\npublic open fun onGlobalLayout()\n```
                     if (Build.VERSION.SDK_INT < 16) stickyHeader.viewTreeObserver.removeGlobalOnLayoutListener(this)
 //                                                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#bindStickyHeader().(stickyHeader)
@@ -968,8 +1086,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun measureAndLayout(stickyHeader: View) {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#measureAndLayout().
+//                               display_name measureAndLayout
 //                               documentation ```kt\nprivate final fun measureAndLayout(stickyHeader: [Error type: Unresolved type for View])\n```\n\n----\n\n\n Measures and lays out [stickyHeader].\n
 //                               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#measureAndLayout().(stickyHeader)
+//                                            display_name stickyHeader
 //                                            documentation ```kt\nvalue-parameter stickyHeader: [Error type: Unresolved type for View]\n```
         measureChildWithMargins(stickyHeader, 0, 0)
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#measureAndLayout().(stickyHeader)
@@ -991,11 +1111,14 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun scrapStickyHeader(recycler: RecyclerView.Recycler?) {
 //              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrapStickyHeader().
+//                                display_name scrapStickyHeader
 //                                documentation ```kt\nprivate final fun scrapStickyHeader(recycler: [Error type: Unresolved type for RecyclerView.Recycler]?)\n```\n\n----\n\n\n Returns [stickyHeader] to the [RecyclerView]'s [RecyclerView.RecycledViewPool], assigning it\n to `null`.\n\n @param recycler If passed, the sticky header will be returned to the recycled view pool.\n
 //                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#scrapStickyHeader().(recycler)
+//                                         display_name recycler
 //                                         documentation ```kt\nvalue-parameter recycler: [Error type: Unresolved type for RecyclerView.Recycler]?\n```
         val stickyHeader = stickyHeader ?: return
 //          ^^^^^^^^^^^^ definition local 21
+//                       display_name stickyHeader
 //                       documentation ```kt\nval stickyHeader: kotlin.Nothing\n```
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getStickyHeader().
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setStickyHeader().
@@ -1041,10 +1164,13 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun isViewValidAnchor(view: View, params: RecyclerView.LayoutParams): Boolean {
 //              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#isViewValidAnchor().
+//                                display_name isViewValidAnchor
 //                                documentation ```kt\nprivate final fun isViewValidAnchor(view: [Error type: Unresolved type for View], params: [Error type: Unresolved type for RecyclerView.LayoutParams]): kotlin.Boolean\n```\n\n----\n\n\n Returns true when `view` is a valid anchor, ie. the first view to be valid and visible.\n
 //                                ^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#isViewValidAnchor().(view)
+//                                     display_name view
 //                                     documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                                            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#isViewValidAnchor().(params)
+//                                                   display_name params
 //                                                   documentation ```kt\nvalue-parameter params: [Error type: Unresolved type for RecyclerView.LayoutParams]\n```
 //                                                                                ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         return when {
@@ -1089,8 +1215,10 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun isViewOnBoundary(view: View): Boolean {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#isViewOnBoundary().
+//                               display_name isViewOnBoundary
 //                               documentation ```kt\nprivate final fun isViewOnBoundary(view: [Error type: Unresolved type for View]): kotlin.Boolean\n```\n\n----\n\n\n Returns true when the `view` is at the edge of the parent [RecyclerView].\n
 //                               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#isViewOnBoundary().(view)
+//                                    display_name view
 //                                    documentation ```kt\nvalue-parameter view: [Error type: Unresolved type for View]\n```
 //                                            ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
         return when (orientation) {
@@ -1131,16 +1259,20 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun getY(headerView: View, nextHeaderView: View?): Float {
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getY().
+//                   display_name getY
 //                   documentation ```kt\nprivate final fun getY(headerView: [Error type: Unresolved type for View], nextHeaderView: [Error type: Unresolved type for View]?): kotlin.Float\n```\n\n----\n\n\n Returns the position in the Y axis to position the header appropriately, depending on orientation, direction and\n [android.R.attr.clipToPadding].\n
 //                   ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getY().(headerView)
+//                              display_name headerView
 //                              documentation ```kt\nvalue-parameter headerView: [Error type: Unresolved type for View]\n```
 //                                     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getY().(nextHeaderView)
+//                                                    display_name nextHeaderView
 //                                                    documentation ```kt\nvalue-parameter nextHeaderView: [Error type: Unresolved type for View]?\n```
 //                                                             ^^^^^ reference semanticdb maven . . kotlin/Float#
         when (orientation) {
             VERTICAL -> {
                 var y = translationY
 //                  ^ definition local 22
+//                    display_name y
 //                    documentation ```kt\nvar y: kotlin.Float\n```
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getTranslationY().
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setTranslationY().
@@ -1154,10 +1286,12 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getY().(nextHeaderView)
                     val bottomMargin = (nextHeaderView.layoutParams as? ViewGroup.MarginLayoutParams)?.bottomMargin ?: 0
 //                      ^^^^^^^^^^^^ definition local 23
+//                                   display_name bottomMargin
 //                                   documentation ```kt\nval bottomMargin: kotlin.Int\n```
 //                                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getY().(nextHeaderView)
                     val topMargin = (nextHeaderView.layoutParams as? ViewGroup.MarginLayoutParams)?.topMargin ?: 0
 //                      ^^^^^^^^^ definition local 24
+//                                display_name topMargin
 //                                documentation ```kt\nval topMargin: kotlin.Int\n```
 //                                   ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getY().(nextHeaderView)
                     y = when {
@@ -1189,16 +1323,20 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun getX(headerView: View, nextHeaderView: View?): Float {
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getX().
+//                   display_name getX
 //                   documentation ```kt\nprivate final fun getX(headerView: [Error type: Unresolved type for View], nextHeaderView: [Error type: Unresolved type for View]?): kotlin.Float\n```\n\n----\n\n\n Returns the position in the X axis to position the header appropriately, depending on orientation, direction and\n [android.R.attr.clipToPadding].\n
 //                   ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getX().(headerView)
+//                              display_name headerView
 //                              documentation ```kt\nvalue-parameter headerView: [Error type: Unresolved type for View]\n```
 //                                     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getX().(nextHeaderView)
+//                                                    display_name nextHeaderView
 //                                                    documentation ```kt\nvalue-parameter nextHeaderView: [Error type: Unresolved type for View]?\n```
 //                                                             ^^^^^ reference semanticdb maven . . kotlin/Float#
         when (orientation) {
             HORIZONTAL -> {
                 var x = translationX
 //                  ^ definition local 25
+//                    display_name x
 //                    documentation ```kt\nvar x: kotlin.Float\n```
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getTranslationX().
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setTranslationX().
@@ -1212,10 +1350,12 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getX().(nextHeaderView)
                     val leftMargin = (nextHeaderView.layoutParams as? ViewGroup.MarginLayoutParams)?.leftMargin ?: 0
 //                      ^^^^^^^^^^ definition local 26
+//                                 display_name leftMargin
 //                                 documentation ```kt\nval leftMargin: kotlin.Int\n```
 //                                    ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getX().(nextHeaderView)
                     val rightMargin = (nextHeaderView.layoutParams as? ViewGroup.MarginLayoutParams)?.rightMargin ?: 0
 //                      ^^^^^^^^^^^ definition local 27
+//                                  display_name rightMargin
 //                                  documentation ```kt\nval rightMargin: kotlin.Int\n```
 //                                     ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getX().(nextHeaderView)
                     x = when {
@@ -1246,16 +1386,20 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun findHeaderIndex(position: Int): Int {
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndex().
+//                              display_name findHeaderIndex
 //                              documentation ```kt\nprivate final fun findHeaderIndex(position: kotlin.Int): kotlin.Int\n```\n\n----\n\n\n Finds the header index of `position` in `headerPositions`.\n
 //                              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndex().(position)
+//                                       display_name position
 //                                       documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                        ^^^ reference semanticdb maven . . kotlin/Int#
 //                                              ^^^ reference semanticdb maven . . kotlin/Int#
         var low = 0
 //          ^^^ definition local 28
+//              display_name low
 //              documentation ```kt\nvar low: kotlin.Int\n```
         var high = headerPositions.size - 1
 //          ^^^^ definition local 29
+//               display_name high
 //               documentation ```kt\nvar high: kotlin.Int\n```
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1268,6 +1412,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                    ^^^^ reference local 29
             val middle = (low + high) / 2
 //              ^^^^^^ definition local 30
+//                     display_name middle
 //                     documentation ```kt\nval middle: kotlin.Int\n```
 //                        ^^^ reference local 28
 //                            ^ reference semanticdb maven . . kotlin/Int#plus(+3).
@@ -1305,16 +1450,20 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun findHeaderIndexOrBefore(position: Int): Int {
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrBefore().
+//                                      display_name findHeaderIndexOrBefore
 //                                      documentation ```kt\nprivate final fun findHeaderIndexOrBefore(position: kotlin.Int): kotlin.Int\n```\n\n----\n\n\n Finds the header index of `position` or the one before it in `headerPositions`.\n
 //                                      ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrBefore().(position)
+//                                               display_name position
 //                                               documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                                ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                      ^^^ reference semanticdb maven . . kotlin/Int#
         var low = 0
 //          ^^^ definition local 31
+//              display_name low
 //              documentation ```kt\nvar low: kotlin.Int\n```
         var high = headerPositions.size - 1
 //          ^^^^ definition local 32
+//               display_name high
 //               documentation ```kt\nvar high: kotlin.Int\n```
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1327,6 +1476,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                    ^^^^ reference local 32
             val middle = (low + high) / 2
 //              ^^^^^^ definition local 33
+//                     display_name middle
 //                     documentation ```kt\nval middle: kotlin.Int\n```
 //                        ^^^ reference local 31
 //                            ^ reference semanticdb maven . . kotlin/Int#plus(+3).
@@ -1372,16 +1522,20 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private fun findHeaderIndexOrNext(position: Int): Int {
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrNext().
+//                                    display_name findHeaderIndexOrNext
 //                                    documentation ```kt\nprivate final fun findHeaderIndexOrNext(position: kotlin.Int): kotlin.Int\n```\n\n----\n\n\n Finds the header index of `position` or the one next to it in `headerPositions`.\n
 //                                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrNext().(position)
+//                                             display_name position
 //                                             documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                              ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                    ^^^ reference semanticdb maven . . kotlin/Int#
         var low = 0
 //          ^^^ definition local 34
+//              display_name low
 //              documentation ```kt\nvar low: kotlin.Int\n```
         var high = headerPositions.size - 1
 //          ^^^^ definition local 35
+//               display_name high
 //               documentation ```kt\nvar high: kotlin.Int\n```
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1394,6 +1548,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                    ^^^^ reference local 35
             val middle = (low + high) / 2
 //              ^^^^^^ definition local 36
+//                     display_name middle
 //                     documentation ```kt\nval middle: kotlin.Int\n```
 //                        ^^^ reference local 34
 //                            ^ reference semanticdb maven . . kotlin/Int#plus(+3).
@@ -1431,11 +1586,14 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
     private fun setScrollState(position: Int, offset: Int) {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setScrollState().
+//                             display_name setScrollState
 //                             documentation ```kt\nprivate final fun setScrollState(position: kotlin.Int, offset: kotlin.Int)\n```
 //                             ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setScrollState().(position)
+//                                      display_name position
 //                                      documentation ```kt\nvalue-parameter position: kotlin.Int\n```
 //                                       ^^^ reference semanticdb maven . . kotlin/Int#
 //                                            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setScrollState().(offset)
+//                                                   display_name offset
 //                                                   documentation ```kt\nvalue-parameter offset: kotlin.Int\n```
 //                                                    ^^^ reference semanticdb maven . . kotlin/Int#
         scrollPosition = position
@@ -1458,30 +1616,41 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //   ^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-parcelize-runtime 1.4.20-RC kotlinx/android/parcel/Parcelize#`<init>`().
     data class SavedState(
 //             ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#
+//                        display_name SavedState
 //                        documentation ```kt\npublic final data class SavedState\n```\n\n----\n\n\n Save / restore existing [RecyclerView] state and\n scrolling position and offset.\n
 //             ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#`<init>`().
+//                        display_name SavedState
 //                        documentation ```kt\npublic constructor SavedState(superState: [Error type: Unresolved type for Parcelable]?, scrollPosition: kotlin.Int, scrollOffset: kotlin.Int)\n```
         val superState: Parcelable?,
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#`<init>`().(superState)
+//                     display_name superState
 //                     documentation ```kt\nvalue-parameter superState: [Error type: Unresolved type for Parcelable]?\n```
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#getSuperState().
+//                     display_name superState
 //                     documentation ```kt\npublic final val superState: [Error type: Unresolved type for Parcelable]?\n```
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#superState.
+//                     display_name superState
 //                     documentation ```kt\npublic final val superState: [Error type: Unresolved type for Parcelable]?\n```
         val scrollPosition: Int,
 //          ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#`<init>`().(scrollPosition)
+//                         display_name scrollPosition
 //                         documentation ```kt\nvalue-parameter scrollPosition: kotlin.Int\n```
 //          ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#getScrollPosition().
+//                         display_name scrollPosition
 //                         documentation ```kt\npublic final val scrollPosition: kotlin.Int\n```
 //          ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#scrollPosition.
+//                         display_name scrollPosition
 //                         documentation ```kt\npublic final val scrollPosition: kotlin.Int\n```
 //                          ^^^ reference semanticdb maven . . kotlin/Int#
         val scrollOffset: Int
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#`<init>`().(scrollOffset)
+//                       display_name scrollOffset
 //                       documentation ```kt\nvalue-parameter scrollOffset: kotlin.Int\n```
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#getScrollOffset().
+//                       display_name scrollOffset
 //                       documentation ```kt\npublic final val scrollOffset: kotlin.Int\n```
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#SavedState#scrollOffset.
+//                       display_name scrollOffset
 //                       documentation ```kt\npublic final val scrollOffset: kotlin.Int\n```
 //                        ^^^ reference semanticdb maven . . kotlin/Int#
     ) : Parcelable
@@ -1493,11 +1662,14 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
      */
     private inner class HeaderPositionsAdapterDataObserver : RecyclerView.AdapterDataObserver() {
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#
+//                                                         display_name HeaderPositionsAdapterDataObserver
 //                                                         documentation ```kt\nprivate final inner class HeaderPositionsAdapterDataObserver\n```\n\n----\n\n\n Handles header positions while adapter changes occur.\n\n This is used in detriment of [RecyclerView.LayoutManager]'s callbacks to control when they're received.\n
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#`<init>`().
+//                                                         display_name HeaderPositionsAdapterDataObserver
 //                                                         documentation ```kt\npublic constructor HeaderPositionsAdapterDataObserver()\n```\n\n----\n\n\n Handles header positions while adapter changes occur.\n\n This is used in detriment of [RecyclerView.LayoutManager]'s callbacks to control when they're received.\n
         override fun onChanged() {
 //                   ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onChanged().
+//                             display_name onChanged
 //                             documentation ```kt\npublic open fun onChanged()\n```
             // There's no hint at what changed, so go through the adapter.
             headerPositions.clear()
@@ -1506,17 +1678,20 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                          ^^^^^ reference semanticdb maven . . kotlin/collections/MutableList#clear().
             val itemCount = adapter?.itemCount ?: 0
 //              ^^^^^^^^^ definition local 37
+//                        display_name itemCount
 //                        documentation ```kt\nval itemCount: kotlin.Int\n```
 //                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#adapter.
 //                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getAdapter().
 //                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#setAdapter().
             for (i in 0 until itemCount) {
 //               ^ definition local 38
+//                 display_name i
 //                 documentation ```kt\nval i: kotlin.Int\n```
 //                      ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/RangesKt#until(+6).
 //                            ^^^^^^^^^ reference local 37
                 val isSticky = adapter?.isStickyHeader(i) ?: false
 //                  ^^^^^^^^ definition local 39
+//                           display_name isSticky
 //                           documentation ```kt\nval isSticky: kotlin.Boolean\n```
 //                             ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#adapter.
 //                             ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getAdapter().
@@ -1551,16 +1726,20 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
         override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
 //                   ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeInserted().
+//                                       display_name onItemRangeInserted
 //                                       documentation ```kt\npublic open fun onItemRangeInserted(positionStart: kotlin.Int, itemCount: kotlin.Int)\n```
 //                                       ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeInserted().(positionStart)
+//                                                     display_name positionStart
 //                                                     documentation ```kt\nvalue-parameter positionStart: kotlin.Int\n```
 //                                                      ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                           ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeInserted().(itemCount)
+//                                                                     display_name itemCount
 //                                                                     documentation ```kt\nvalue-parameter itemCount: kotlin.Int\n```
 //                                                                      ^^^ reference semanticdb maven . . kotlin/Int#
             // Shift headers below down.
             val headerCount = headerPositions.size
 //              ^^^^^^^^^^^ definition local 40
+//                          display_name headerCount
 //                          documentation ```kt\nval headerCount: kotlin.Int\n```
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1571,6 +1750,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                          ^ reference semanticdb maven . . kotlin/Int#compareTo(+3).
                 var i = findHeaderIndexOrNext(positionStart)
 //                  ^ definition local 41
+//                    display_name i
 //                    documentation ```kt\nvar i: kotlin.Int\n```
 //                      ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrNext().
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeInserted().(positionStart)
@@ -1599,6 +1779,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
             // Add new headers.
             for (i in positionStart until positionStart + itemCount) {
 //               ^ definition local 42
+//                 display_name i
 //                 documentation ```kt\nval i: kotlin.Int\n```
 //                    ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeInserted().(positionStart)
 //                                  ^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/ranges/RangesKt#until(+6).
@@ -1607,6 +1788,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                                        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeInserted().(itemCount)
                 val isSticky = adapter?.isStickyHeader(i) ?: false
 //                  ^^^^^^^^ definition local 43
+//                           display_name isSticky
 //                           documentation ```kt\nval isSticky: kotlin.Boolean\n```
 //                             ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#adapter.
 //                             ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getAdapter().
@@ -1616,6 +1798,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                  ^^^^^^^^ reference local 43
                     val headerIndex = findHeaderIndexOrNext(i)
 //                      ^^^^^^^^^^^ definition local 44
+//                                  display_name headerIndex
 //                                  documentation ```kt\nval headerIndex: kotlin.Int\n```
 //                                    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrNext().
 //                                                          ^ reference local 42
@@ -1642,15 +1825,19 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
         override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
 //                   ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeRemoved().
+//                                      display_name onItemRangeRemoved
 //                                      documentation ```kt\npublic open fun onItemRangeRemoved(positionStart: kotlin.Int, itemCount: kotlin.Int)\n```
 //                                      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeRemoved().(positionStart)
+//                                                    display_name positionStart
 //                                                    documentation ```kt\nvalue-parameter positionStart: kotlin.Int\n```
 //                                                     ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeRemoved().(itemCount)
+//                                                                    display_name itemCount
 //                                                                    documentation ```kt\nvalue-parameter itemCount: kotlin.Int\n```
 //                                                                     ^^^ reference semanticdb maven . . kotlin/Int#
             var headerCount = headerPositions.size
 //              ^^^^^^^^^^^ definition local 45
+//                          display_name headerCount
 //                          documentation ```kt\nvar headerCount: kotlin.Int\n```
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1662,6 +1849,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
                 // Remove headers.
                 for (i in positionStart + itemCount - 1 downTo positionStart) {
 //                   ^ definition local 46
+//                     display_name i
 //                     documentation ```kt\nval i: kotlin.Int\n```
 //                        ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeRemoved().(positionStart)
 //                                      ^ reference semanticdb maven . . kotlin/Int#plus(+3).
@@ -1671,6 +1859,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                                             ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeRemoved().(positionStart)
                     val index = findHeaderIndex(i)
 //                      ^^^^^ definition local 47
+//                            display_name index
 //                            documentation ```kt\nval index: kotlin.Int\n```
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndex().
 //                                              ^ reference local 46
@@ -1708,6 +1897,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
                 // Shift headers below up.
                 var i = findHeaderIndexOrNext(positionStart + itemCount)
 //                  ^ definition local 48
+//                    display_name i
 //                    documentation ```kt\nvar i: kotlin.Int\n```
 //                      ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrNext().
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeRemoved().(positionStart)
@@ -1738,20 +1928,25 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
         override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
 //                   ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeMoved().
+//                                    display_name onItemRangeMoved
 //                                    documentation ```kt\npublic open fun onItemRangeMoved(fromPosition: kotlin.Int, toPosition: kotlin.Int, itemCount: kotlin.Int)\n```
 //                                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeMoved().(fromPosition)
+//                                                 display_name fromPosition
 //                                                 documentation ```kt\nvalue-parameter fromPosition: kotlin.Int\n```
 //                                                  ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                       ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeMoved().(toPosition)
+//                                                                  display_name toPosition
 //                                                                  documentation ```kt\nvalue-parameter toPosition: kotlin.Int\n```
 //                                                                   ^^^ reference semanticdb maven . . kotlin/Int#
 //                                                                        ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeMoved().(itemCount)
+//                                                                                  display_name itemCount
 //                                                                                  documentation ```kt\nvalue-parameter itemCount: kotlin.Int\n```
 //                                                                                   ^^^ reference semanticdb maven . . kotlin/Int#
             // Shift moved headers by toPosition - fromPosition.
             // Shift headers in-between by -itemCount (reverse if upwards).
             val headerCount = headerPositions.size
 //              ^^^^^^^^^^^ definition local 49
+//                          display_name headerCount
 //                          documentation ```kt\nval headerCount: kotlin.Int\n```
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1766,6 +1961,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeMoved().(toPosition)
                     var i = findHeaderIndexOrNext(fromPosition)
 //                      ^ definition local 50
+//                        display_name i
 //                        documentation ```kt\nvar i: kotlin.Int\n```
 //                          ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrNext().
 //                                                ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeMoved().(fromPosition)
@@ -1778,6 +1974,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                        ^^^^^^^^^^^ reference local 49
                         val headerPos = headerPositions[i]
 //                          ^^^^^^^^^ definition local 51
+//                                    display_name headerPos
 //                                    documentation ```kt\nval headerPos: kotlin.Int\n```
 //                                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1832,6 +2029,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
                 } else {
                     var i = findHeaderIndexOrNext(toPosition)
 //                      ^ definition local 52
+//                        display_name i
 //                        documentation ```kt\nvar i: kotlin.Int\n```
 //                          ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrNext().
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#onItemRangeMoved().(toPosition)
@@ -1844,6 +2042,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                              ^^^^^^^^^^^ reference local 49
                         val headerPos = headerPositions[i]
 //                          ^^^^^^^^^ definition local 53
+//                                    display_name headerPos
 //                                    documentation ```kt\nval headerPos: kotlin.Int\n```
 //                                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1900,12 +2099,15 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 
         private fun sortHeaderAtIndex(index: Int) {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#sortHeaderAtIndex().
+//                                    display_name sortHeaderAtIndex
 //                                    documentation ```kt\nprivate final fun sortHeaderAtIndex(index: kotlin.Int)\n```
 //                                    ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#sortHeaderAtIndex().(index)
+//                                          display_name index
 //                                          documentation ```kt\nvalue-parameter index: kotlin.Int\n```
 //                                           ^^^ reference semanticdb maven . . kotlin/Int#
             val headerPos = headerPositions.removeAt(index)
 //              ^^^^^^^^^ definition local 54
+//                        display_name headerPos
 //                        documentation ```kt\nval headerPos: kotlin.Int\n```
 //                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#getHeaderPositions().
 //                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#headerPositions.
@@ -1913,6 +2115,7 @@ class StickyHeaderLinearLayoutManager @JvmOverloads constructor(
 //                                                   ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#HeaderPositionsAdapterDataObserver#sortHeaderAtIndex().(index)
             val headerIndex = findHeaderIndexOrNext(headerPos)
 //              ^^^^^^^^^^^ definition local 55
+//                          display_name headerIndex
 //                          documentation ```kt\nval headerIndex: kotlin.Int\n```
 //                            ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/stickyheader/StickyHeaderLinearLayoutManager#findHeaderIndexOrNext().
 //                                                  ^^^^^^^^^ reference local 54
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/utils/utils.kt b/tests/snapshots/src/main/generated/com/airbnb/epoxy/utils/utils.kt
index 8c9eb5e50..a4dd0dd0f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/utils/utils.kt
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/utils/utils.kt
@@ -11,8 +11,10 @@ import android.content.pm.ApplicationInfo
 //^^^^^^^^^^^ reference semanticdb maven maven/org.jetbrains.kotlin/kotlin-stdlib 1.4.20-RC kotlin/PublishedApi#`<init>`().
 internal val Context.isDebuggable: Boolean
 //                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/utils/utilsKt#isDebuggable.
+//                                display_name isDebuggable
 //                                documentation ```kt\ninternal val [Error type: Unresolved type for Context].isDebuggable: kotlin.Boolean\n```
 //                                 ^^^^^^^ reference semanticdb maven . . kotlin/Boolean#
     get() = (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) != 0
 //  ^^^ definition semanticdb maven . . com/airbnb/epoxy/utils/utilsKt#getIsDebuggable().
+//      display_name get
 //      documentation ```kt\ninternal fun [Error type: Unresolved type for Context].`<get-isDebuggable>`(): kotlin.Boolean\n```
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
index a496a1384..0b15a9c8b 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
@@ -3,49 +3,60 @@ package minimized
 
 case class Issue396(a: Int)
 //         ^^^^^^^^ definition semanticdb maven . . minimized/Issue396#
+//                  display_name Issue396
 //                  documentation ```scala\ncase class Issue396(a: Int)\n```
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#copy().
+//                  display_name copy
 //                  documentation ```scala\ndef copy(a: Int): Issue396\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#productElement().
+//                  display_name productElement
 //                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396.
+//                  display_name Issue396
 //                  documentation ```scala\nobject Issue396\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396.apply().
+//                  display_name apply
 //                  documentation ```scala\ndef apply(a: Int): Issue396\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Function1#apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#productElementName().
+//                  display_name productElementName
 //                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //                 ^ definition semanticdb maven . . minimized/Issue396#`<init>`().
+//                   display_name <init>
 //                   documentation ```scala\ndef this(a: Int)\n```
 //                  ^ definition semanticdb maven . . minimized/Issue396#a.
+//                    display_name a
 //                    documentation ```scala\nval a: Int\n```
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396.apply().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396.apply().(a)
+//                    display_name a
 //                    documentation ```scala\na: Int \n```
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396#`<init>`().(a)
+//                    display_name a
 //                    documentation ```scala\na: Int \n```
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396.apply().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396#copy().(a)
+//                    display_name a
 //                    documentation ```scala\ndefault a: Int \n```
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
@@ -53,6 +64,7 @@ case class Issue396(a: Int)
 //                     ^^^ reference semanticdb maven . . scala/Int#
 object Issue396App {
 //     ^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue396App.
+//                 display_name Issue396App
 //                 documentation ```scala\nobject Issue396App\n```
   println(Issue396)
 //^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
index 8285a9e5e..419593709 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
@@ -3,13 +3,17 @@ package minimized
 
 class Issue397 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue397#
+//             display_name Issue397
 //             documentation ```scala\nclass Issue397\n```
 //             ^ definition semanticdb maven . . minimized/Issue397#`<init>`().
+//               display_name <init>
 //               documentation ```scala\ndef this()\n```
   var blah = Set("abc")
 //    ^^^^ definition semanticdb maven . . minimized/Issue397#blah().
+//         display_name blah
 //         documentation ```scala\nvar blah: Set[String]\n```
 //    ____ synthetic_definition semanticdb maven . . minimized/Issue397#`blah_=`().
+//         display_name blah_=
 //         documentation ```scala\nvar blah_=(x$1: Set[String]): Unit\n```
 //         relationship is_definition semanticdb maven . . minimized/Issue397#blah().
 //           ^^^ reference semanticdb maven . . scala/Predef.Set.
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
index 57ae622f5..3a512d48a 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
@@ -3,49 +3,60 @@ package minimized
 
 case class Issue403(value: String)
 //         ^^^^^^^^ definition semanticdb maven . . minimized/Issue403#
+//                  display_name Issue403
 //                  documentation ```scala\ncase class Issue403(value: String)\n```
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#productElementName().
+//                  display_name productElementName
 //                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403.apply().
+//                  display_name apply
 //                  documentation ```scala\ndef apply(value: String): Issue403\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Function1#apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403.
+//                  display_name Issue403
 //                  documentation ```scala\nobject Issue403\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#productElement().
+//                  display_name productElement
 //                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#copy().
+//                  display_name copy
 //                  documentation ```scala\ndef copy(value: String): Issue403\n```
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                 ^ definition semanticdb maven . . minimized/Issue403#`<init>`().
+//                   display_name <init>
 //                   documentation ```scala\ndef this(value: String)\n```
 //                  ^^^^^ definition semanticdb maven . . minimized/Issue403#value.
+//                        display_name value
 //                        documentation ```scala\nval value: String\n```
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403.apply().(value)
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403#copy().(value)
+//                        display_name value
 //                        documentation ```scala\ndefault value: String \n```
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
 //                        relationship is_reference semanticdb maven . . minimized/Issue403.apply().(value)
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403.apply().(value)
+//                        display_name value
 //                        documentation ```scala\nvalue: String \n```
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403#`<init>`().(value)
+//                        display_name value
 //                        documentation ```scala\nvalue: String \n```
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
@@ -54,9 +65,11 @@ case class Issue403(value: String)
 
 object Issue403App {
 //     ^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue403App.
+//                 display_name Issue403App
 //                 documentation ```scala\nobject Issue403App\n```
   def instantiations(): Unit = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue403App.instantiations().
+//                   display_name instantiations
 //                   documentation ```scala\ndef instantiations(): Unit\n```
 //                      ^^^^ reference semanticdb maven . . scala/Unit#
     println(Issue403("a").value)
@@ -81,6 +94,7 @@ object Issue403App {
       case Issue403(value) =>
 //         ^^^^^^^^ reference semanticdb maven . . minimized/Issue403.
 //                  ^^^^^ definition local 1
+//                        display_name value
 //                        documentation ```scala\nvalue: String \n```
         println(value)
 //      ^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
index 4106f114a..1a4f7aa73 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
@@ -3,23 +3,29 @@ package minimized
 
 class Issue412 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue412#
+//             display_name Issue412
 //             documentation ```scala\nclass Issue412\n```
 //             ^ definition semanticdb maven . . minimized/Issue412#`<init>`().
+//               display_name <init>
 //               documentation ```scala\ndef this()\n```
   val a: Int = 5
 //    ^ definition semanticdb maven . . minimized/Issue412#a.
+//      display_name a
 //      documentation ```scala\nval a: Int\n```
 //       ^^^ reference semanticdb maven . . scala/Int#
   val b: Long = a
 //    ^ definition semanticdb maven . . minimized/Issue412#b.
+//      display_name b
 //      documentation ```scala\nval b: Long\n```
 //       ^^^^ reference semanticdb maven . . scala/Long#
 //              ^ reference semanticdb maven . . minimized/Issue412#a.
 
   def a(b: Long): Unit = {
 //    ^ definition semanticdb maven . . minimized/Issue412#a().
+//      display_name a
 //      documentation ```scala\ndef a(b: Long): Unit\n```
 //      ^ definition semanticdb maven . . minimized/Issue412#a().(b)
+//        display_name b
 //        documentation ```scala\nb: Long \n```
 //         ^^^^ reference semanticdb maven . . scala/Long#
 //                ^^^^ reference semanticdb maven . . scala/Unit#
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
index 1d9c494ba..9fbfc5e02 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
@@ -3,32 +3,39 @@ package minimized
 
 trait Issue413 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue413#
+//             display_name Issue413
 //             documentation ```scala\ntrait Issue413\n```
   val b: Int
 //    ^ definition semanticdb maven . . minimized/Issue413#b.
+//      display_name b
 //      documentation ```scala\nval b: Int\n```
 //      relationship is_reference is_implementation semanticdb maven . . minimized/Issue413Subclass#b.
 //       ^^^ reference semanticdb maven . . scala/Int#
   val c: Int
 //    ^ definition semanticdb maven . . minimized/Issue413#c.
+//      display_name c
 //      documentation ```scala\nval c: Int\n```
 //      relationship is_reference is_implementation semanticdb maven . . minimized/Issue413Subclass#c.
 //       ^^^ reference semanticdb maven . . scala/Int#
 }
 object Issue413 {
 //     ^^^^^^^^ definition semanticdb maven . . minimized/Issue413.
+//              display_name Issue413
 //              documentation ```scala\nobject Issue413\n```
   def main(): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/Issue413.main().
+//         display_name main
 //         documentation ```scala\ndef main(): Unit\n```
 //            ^^^^ reference semanticdb maven . . scala/Unit#
     val a = new Issue413Subclass()
 //      ^ definition local 0
+//        display_name a
 //        documentation ```scala\na: Issue413Subclass \n```
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Issue413Subclass#
 //                              ^ reference semanticdb maven . . minimized/Issue413Subclass#`<init>`().
     val b: Issue413 = a
 //      ^ definition local 1
+//        display_name b
 //        documentation ```scala\nb: Issue413 \n```
 //         ^^^^^^^^ reference semanticdb maven . . minimized/Issue413#
 //                    ^ reference local 0
@@ -44,17 +51,21 @@ object Issue413 {
 
 class Issue413Subclass extends Issue413 {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue413Subclass#
+//                     display_name Issue413Subclass
 //                     documentation ```scala\nclass Issue413Subclass\n```
 //                     ^ definition semanticdb maven . . minimized/Issue413Subclass#`<init>`().
+//                       display_name <init>
 //                       documentation ```scala\ndef this()\n```
 //                             ^^^^^^^^ reference semanticdb maven . . minimized/Issue413#
 //                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   override val b = 10
 //             ^ definition semanticdb maven . . minimized/Issue413Subclass#b.
+//               display_name b
 //               documentation ```scala\nval b: Int\n```
 //               relationship is_reference is_implementation semanticdb maven . . minimized/Issue413#b.
   override val c = 10
 //             ^ definition semanticdb maven . . minimized/Issue413Subclass#c.
+//               display_name c
 //               documentation ```scala\nval c: Int\n```
 //               relationship is_reference is_implementation semanticdb maven . . minimized/Issue413#c.
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
index 7b4841bed..0c5e0f380 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
@@ -3,25 +3,31 @@ package minimized
 
 object Issue414 {
 //     ^^^^^^^^ definition semanticdb maven . . minimized/Issue414.
+//              display_name Issue414
 //              documentation ```scala\nobject Issue414\n```
   trait A {
 //      ^ definition semanticdb maven . . minimized/Issue414.A#
+//        display_name A
 //        documentation ```scala\ntrait A\n```
     def b(): Unit
 //      ^ definition semanticdb maven . . minimized/Issue414.A#b().
+//        display_name b
 //        documentation ```scala\ndef b(): Unit\n```
 //           ^^^^ reference semanticdb maven . . scala/Unit#
   }
   val a1 =
 //    ^^ definition semanticdb maven . . minimized/Issue414.a1.
+//       display_name a1
 //       documentation ```scala\nval a1: {}\n```
     new A {
 //      ^ definition local 0
+//        display_name $anon
 //        documentation ```scala\nfinal class $anon\n```
 //      ^ reference semanticdb maven . . minimized/Issue414.A#
 //        ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       override def b(): Unit = {
 //                 ^ definition local 1
+//                   display_name b
 //                   documentation ```scala\ndef b(): Unit\n```
 //                   relationship is_reference is_implementation semanticdb maven . . minimized/Issue414.A#b().
 //                      ^^^^ reference semanticdb maven . . scala/Unit#
@@ -31,6 +37,7 @@ object Issue414 {
     }
   val a2: A = a1
 //    ^^ definition semanticdb maven . . minimized/Issue414.a2.
+//       display_name a2
 //       documentation ```scala\nval a2: A\n```
 //        ^ reference semanticdb maven . . minimized/Issue414.A#
 //            ^^ reference semanticdb maven . . minimized/Issue414.a1.
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
index 51e26f791..d7e18958d 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
@@ -3,6 +3,7 @@ package minimized
 
 object Issue414Reference {
 //     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue414Reference.
+//                       display_name Issue414Reference
 //                       documentation ```scala\nobject Issue414Reference\n```
   println(Issue414.a1.b())
 //^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
index aaf1ae260..ae687a827 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
@@ -4,11 +4,14 @@ package minimized
 // format: off
 object MinimizedScalaMain {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.
+//                        display_name MinimizedScalaMain
 //                        documentation ```scala\nobject MinimizedScalaMain\n```
   def main(args: Array[String]): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.main().
+//         display_name main
 //         documentation ```scala\ndef main(args: Array[String]): Unit\n```
 //         ^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.main().(args)
+//              display_name args
 //              documentation ```scala\nargs: Array[String] \n```
 //               ^^^^^ reference semanticdb maven . . scala/Array#
 //                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
index d983a43aa..6be2025e0 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
@@ -6,36 +6,45 @@ package minimized
 
 case class MinimizedCaseClass(value: String) {
 //         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#
+//                            display_name MinimizedCaseClass
 //                            documentation ```scala\ncase class MinimizedCaseClass(value: String)\n```
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#productElement().
+//                            display_name productElement
 //                            documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                            relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#productElementName().
+//                            display_name productElementName
 //                            documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                            relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#copy().
+//                            display_name copy
 //                            documentation ```scala\ndef copy(value: String): MinimizedCaseClass\n```
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                           ^ definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().
+//                             display_name <init>
 //                             documentation ```scala\ndef this(value: String)\n```
 //                            ^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#value.
+//                                  display_name value
 //                                  documentation ```scala\nval value: String\n```
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
+//                                  display_name value
 //                                  documentation ```scala\ndefault value: String \n```
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference is_definition semanticdb maven . . minimized/MinimizedCaseClass#value.
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
+//                                  display_name value
 //                                  documentation ```scala\nvalue: String \n```
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  relationship is_reference is_definition semanticdb maven . . minimized/MinimizedCaseClass#value.
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
+//                                  display_name value
 //                                  documentation ```scala\nvalue: String \n```
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
@@ -43,19 +52,23 @@ case class MinimizedCaseClass(value: String) {
 //                                   ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def this() = this(value = "value")
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`(+1).
+//         display_name <init>
 //         documentation ```scala\ndef this()\n```
 //                 ^ reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().
 //                  ^^^^^ reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 }
 object MinimizedCaseClass {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass.
+//                        display_name MinimizedCaseClass
 //                        documentation ```scala\nobject MinimizedCaseClass\n```
 //                        relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().
 //     __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass.apply().
+//                        display_name apply
 //                        documentation ```scala\ndef apply(value: String): MinimizedCaseClass\n```
 //                        relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass.
   def main(): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass.main().
+//         display_name main
 //         documentation ```scala\ndef main(): Unit\n```
 //            ^^^^ reference semanticdb maven . . scala/Unit#
     println(MinimizedCaseClass.apply(value = "value1").copy(value = "value2").value)
@@ -71,21 +84,27 @@ object MinimizedCaseClass {
 
 trait MinimizedTrait[T] extends AutoCloseable {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedTrait#
+//                   display_name MinimizedTrait
 //                   documentation ```scala\ntrait MinimizedTrait[T]\n```
 //                   ^ definition semanticdb maven . . minimized/MinimizedTrait#[T]
+//                     display_name T
 //                     documentation ```scala\nT\n```
 //                              ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/AutoCloseable#
   def add(e: T): T
 //    ^^^ definition semanticdb maven . . minimized/MinimizedTrait#add().
+//        display_name add
 //        documentation ```scala\ndef add(e: T): T\n```
 //        ^ definition semanticdb maven . . minimized/MinimizedTrait#add().(e)
+//          display_name e
 //          documentation ```scala\ne: T \n```
 //           ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
 //               ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
   final def +(e: T): T = add(e)
 //          ^ definition semanticdb maven . . minimized/MinimizedTrait#`+`().
+//            display_name +
 //            documentation ```scala\nfinal def +(e: T): T\n```
 //            ^ definition semanticdb maven . . minimized/MinimizedTrait#`+`().(e)
+//              display_name e
 //              documentation ```scala\ne: T \n```
 //               ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
 //                   ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
@@ -95,8 +114,10 @@ trait MinimizedTrait[T] extends AutoCloseable {
 
 class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#
+//                             display_name MinimizedScalaSignatures
 //                             documentation ```scala\nclass MinimizedScalaSignatures\n```
 //                             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#`<init>`().
+//                               display_name <init>
 //                               documentation ```scala\ndef this()\n```
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/AutoCloseable#
 //                                                   ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
@@ -105,6 +126,7 @@ class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
 //                                                                ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/Serializable#
   def close(): Unit = ()
 //    ^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#close().
+//          display_name close
 //          documentation ```scala\ndef close(): Unit\n```
 //          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/AutoCloseable#close().
 //             ^^^^ reference semanticdb maven . . scala/Unit#
@@ -112,6 +134,7 @@ class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
 
 object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable[Int] {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.
+//                              display_name MinimizedScalaSignatures
 //                              documentation ```scala\nobject MinimizedScalaSignatures\n```
 //                                      ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/MinimizedScalaSignatures#
 //                                                               ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures#`<init>`().
@@ -121,8 +144,10 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 // ^^^^^^ reference semanticdb maven . . scala/inline#
 //        ^ reference semanticdb maven . . scala/inline#`<init>`().
 //            ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotation().
+//                       display_name annotation
 //                       documentation ```scala\n@inline\ndef annotation(x: Int): Int\n```
 //                       ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotation().(x)
+//                         display_name x
 //                         documentation ```scala\nx: Int \n```
 //                          ^^^ reference semanticdb maven . . scala/Int#
 //                                ^^^ reference semanticdb maven . . scala/Int#
@@ -132,8 +157,10 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 // ^^^^^^^^^^ reference semanticdb maven . . scala/deprecated#
 //           ^ reference semanticdb maven . . scala/deprecated#`<init>`().
 //                              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotationMessage().
+//                                                display_name annotationMessage
 //                                                documentation ```scala\n@deprecated\ndef annotationMessage(x: Int): Int\n```
 //                                                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotationMessage().(x)
+//                                                  display_name x
 //                                                  documentation ```scala\nx: Int \n```
 //                                                   ^^^ reference semanticdb maven . . scala/Int#
 //                                                         ^^^ reference semanticdb maven . . scala/Int#
@@ -141,144 +168,183 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //                                                                 ^ reference semanticdb maven . . scala/Int#`+`(+4).
   def compareTo(x: Int): Int = ???
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.compareTo().
+//              display_name compareTo
 //              documentation ```scala\ndef compareTo(x: Int): Int\n```
 //              relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Comparable#compareTo().
 //              ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.compareTo().(x)
+//                display_name x
 //                documentation ```scala\nx: Int \n```
 //                 ^^^ reference semanticdb maven . . scala/Int#
 //                       ^^^ reference semanticdb maven . . scala/Int#
 //                             ^^^ reference semanticdb maven . . scala/Predef.`???`().
   def identity[T](e: T): T = e
 //    ^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().
+//             display_name identity
 //             documentation ```scala\ndef identity(e: T): T\n```
 //             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
+//               display_name T
 //               documentation ```scala\nT\n```
 //                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().(e)
+//                  display_name e
 //                  documentation ```scala\ne: T \n```
 //                   ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
 //                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
 //                           ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().(e)
   def tuple(): (Int, String) = null
 //    ^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.tuple().
+//          display_name tuple
 //          documentation ```scala\ndef tuple(): (Int, String)\n```
 //              ^^^ reference semanticdb maven . . scala/Int#
 //                   ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function0(): () => String = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function0().
+//              display_name function0
 //              documentation ```scala\ndef function0(): String=> String\n```
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function1(): Int => String = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function1().
+//              display_name function1
 //              documentation ```scala\ndef function1(): (Int) => String\n```
 //                 ^^^ reference semanticdb maven . . scala/Int#
 //                        ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function2(): (Int, String) => Unit = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function2().
+//              display_name function2
 //              documentation ```scala\ndef function2(): (Int, String) => Unit\n```
 //                  ^^^ reference semanticdb maven . . scala/Int#
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                  ^^^^ reference semanticdb maven . . scala/Unit#
   def typeParameter(): Map[Int, String] = null
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.typeParameter().
+//                  display_name typeParameter
 //                  documentation ```scala\ndef typeParameter(): Map[Int, String]\n```
 //                     ^^^ reference semanticdb maven . . scala/Predef.Map#
 //                         ^^^ reference semanticdb maven . . scala/Int#
 //                              ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def termParameter(a: Int, b: String): String = null
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().
+//                  display_name termParameter
 //                  documentation ```scala\ndef termParameter(a: Int, b: String): String\n```
 //                  ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().(a)
+//                    display_name a
 //                    documentation ```scala\na: Int \n```
 //                     ^^^ reference semanticdb maven . . scala/Int#
 //                          ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().(b)
+//                            display_name b
 //                            documentation ```scala\nb: String \n```
 //                             ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                      ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def singletonType(e: String): e.type = e
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().
+//                  display_name singletonType
 //                  documentation ```scala\ndef singletonType(e: String): e.type\n```
 //                  ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
+//                    display_name e
 //                    documentation ```scala\ne: String \n```
 //                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                              ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
 //                                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
   def thisType(): this.type = this
 //    ^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.thisType().
+//             display_name thisType
 //             documentation ```scala\ndef thisType(): this.type\n```
   def constantInt(): 1 = 1
 //    ^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantInt().
+//                display_name constantInt
 //                documentation ```scala\ndef constantInt(): 1\n```
   def constantString(): "string" = "string"
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantString().
+//                   display_name constantString
 //                   documentation ```scala\ndef constantString(): "string"\n```
   def constantBoolean(): true = true
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantBoolean().
+//                    display_name constantBoolean
 //                    documentation ```scala\ndef constantBoolean(): true\n```
   def constantFloat(): 1.2f = 1.2f
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantFloat().
+//                  display_name constantFloat
 //                  documentation ```scala\ndef constantFloat(): 1.2f\n```
   def constantChar(): 'a' = 'a'
 //    ^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantChar().
+//                 display_name constantChar
 //                 documentation ```scala\ndef constantChar(): 'a'\n```
   def structuralType(): { val x: Int; def foo(a: Int): String } = null
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.structuralType().
+//                   display_name structuralType
 //                   documentation ```scala\ndef structuralType(): { val x: Int; def foo(a: Int): String }\n```
 //                            ^ definition local 1
+//                              display_name x
 //                              documentation ```scala\nval x: Int\n```
 //                               ^^^ reference semanticdb maven . . scala/Int#
 //                                        ^^^ definition local 2
+//                                            display_name foo
 //                                            documentation ```scala\ndef foo(a: Int): String\n```
 //                                            ^ definition local 3
+//                                              display_name a
 //                                              documentation ```scala\na: Int \n```
 //                                               ^^^ reference semanticdb maven . . scala/Int#
 //                                                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def byNameType(a: => Int): Unit = ()
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.byNameType().
+//               display_name byNameType
 //               documentation ```scala\ndef byNameType(a: => Int): Unit\n```
 //               ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.byNameType().(a)
+//                 display_name a
 //                 documentation ```scala\na: => Int \n```
 //                     ^^^ reference semanticdb maven . . scala/Int#
 //                           ^^^^ reference semanticdb maven . . scala/Unit#
   def repeatedType(a: Int*): Unit = ()
 //    ^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.repeatedType().
+//                 display_name repeatedType
 //                 documentation ```scala\ndef repeatedType(a: Int*): Unit\n```
 //                 ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.repeatedType().(a)
+//                   display_name a
 //                   documentation ```scala\na: Int* \n```
 //                    ^^^ reference semanticdb maven . . scala/Int#
 //                           ^^^^ reference semanticdb maven . . scala/Unit#
 
   type TypeAlias = Int
 //     ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeAlias#
+//               display_name TypeAlias
 //               documentation ```scala\ntype TypeAlias >: Int <: Int\n```
 //                 ^^^ reference semanticdb maven . . scala/Int#
   type ParameterizedTypeAlias[A] = () => A
 //     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#
+//                            display_name ParameterizedTypeAlias
 //                            documentation ```scala\ntype ParameterizedTypeAlias >: A=> A <: A=> A\n```
 //                            ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#[A]
+//                              display_name A
 //                              documentation ```scala\nA\n```
 //                                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#[A]
   type ParameterizedTypeAlias2[A, B] = A => B
 //     ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#
+//                             display_name ParameterizedTypeAlias2
 //                             documentation ```scala\ntype ParameterizedTypeAlias2 >: (A) => B <: (A) => B\n```
 //                             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[A]
+//                               display_name A
 //                               documentation ```scala\nA\n```
 //                                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[B]
+//                                  display_name B
 //                                  documentation ```scala\nB\n```
 //                                     ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[A]
 //                                          ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[B]
   type TypeBound
 //     ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeBound#
+//               display_name TypeBound
 //               documentation ```scala\ntype TypeBound\n```
   type TypeUpperBound <: String
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeUpperBound#
+//                    display_name TypeUpperBound
 //                    documentation ```scala\ntype TypeUpperBound <: String\n```
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   type TypeLowerBound >: CharSequence
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeLowerBound#
+//                    display_name TypeLowerBound
 //                    documentation ```scala\ntype TypeLowerBound >: CharSequence\n```
 //                       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
   type TypeLowerUpperBound >: String <: CharSequence 
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeLowerUpperBound#
+//                         display_name TypeLowerUpperBound
 //                         documentation ```scala\ntype TypeLowerUpperBound >: String <: CharSequence\n```
 //                            ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
index 122faa527..aa4930a01 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
@@ -15,11 +15,14 @@ import scala.concurrent.Future
 
 class MinimizedScalaSynthetic {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#
+//                            display_name MinimizedScalaSynthetic
 //                            documentation ```scala\nclass MinimizedScalaSynthetic\n```
 //                            ^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#`<init>`().
+//                              display_name <init>
 //                              documentation ```scala\ndef this()\n```
   def everything(): Unit = Future(1)
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#everything().
+//               display_name everything
 //               documentation ```scala\ndef everything(): Unit\n```
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
@@ -27,6 +30,7 @@ class MinimizedScalaSynthetic {
 //                                  ^ reference semanticdb maven . . scala/concurrent/ExecutionContext.Implicits.global().
   def applyTree(): Unit = Future.apply[Int](1)
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#applyTree().
+//              display_name applyTree
 //              documentation ```scala\ndef applyTree(): Unit\n```
 //                 ^^^^ reference semanticdb maven . . scala/Unit#
 //                        ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
@@ -35,6 +39,7 @@ class MinimizedScalaSynthetic {
 //                                            ^ reference semanticdb maven . . scala/concurrent/ExecutionContext.Implicits.global().
   def applyTree2(): Unit = List.apply[Int](1).sorted
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#applyTree2().
+//               display_name applyTree2
 //               documentation ```scala\ndef applyTree2(): Unit\n```
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^ reference semanticdb maven . . scala/package.List.
@@ -44,6 +49,7 @@ class MinimizedScalaSynthetic {
 //                                                  ^ reference semanticdb maven . . scala/math/Ordering.Int.
   def selectTree(): Unit = Future[Int](1)
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#selectTree().
+//               display_name selectTree
 //               documentation ```scala\ndef selectTree(): Unit\n```
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
@@ -52,6 +58,7 @@ class MinimizedScalaSynthetic {
 //                                       ^ reference semanticdb maven . . scala/concurrent/ExecutionContext.Implicits.global().
   def typeApplyTree(): Unit = Future.apply(1)
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#typeApplyTree().
+//                  display_name typeApplyTree
 //                  documentation ```scala\ndef typeApplyTree(): Unit\n```
 //                     ^^^^ reference semanticdb maven . . scala/Unit#
 //                            ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
@@ -59,16 +66,19 @@ class MinimizedScalaSynthetic {
 //                                           ^ reference semanticdb maven . . scala/concurrent/ExecutionContext.Implicits.global().
   def forComprehensions(): Unit =
 //    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#forComprehensions().
+//                      display_name forComprehensions
 //                      documentation ```scala\ndef forComprehensions(): Unit\n```
 //                         ^^^^ reference semanticdb maven . . scala/Unit#
     for {
       x <- Future(1)
 //    ^ definition local 0
+//      display_name x
 //      documentation ```scala\nx: Int \n```
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //               ^ reference semanticdb maven . . scala/concurrent/Future.apply().
       y <- Future.successful(1)
 //    ^ definition local 1
+//      display_name y
 //      documentation ```scala\ny: Int \n```
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                ^^^^^^^^^^ reference semanticdb maven . . scala/concurrent/Future.successful().
@@ -77,6 +87,7 @@ class MinimizedScalaSynthetic {
 //         ^ reference semanticdb maven . . scala/Int#`<`(+3).
       z <- Future.apply[Int](1)
 //    ^ definition local 2
+//      display_name z
 //      documentation ```scala\nz: Int \n```
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                ^^^^^ reference semanticdb maven . . scala/concurrent/Future.apply().
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
index 514615f6e..6f2fa82ce 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
@@ -8,18 +8,23 @@ import scala.language.reflectiveCalls
 
 class ReflectiveCall {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ReflectiveCall#
+//                   display_name ReflectiveCall
 //                   documentation ```scala\nclass ReflectiveCall\n```
 //                   ^ definition semanticdb maven . . minimized/ReflectiveCall#`<init>`().
+//                     display_name <init>
 //                     documentation ```scala\ndef this()\n```
   // Reproduction for https://github.com/scalameta/scalameta/issues/2788
   val a =
 //    ^ definition semanticdb maven . . minimized/ReflectiveCall#a.
+//      display_name a
 //      documentation ```scala\nval a: { val b: Int }\n```
     new {
 //      ^ definition local 0
+//        display_name $anon
 //        documentation ```scala\nfinal class $anon\n```
       val b = 1
 //        ^ definition local 1
+//          display_name b
 //          documentation ```scala\nval b: Int\n```
     }
   println(a.b)
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
index 694339277..a2107b00f 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
@@ -2,12 +2,15 @@
 
 public abstract class AbstractClasses {
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#
+//                                    display_name AbstractClasses
 //                                    documentation ```java\npublic abstract class AbstractClasses\n```
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#`<init>`().
+//                                    display_name <init>
 //                                    documentation ```java\npublic AbstractClasses()\n```
   public String defaultImplementation() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#defaultImplementation().
+//                                    display_name defaultImplementation
 //                                    documentation ```java\npublic String defaultImplementation()\n```
     return "";
   }
@@ -15,6 +18,7 @@ public String defaultImplementation() {
   public abstract String abstractImplementation();
 //                ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#abstractImplementation().
+//                                              display_name abstractImplementation
 //                                              documentation ```java\npublic abstract String abstractImplementation()\n```
 //                                              relationship is_reference is_implementation semanticdb maven . . minimized/SubClasses#abstractImplementation().
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
index d547e1ef1..3cce3a442 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
@@ -52,16 +52,19 @@
 )
 public @interface Annotations {
 //                ^^^^^^^^^^^ definition semanticdb maven . . minimized/Annotations#
+//                            display_name Annotations
 //                            documentation ```java\n@Documented\n@Retention(RetentionPolicy.RUNTIME)\n@Target({CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})\npublic @interface Annotations\n```
 //                            relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 
   String value() default "";
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //       ^^^^^ definition semanticdb maven . . minimized/Annotations#value().
+//             display_name value
 //             documentation ```java\npublic abstract String value()\n```
 
   String format() default "";
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //       ^^^^^^ definition semanticdb maven . . minimized/Annotations#format().
+//              display_name format
 //              documentation ```java\npublic abstract String format()\n```
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
index 120025a63..7e63c4d2a 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
@@ -10,19 +10,24 @@
 //^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 public class AnonymousClasses {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnonymousClasses#
+//                            display_name AnonymousClasses
 //                            documentation ```java\n@SuppressWarnings("ALL")\npublic class AnonymousClasses\n```
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnonymousClasses#`<init>`().
+//                            display_name <init>
 //                            documentation ```java\npublic AnonymousClasses()\n```
   public static int app(int n) {
 //                  ^^^ definition semanticdb maven . . minimized/AnonymousClasses#app().
+//                      display_name app
 //                      documentation ```java\npublic static int app(int n)\n```
 //                          ^ definition local 0
+//                            display_name n
 //                            documentation ```java\nint n\n```
     Function<Integer, Integer> fn =
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //           ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                    ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                             ^^ definition local 1
+//                                display_name fn
 //                                documentation ```java\nFunction<Integer, Integer> fn\n```
         new Function<Integer, Integer>() {
 //          ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
@@ -33,10 +38,12 @@ public static int app(int n) {
           public Integer apply(Integer integer) {
 //               ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                       ^^^^^ definition local 3
+//                             display_name apply
 //                             documentation ```java\n@Override\npublic Integer apply(Integer integer)\n```
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/function/Function#apply().
 //                             ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                                     ^^^^^^^ definition local 4
+//                                             display_name integer
 //                                             documentation ```java\nInteger integer\n```
             return integer + n;
 //                 ^^^^^^^ reference local 4
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
index e51f7b6cf..4695448ae 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
@@ -2,26 +2,33 @@
 
 public class Arrays {
 //           ^^^^^^ definition semanticdb maven . . minimized/Arrays#
+//                  display_name Arrays
 //                  documentation ```java\npublic class Arrays\n```
 //           ^^^^^^ definition semanticdb maven . . minimized/Arrays#`<init>`().
+//                  display_name <init>
 //                  documentation ```java\npublic Arrays()\n```
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Arrays#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app()\n```
     int[] a = {1, 2, 3};
 //        ^ definition local 0
+//          display_name a
 //          documentation ```java\nint[] a\n```
     String[] b = {"1", "2", "3"};
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^ definition local 1
+//             display_name b
 //             documentation ```java\nString[] b\n```
     int[][] c = {{1}, {2}, {3}};
 //          ^ definition local 2
+//            display_name c
 //            documentation ```java\nint[][] c\n```
     String[][] d = {{"1"}, {"2"}, {"3"}};
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //             ^ definition local 3
+//               display_name d
 //               documentation ```java\nString[][] d\n```
     return b[0] + a[0] + c[1][0] + d[1][0];
 //         ^ reference local 1
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
index 18ddf348e..bd4b0a4e5 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
@@ -2,12 +2,15 @@
 
 public class ClassOf {
 //           ^^^^^^^ definition semanticdb maven . . minimized/ClassOf#
+//                   display_name ClassOf
 //                   documentation ```java\npublic class ClassOf\n```
 //           ^^^^^^^ definition semanticdb maven . . minimized/ClassOf#`<init>`().
+//                   display_name <init>
 //                   documentation ```java\npublic ClassOf()\n```
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/ClassOf#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app()\n```
     return ClassOf.class.getName();
 //         ^^^^^^^ reference semanticdb maven . . minimized/ClassOf#
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
index dc135919c..7246a5d79 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
@@ -3,14 +3,17 @@
 /** Example class docstring. */
 public class Docstrings {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#
+//                      display_name Docstrings
 //                      documentation ```java\npublic class Docstrings\n```
 //                      documentation Example class docstring. 
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#`<init>`().
+//                      display_name <init>
 //                      documentation ```java\npublic Docstrings()\n```
 
   /** Example field docstring. */
   public static int field = 42;
 //                  ^^^^^ definition semanticdb maven . . minimized/Docstrings#field.
+//                        display_name field
 //                        documentation ```java\npublic static int field\n```
 //                        documentation Example field docstring. 
 
@@ -21,6 +24,7 @@ public class Docstrings {
    */
   public static int method() {
 //                  ^^^^^^ definition semanticdb maven . . minimized/Docstrings#method().
+//                         display_name method
 //                         documentation ```java\npublic static int method()\n```
 //                         documentation  Example method docstring.\n\n @return 42.\n
     return 42;
@@ -34,9 +38,11 @@ public static int method() {
    */
   public static int methodParameter(int n) {
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#methodParameter().
+//                                  display_name methodParameter
 //                                  documentation ```java\npublic static int methodParameter(int n)\n```
 //                                  documentation  Example method parameter docstring.\n\n @param n The parameter.\n @return The number + 42.\n
 //                                      ^ definition local 0
+//                                        display_name n
 //                                        documentation ```java\nint n\n```
     return n + 42;
 //         ^ reference local 0
@@ -45,6 +51,7 @@ public static int methodParameter(int n) {
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Docstrings#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app()\n```
     return String.format("%s%s%s", field, method(), methodParameter(42));
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
index 334e2648c..812a38a9e 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
@@ -12,34 +12,42 @@
 
 enum Enums {
 //   ^^^^^ definition semanticdb maven . . minimized/Enums#
+//         display_name Enums
 //         documentation ```java\nenum Enums\n```
 //         relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //         relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //         relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
   A("A", 420),
 //^ definition semanticdb maven . . minimized/Enums#A.
+//  display_name A("A", 420)
 //  documentation ```java\nEnums.A("A", 420) /* ordinal 0 */\n```
 //^ reference semanticdb maven . . minimized/Enums#`<init>`().
   B("B", 1),
 //^ definition semanticdb maven . . minimized/Enums#B.
+//  display_name B("B", 1)
 //  documentation ```java\nEnums.B("B", 1) /* ordinal 1 */\n```
 //^ reference semanticdb maven . . minimized/Enums#`<init>`().
   C("C", 5);
 //^ definition semanticdb maven . . minimized/Enums#C.
+//  display_name C("C", 5)
 //  documentation ```java\nEnums.C("C", 5) /* ordinal 2 */\n```
 //^ reference semanticdb maven . . minimized/Enums#`<init>`().
   public String value;
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^ definition semanticdb maven . . minimized/Enums#value.
+//                    display_name value
 //                    documentation ```java\npublic String value\n```
 
   Enums(String value, int a) {
 //^^^^^ definition semanticdb maven . . minimized/Enums#`<init>`().
+//      display_name <init>
 //      documentation ```java\nprivate Enums(String value, int a)\n```
 //      ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //             ^^^^^ definition local 0
+//                   display_name value
 //                   documentation ```java\nString value\n```
 //                        ^ definition local 1
+//                          display_name a
 //                          documentation ```java\nint a\n```
     this.value = value;
 //       ^^^^^ reference semanticdb maven . . minimized/Enums#value.
@@ -49,16 +57,19 @@ enum Enums {
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Enums#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app()\n```
     String all = Arrays.stream(values()).map(e -> e.value).map(Enums::valueOf).collect(Collectors.toList()).toString();
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^^^ definition local 2
+//             display_name all
 //             documentation ```java\nString all\n```
 //               ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#stream().
 //                             ^^^^^^ reference semanticdb maven . . minimized/Enums#values().
 //                                       ^^^ reference semanticdb maven jdk 11 java/util/stream/Stream#map().
 //                                           ^ definition local 3
+//                                             display_name e
 //                                             documentation ```java\nEnums e\n```
 //                                                ^ reference local 3
 //                                                  ^^^^^ reference semanticdb maven . . minimized/Enums#value.
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
index ec614eeba..2b3f2b1fa 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
@@ -2,70 +2,89 @@
 
 public class Fields {
 //           ^^^^^^ definition semanticdb maven . . minimized/Fields#
+//                  display_name Fields
 //                  documentation ```java\npublic class Fields\n```
 //           ^^^^^^ definition semanticdb maven . . minimized/Fields#`<init>`().
+//                  display_name <init>
 //                  documentation ```java\npublic Fields()\n```
   private final int privateField = 0;
 //                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#privateField.
+//                               display_name privateField
 //                               documentation ```java\nprivate final int privateField\n```
   protected int protectedField = 0;
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#protectedField.
+//                             display_name protectedField
 //                             documentation ```java\nprotected int protectedField\n```
   public int publicField = 0;
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#publicField.
+//                       display_name publicField
 //                       documentation ```java\npublic int publicField\n```
   private static final int staticPrivateField = 0;
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticPrivateField.
+//                                            display_name staticPrivateField
 //                                            documentation ```java\nprivate static final int staticPrivateField\n```
   protected static int staticProtectedFields = 0;
 //                     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticProtectedFields.
+//                                           display_name staticProtectedFields
 //                                           documentation ```java\nprotected static int staticProtectedFields\n```
   public static int staticPublicField = 0;
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticPublicField.
+//                                    display_name staticPublicField
 //                                    documentation ```java\npublic static int staticPublicField\n```
 
   public class InnerFields {
 //             ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#
+//                         display_name InnerFields
 //                         documentation ```java\npublic class InnerFields\n```
 //             ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#`<init>`().
+//                         display_name <init>
 //                         documentation ```java\npublic InnerFields()\n```
     public int publicInnerField = publicField;
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#publicInnerField.
+//                              display_name publicInnerField
 //                              documentation ```java\npublic int publicInnerField\n```
 //                                ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#publicField.
   }
 
   public static class InnerStaticFields {
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#
+//                                      display_name InnerStaticFields
 //                                      documentation ```java\npublic static class InnerStaticFields\n```
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#`<init>`().
+//                                      display_name <init>
 //                                      documentation ```java\npublic InnerStaticFields()\n```
     public int publicNonStaticInnerField = 0;
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField.
+//                                       display_name publicNonStaticInnerField
 //                                       documentation ```java\npublic int publicNonStaticInnerField\n```
     public static int publicStaticInnerField = 0;
 //                    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField.
+//                                           display_name publicStaticInnerField
 //                                           documentation ```java\npublic static int publicStaticInnerField\n```
   }
 
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Fields#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app()\n```
     Fields fields = new Fields();
 //  ^^^^^^ reference semanticdb maven . . minimized/Fields#
 //         ^^^^^^ definition local 0
+//                display_name fields
 //                documentation ```java\nFields fields\n```
 //                      ^^^^^^ reference semanticdb maven . . minimized/Fields#`<init>`().
     InnerFields innerFields = fields.new InnerFields();
 //  ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#
 //              ^^^^^^^^^^^ definition local 1
+//                          display_name innerFields
 //                          documentation ```java\nInnerFields innerFields\n```
 //                            ^^^^^^ reference local 0
 //                                       ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#`<init>`().
     InnerStaticFields innerStaticFields = new InnerStaticFields();
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#
 //                    ^^^^^^^^^^^^^^^^^ definition local 2
+//                                      display_name innerStaticFields
 //                                      documentation ```java\nInnerStaticFields innerStaticFields\n```
 //                                            ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#`<init>`().
     return String.valueOf(fields.privateField)
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
index ab53228d8..a2eb0976d 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
@@ -11,27 +11,34 @@
 
 public class ForComprehensions {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ForComprehensions#
+//                             display_name ForComprehensions
 //                             documentation ```java\npublic class ForComprehensions\n```
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ForComprehensions#`<init>`().
+//                             display_name <init>
 //                             documentation ```java\npublic ForComprehensions()\n```
   public static int app(int n) {
 //                  ^^^ definition semanticdb maven . . minimized/ForComprehensions#app().
+//                      display_name app
 //                      documentation ```java\npublic static int app(int n)\n```
 //                          ^ definition local 0
+//                            display_name n
 //                            documentation ```java\nint n\n```
     List<Integer> integers = Collections.singletonList(n);
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                ^^^^^^^^ definition local 1
+//                         display_name integers
 //                         documentation ```java\nList<Integer> integers\n```
 //                           ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                       ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList().
 //                                                     ^ reference local 0
     int result = 0;
 //      ^^^^^^ definition local 2
+//             display_name result
 //             documentation ```java\nint result\n```
     for (int i : integers) {
 //           ^ definition local 3
+//             display_name i
 //             documentation ```java\nint i\n```
 //               ^^^^^^^^ reference local 1
       result += i;
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
index 994deb5b0..b14845ef1 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
@@ -2,28 +2,35 @@
 
 public class InnerClasses {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#
+//                        display_name InnerClasses
 //                        documentation ```java\npublic class InnerClasses\n```
 
   private final int exampleField;
 //                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#exampleField.
+//                               display_name exampleField
 //                               documentation ```java\nprivate final int exampleField\n```
 
   private static final String STRING = "asdf";
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^ definition semanticdb maven . . minimized/InnerClasses#STRING.
+//                                   display_name STRING
 //                                   documentation ```java\nprivate static final String STRING\n```
 
   private static final int top = 5;
 //                         ^^^ definition semanticdb maven . . minimized/InnerClasses#top.
+//                             display_name top
 //                             documentation ```java\nprivate static final int top\n```
   private static final int bottom = 10;
 //                         ^^^^^^ definition semanticdb maven . . minimized/InnerClasses#bottom.
+//                                display_name bottom
 //                                documentation ```java\nprivate static final int bottom\n```
 
   public InnerClasses(int exampleField) {
 //       ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#`<init>`().
+//                    display_name <init>
 //                    documentation ```java\npublic InnerClasses(int exampleField)\n```
 //                        ^^^^^^^^^^^^ definition local 0
+//                                     display_name exampleField
 //                                     documentation ```java\nint exampleField\n```
     this.exampleField = exampleField;
 //       ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#exampleField.
@@ -32,49 +39,61 @@ public InnerClasses(int exampleField) {
 
   public enum InnerEnum {
 //            ^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#
+//                      display_name InnerEnum
 //                      documentation ```java\npublic enum InnerEnum\n```
 //                      relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                      relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //                      relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
 //            ^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
+//                      display_name <init>
 //                      documentation ```java\nprivate InnerEnum()\n```
     A,
 //  ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#A.
+//    display_name A
 //    documentation ```java\nInnerEnum.A /* ordinal 0 */\n```
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
     B,
 //  ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#B.
+//    display_name B
 //    documentation ```java\nInnerEnum.B /* ordinal 1 */\n```
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
     C
 //  ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#C.
+//    display_name C
 //    documentation ```java\nInnerEnum.C /* ordinal 2 */\n```
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
   }
 
   public interface InnerInterface<A, B> {
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#
+//                                display_name InnerInterface
 //                                documentation ```java\npublic interface InnerInterface<A, B>\n```
 //                                ^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#[A]
+//                                  display_name A
 //                                  documentation ```java\nA\n```
 //                                   ^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#[B]
+//                                     display_name B
 //                                     documentation ```java\nB\n```
     B apply(A a);
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#[B]
 //    ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
+//          display_name apply
 //          documentation ```java\npublic abstract B apply(A a)\n```
 //          relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerClass#apply().
 //          ^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#[A]
 //            ^ definition local 1
+//              display_name a
 //              documentation ```java\nA a\n```
   }
 
   public @interface InnerAnnotation {
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation#
+//                                  display_name InnerAnnotation
 //                                  documentation ```java\npublic @interface InnerAnnotation\n```
 //                                  relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
     int value();
 //      ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation#value().
+//            display_name value
 //            documentation ```java\npublic abstract int value()\n```
   }
 
@@ -87,17 +106,21 @@ public interface InnerInterface<A, B> {
 //                       ^^^^^^ reference semanticdb maven . . minimized/InnerClasses#bottom.
   public static class InnerStaticClass {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#
+//                                     display_name InnerStaticClass
 //                                     documentation ```java\n@SuppressWarnings(STRING + " ")\n@InnerAnnotation(top / bottom)\npublic static class InnerStaticClass\n```
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#`<init>`().
+//                                     display_name <init>
 //                                     documentation ```java\npublic InnerStaticClass()\n```
 
     public static void innerStaticMethod() {}
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod().
+//                                       display_name innerStaticMethod
 //                                       documentation ```java\npublic static void innerStaticMethod()\n```
   }
 
   public class InnerClass implements InnerInterface<Integer, Integer> {
 //             ^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#
+//                        display_name InnerClass
 //                        documentation ```java\npublic class InnerClass\n```
 //                        relationship is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                   ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
@@ -105,12 +128,15 @@ public class InnerClass implements InnerInterface<Integer, Integer> {
 //                                                           ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
     private final int field;
 //                    ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#field.
+//                          display_name field
 //                          documentation ```java\nprivate final int field\n```
 
     public InnerClass(int field) {
 //         ^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#`<init>`().
+//                    display_name <init>
 //                    documentation ```java\npublic InnerClass(int field)\n```
 //                        ^^^^^ definition local 2
+//                              display_name field
 //                              documentation ```java\nint field\n```
       this.field = field;
 //         ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field.
@@ -119,6 +145,7 @@ public InnerClass(int field) {
 
     public void innerMethod() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#innerMethod().
+//                          display_name innerMethod
 //                          documentation ```java\npublic void innerMethod()\n```
       System.out.println(field + exampleField);
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
@@ -133,10 +160,12 @@ public void innerMethod() {
     public Integer apply(Integer integer) {
 //         ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                 ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#apply().
+//                       display_name apply
 //                       documentation ```java\n@Override\npublic Integer apply(Integer integer)\n```
 //                       relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //                       ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                               ^^^^^^^ definition local 3
+//                                       display_name integer
 //                                       documentation ```java\nInteger integer\n```
       return field * integer;
 //           ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field.
@@ -146,19 +175,24 @@ public Integer apply(Integer integer) {
 
   private static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a) {
 //                ^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
+//                  display_name A
 //                  documentation ```java\nA\n```
 //                   ^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
+//                     display_name B
 //                     documentation ```java\nB\n```
 //                      ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().
+//                                          display_name runInnerInterface
 //                                          documentation ```java\nprivate static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a)\n```
 //                                          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                                         ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
 //                                                            ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
 //                                                               ^^ definition local 4
+//                                                                  display_name fn
 //                                                                  documentation ```java\nInnerInterface<A, B> fn\n```
 //                                                                   ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
 //                                                                     ^ definition local 5
+//                                                                       display_name a
 //                                                                       documentation ```java\nA a\n```
     return fn.apply(a);
 //         ^^ reference local 4
@@ -168,9 +202,11 @@ private static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a) {
 
   public static void testEnum(InnerEnum magicEnum) {
 //                   ^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#testEnum().
+//                            display_name testEnum
 //                            documentation ```java\npublic static void testEnum(InnerEnum magicEnum)\n```
 //                            ^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#
 //                                      ^^^^^^^^^ definition local 6
+//                                                display_name magicEnum
 //                                                documentation ```java\nInnerEnum magicEnum\n```
     if (System.nanoTime() > System.currentTimeMillis()) {
 //      ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
@@ -223,12 +259,14 @@ public static void testEnum(InnerEnum magicEnum) {
 
   public static void testAnon() {
 //                   ^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#testAnon().
+//                            display_name testAnon
 //                            documentation ```java\npublic static void testAnon()\n```
     InnerInterface<String, String> fn =
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                 ^^ definition local 7
+//                                    display_name fn
 //                                    documentation ```java\nInnerInterface<String, String> fn\n```
         new InnerInterface<String, String>() {
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
@@ -239,10 +277,12 @@ public static void testAnon() {
           public String apply(String s) {
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                      ^^^^^ definition local 9
+//                            display_name apply
 //                            documentation ```java\n@Override\npublic String apply(String s)\n```
 //                            relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //                            ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                   ^ definition local 10
+//                                     display_name s
 //                                     documentation ```java\nString s\n```
             return s + "b";
 //                 ^ reference local 10
@@ -259,9 +299,11 @@ public String apply(String s) {
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/InnerClasses#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app()\n```
     int a = 42;
 //      ^ definition local 11
+//        display_name a
 //        documentation ```java\nint a\n```
     InnerStaticClass.innerStaticMethod();
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass#
@@ -269,12 +311,14 @@ public static String app() {
     InnerClasses innerClasses = new InnerClasses(a);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#
 //               ^^^^^^^^^^^^ definition local 12
+//                            display_name innerClasses
 //                            documentation ```java\nInnerClasses innerClasses\n```
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#`<init>`().
 //                                               ^ reference local 11
     InnerClass innerClass = innerClasses.new InnerClass(a);
 //  ^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#
 //             ^^^^^^^^^^ definition local 13
+//                        display_name innerClass
 //                        documentation ```java\nInnerClass innerClass\n```
 //                          ^^^^^^^^^^^^ reference local 12
 //                                           ^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#`<init>`().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
index ad8702517..5c823d8f2 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
@@ -2,20 +2,24 @@
 
 public interface Interfaces {
 //               ^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#
+//                          display_name Interfaces
 //                          documentation ```java\npublic interface Interfaces\n```
   static void staticInterfaceMethod() {}
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#staticInterfaceMethod().
+//                                  display_name staticInterfaceMethod
 //                                  documentation ```java\npublic static void staticInterfaceMethod()\n```
 
   String abstractInterfaceMethod();
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod().
+//                               display_name abstractInterfaceMethod
 //                               documentation ```java\npublic abstract String abstractInterfaceMethod()\n```
 //                               relationship is_reference is_implementation semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod().
 
   default String defaultInterfaceMethod() {
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#defaultInterfaceMethod().
+//                                      display_name defaultInterfaceMethod
 //                                      documentation ```java\npublic default String defaultInterfaceMethod()\n```
     return "default";
   }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
index 3d98efd24..8f3534a07 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
@@ -50,34 +50,46 @@
 //^^^^^ reference semanticdb maven . . lombok/
 //      ^^^^^^^ reference semanticdb maven . . lombok/Builder#
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#build(). 1:4
+//              display_name build
 //              documentation ```java\n@SuppressWarnings("all")\npublic Hello build()\n```
 //              definition semanticdb maven . . minimized/Hello#builder(). 1:6
+//              display_name builder
 //              documentation ```java\n@SuppressWarnings("all")\npublic static HelloBuilder builder()\n```
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#toString(). 1:7
+//              display_name toString
 //              documentation ```java\n@Override\n@SuppressWarnings("all")\npublic String toString()\n```
 //              relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder# 1:11
+//              display_name HelloBuilder
 //              documentation ```java\n@SuppressWarnings("all")\npublic static class HelloBuilder\n```
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#`<init>`(). 1:11
+//              display_name <init>
 //              documentation ```java\n@SuppressWarnings("all")\nHelloBuilder()\n```
 //              reference semanticdb maven . . minimized/Hello#HelloBuilder#`<init>`(). 1:11
 class Hello {
 //    ^^^^^ definition semanticdb maven . . minimized/Hello#
+//          display_name Hello
 //          documentation ```java\n@Builder\nclass Hello\n```
 //    ^^^^^ definition semanticdb maven . . minimized/Hello#`<init>`().
+//          display_name <init>
 //          documentation ```java\n@SuppressWarnings("all")\nHello(String message)\n```
 //    ^^^^^ reference semanticdb maven . . minimized/Hello#`<init>`().
 →private String message;
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^ definition local 0
+//                      display_name message
 //                      documentation ```java\nfinal String message\n```
 //              ^^^^^^^ definition local 1
+//                      display_name message
 //                      documentation ```java\nfinal String message\n```
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message().
+//                      display_name message
 //                      documentation ```java\n@SuppressWarnings("all")\npublic HelloBuilder message(String message)\n```
 //                      documentation @return {@code this}.
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message.
+//                      display_name message
 //                      documentation ```java\n@SuppressWarnings("all")\nprivate String message\n```
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#message.
+//                      display_name message
 //                      documentation ```java\nprivate String message\n```
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
index 748c63501..cc114b9e1 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
@@ -2,13 +2,17 @@
 
 public class Methods {
 //           ^^^^^^^ definition semanticdb maven . . minimized/Methods#
+//                   display_name Methods
 //                   documentation ```java\npublic class Methods\n```
 //           ^^^^^^^ definition semanticdb maven . . minimized/Methods#`<init>`().
+//                   display_name <init>
 //                   documentation ```java\npublic Methods()\n```
   private int overload(int value) {
 //            ^^^^^^^^ definition semanticdb maven . . minimized/Methods#overload().
+//                     display_name overload
 //                     documentation ```java\nprivate int overload(int value)\n```
 //                         ^^^^^ definition local 0
+//                               display_name value
 //                               documentation ```java\nint value\n```
     return value + 1;
 //         ^^^^^ reference local 0
@@ -17,9 +21,11 @@ private int overload(int value) {
   private String overload(String value) {
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^ definition semanticdb maven . . minimized/Methods#overload(+1).
+//                        display_name overload
 //                        documentation ```java\nprivate String overload(String value)\n```
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                               ^^^^^ definition local 1
+//                                     display_name value
 //                                     documentation ```java\nString value\n```
     return value + "1";
 //         ^^^^^ reference local 1
@@ -27,8 +33,10 @@ private String overload(String value) {
 
   private static int staticOverload(int value) {
 //                   ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Methods#staticOverload().
+//                                  display_name staticOverload
 //                                  documentation ```java\nprivate static int staticOverload(int value)\n```
 //                                      ^^^^^ definition local 2
+//                                            display_name value
 //                                            documentation ```java\nint value\n```
     return value + 1;
 //         ^^^^^ reference local 2
@@ -37,9 +45,11 @@ private static int staticOverload(int value) {
   private static String staticOverload(String value) {
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                      ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Methods#staticOverload(+1).
+//                                     display_name staticOverload
 //                                     documentation ```java\nprivate static String staticOverload(String value)\n```
 //                                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                            ^^^^^ definition local 3
+//                                                  display_name value
 //                                                  documentation ```java\nString value\n```
     return value + "1";
 //         ^^^^^ reference local 3
@@ -48,32 +58,39 @@ private static String staticOverload(String value) {
   public static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Methods#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException\n```
 //                             ^ definition local 4
+//                               display_name n
 //                               documentation ```java\nint n\n```
 //                                ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                       ^ definition local 5
+//                                         display_name m
 //                                         documentation ```java\nString m\n```
 //                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
     Methods methods = new Methods();
 //  ^^^^^^^ reference semanticdb maven . . minimized/Methods#
 //          ^^^^^^^ definition local 6
+//                  display_name methods
 //                  documentation ```java\nMethods methods\n```
 //                        ^^^^^^^ reference semanticdb maven . . minimized/Methods#`<init>`().
     int a = staticOverload(n);
 //      ^ definition local 7
+//        display_name a
 //        documentation ```java\nint a\n```
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload().
 //                         ^ reference local 4
     String b = staticOverload(m);
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^ definition local 8
+//           display_name b
 //           documentation ```java\nString b\n```
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload(+1).
 //                            ^ reference local 5
     int c = methods.overload(n);
 //      ^ definition local 9
+//        display_name c
 //        documentation ```java\nint c\n```
 //          ^^^^^^^ reference local 6
 //                  ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload().
@@ -81,6 +98,7 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
     String d = methods.overload(m);
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^ definition local 10
+//           display_name d
 //           documentation ```java\nString d\n```
 //             ^^^^^^^ reference local 6
 //                     ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload(+1).
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
index 43b44d838..335af3db2 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
@@ -6,14 +6,18 @@
 //                            ^^^^^^ reference semanticdb maven . . minimized/Annotations#format().
 public class MinimizedJavaMain {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#
+//                             display_name MinimizedJavaMain
 //                             documentation ```java\n@Annotations(value = "value", format = "format")\npublic class MinimizedJavaMain\n```
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#`<init>`().
+//                             display_name <init>
 //                             documentation ```java\npublic MinimizedJavaMain()\n```
   public static void main(String[] args) {
 //                   ^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#main().
+//                        display_name main
 //                        documentation ```java\npublic static void main(String[] args)\n```
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                 ^^^^ definition local 0
+//                                      display_name args
 //                                      documentation ```java\nString[] args\n```
     TypeVariables.app(new TypeVariables.CT());
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . minimized/TypeVariables#
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
index b4fb3d068..721c3ed7f 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
@@ -19,37 +19,47 @@
 
 public class ParameterizedTypes<A, B extends String> {
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#
+//                              display_name ParameterizedTypes
 //                              documentation ```java\npublic class ParameterizedTypes<A, B extends String>\n```
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#`<init>`().
+//                              display_name <init>
 //                              documentation ```java\npublic ParameterizedTypes()\n```
 //                              ^ definition semanticdb maven . . minimized/ParameterizedTypes#[A]
+//                                display_name A
 //                                documentation ```java\nA\n```
 //                                 ^ definition semanticdb maven . . minimized/ParameterizedTypes#[B]
+//                                   display_name B
 //                                   documentation ```java\nB extends String\n```
 //                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
   public <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list) {}
 //        ^ definition semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T]
+//          display_name T
 //          documentation ```java\nT extends Iterable<A> & Iterator<B>\n```
 //                  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                           ^ reference semanticdb maven . . minimized/ParameterizedTypes#[A]
 //                                ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                         ^ reference semanticdb maven . . minimized/ParameterizedTypes#[B]
 //                                                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#iteratorable().
+//                                                               display_name iteratorable
 //                                                               documentation ```java\npublic <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list)\n```
 //                                                               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                    ^ reference semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T]
 //                                                                       ^^^^ definition local 0
+//                                                                            display_name list
 //                                                                            documentation ```java\nList<T> list\n```
 
   public String app(A a, B b) {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^ definition semanticdb maven . . minimized/ParameterizedTypes#app().
+//                  display_name app
 //                  documentation ```java\npublic String app(A a, B b)\n```
 //                  ^ reference semanticdb maven . . minimized/ParameterizedTypes#[A]
 //                    ^ definition local 1
+//                      display_name a
 //                      documentation ```java\nA a\n```
 //                       ^ reference semanticdb maven . . minimized/ParameterizedTypes#[B]
 //                         ^ definition local 2
+//                           display_name b
 //                           documentation ```java\nB b\n```
     return a.toString() + b;
 //         ^ reference local 1
@@ -61,6 +71,7 @@ public String app(A a, B b) {
 //       ^^^ reference semanticdb maven jdk 11 java/util/Map#
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                ^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#doStuff().
+//                                        display_name doStuff
 //                                        documentation ```java\npublic Map<? extends String, ?> doStuff()\n```
 
   public Quadruplet<String, ?, Object, ? super Integer> createQuadruplet() { return null; }
@@ -69,19 +80,26 @@ public String app(A a, B b) {
 //                             ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                             ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                                                      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#createQuadruplet().
+//                                                                       display_name createQuadruplet
 //                                                                       documentation ```java\npublic Quadruplet<String, ?, Object, ? super Integer> createQuadruplet()\n```
 
   public static class Quadruplet<T, S, X, Y> {}
 //                    ^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#
+//                               display_name Quadruplet
 //                               documentation ```java\npublic static class Quadruplet<T, S, X, Y>\n```
 //                    ^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#`<init>`().
+//                               display_name <init>
 //                               documentation ```java\npublic Quadruplet()\n```
 //                               ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[T]
+//                                 display_name T
 //                                 documentation ```java\nT\n```
 //                                  ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[S]
+//                                    display_name S
 //                                    documentation ```java\nS\n```
 //                                     ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[X]
+//                                       display_name X
 //                                       documentation ```java\nX\n```
 //                                        ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[Y]
+//                                          display_name Y
 //                                          documentation ```java\nY\n```
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
index 0ac703605..b8cfa3ca0 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
@@ -7,55 +7,67 @@
 
 public class Primitives {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Primitives#
+//                      display_name Primitives
 //                      documentation ```java\npublic class Primitives\n```
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Primitives#`<init>`().
+//                      display_name <init>
 //                      documentation ```java\npublic Primitives()\n```
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Primitives#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app()\n```
     Random random = new Random();
 //  ^^^^^^ reference semanticdb maven jdk 11 java/util/Random#
 //         ^^^^^^ definition local 0
+//                display_name random
 //                documentation ```java\nRandom random\n```
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/Random#`<init>`().
     byte a = (byte) random.nextInt();
 //       ^ definition local 1
+//         display_name a
 //         documentation ```java\nbyte a\n```
 //                  ^^^^^^ reference local 0
 //                         ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     short b = (short) random.nextInt();
 //        ^ definition local 2
+//          display_name b
 //          documentation ```java\nshort b\n```
 //                    ^^^^^^ reference local 0
 //                           ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     int c = random.nextInt();
 //      ^ definition local 3
+//        display_name c
 //        documentation ```java\nint c\n```
 //          ^^^^^^ reference local 0
 //                 ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     long d = random.nextLong();
 //       ^ definition local 4
+//         display_name d
 //         documentation ```java\nlong d\n```
 //           ^^^^^^ reference local 0
 //                  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextLong().
     char e = (char) random.nextInt();
 //       ^ definition local 5
+//         display_name e
 //         documentation ```java\nchar e\n```
 //                  ^^^^^^ reference local 0
 //                         ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     float f = (float) random.nextDouble();
 //        ^ definition local 6
+//          display_name f
 //          documentation ```java\nfloat f\n```
 //                    ^^^^^^ reference local 0
 //                           ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble().
     double g = (double) random.nextDouble();
 //         ^ definition local 7
+//           display_name g
 //           documentation ```java\ndouble g\n```
 //                      ^^^^^^ reference local 0
 //                             ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble().
     boolean h = random.nextBoolean();
 //          ^ definition local 8
+//            display_name h
 //            documentation ```java\nboolean h\n```
 //              ^^^^^^ reference local 0
 //                     ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextBoolean().
@@ -72,5 +84,6 @@ public static String app() {
 
   public static void test() {}
 //                   ^^^^ definition semanticdb maven . . minimized/Primitives#test().
+//                        display_name test
 //                        documentation ```java\npublic static void test()\n```
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
index f35be4a76..1838c8991 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
@@ -13,12 +13,15 @@
 //^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 public class RawTypes {
 //           ^^^^^^^^ definition semanticdb maven . . minimized/RawTypes#
+//                    display_name RawTypes
 //                    documentation ```java\n@SuppressWarnings("ALL")\npublic class RawTypes\n```
 //           ^^^^^^^^ definition semanticdb maven . . minimized/RawTypes#`<init>`().
+//                    display_name <init>
 //                    documentation ```java\npublic RawTypes()\n```
   public static final List x = Collections.singletonList(42);
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                         ^ definition semanticdb maven . . minimized/RawTypes#x.
+//                           display_name x
 //                           documentation ```java\npublic static final List x\n```
 //                             ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                         ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
index da84467c0..a2e9d355d 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
@@ -2,10 +2,12 @@
 
 public class SubClasses extends AbstractClasses implements Interfaces {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#
+//                      display_name SubClasses
 //                      documentation ```java\npublic class SubClasses\n```
 //                      relationship is_implementation semanticdb maven . . minimized/AbstractClasses#
 //                      relationship is_implementation semanticdb maven . . minimized/Interfaces#
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#`<init>`().
+//                      display_name <init>
 //                      documentation ```java\npublic SubClasses()\n```
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AbstractClasses#
 //                                                         ^^^^^^^^^^ reference semanticdb maven . . minimized/Interfaces#
@@ -15,6 +17,7 @@ public class SubClasses extends AbstractClasses implements Interfaces {
   public String abstractImplementation() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#abstractImplementation().
+//                                     display_name abstractImplementation
 //                                     documentation ```java\n@Override\npublic String abstractImplementation()\n```
 //                                     relationship is_reference is_implementation semanticdb maven . . minimized/AbstractClasses#abstractImplementation().
     return "abstract";
@@ -25,6 +28,7 @@ public String abstractImplementation() {
   public String abstractInterfaceMethod() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod().
+//                                      display_name abstractInterfaceMethod
 //                                      documentation ```java\n@Override\npublic String abstractInterfaceMethod()\n```
 //                                      relationship is_reference is_implementation semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod().
     return "abstractInterface";
@@ -33,10 +37,12 @@ public String abstractInterfaceMethod() {
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/SubClasses#app().
+//                         display_name app
 //                         documentation ```java\npublic static String app()\n```
     SubClasses s = new SubClasses();
 //  ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#
 //             ^ definition local 0
+//               display_name s
 //               documentation ```java\nSubClasses s\n```
 //                     ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#`<init>`().
     return s.abstractImplementation()
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
index 8e623f7ef..ad6425159 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
@@ -2,25 +2,31 @@
 
 public class TabIndented {
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/TabIndented#
+//                       display_name TabIndented
 //                       documentation ```java\npublic class TabIndented\n```
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/TabIndented#`<init>`().
+//                       display_name <init>
 //                       documentation ```java\npublic TabIndented()\n```
 →public void app() {
 //           ^^^ definition semanticdb maven . . minimized/TabIndented#app().
+//               display_name app
 //               documentation ```java\npublic void app()\n```
 →→Object o = new Object() {
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //       ^ definition local 0
+//         display_name o
 //         documentation ```java\nObject o\n```
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 →→→@Override
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
 →→→public boolean equals(Object other) {
 //                ^^^^^^ definition local 2
+//                       display_name equals
 //                       documentation ```java\n@Override\npublic boolean equals(Object other)\n```
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                              ^^^^^ definition local 3
+//                                    display_name other
 //                                    documentation ```java\nObject other\n```
 →→→→return false;
 →→→}
@@ -29,6 +35,7 @@ public class TabIndented {
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
 →→→public int hashCode() {
 //            ^^^^^^^^ definition local 4
+//                     display_name hashCode
 //                     documentation ```java\n@Override\npublic int hashCode()\n```
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
 →→→→return System.identityHashCode(this);
@@ -41,6 +48,7 @@ public class TabIndented {
 →→→public String toString() {
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^ definition local 5
+//                        display_name toString
 //                        documentation ```java\n@Override\npublic String toString()\n```
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 →→→→return "";
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
index c123adeb8..626933cef 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
@@ -3,61 +3,76 @@
 /** Example from https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4 */
 public class TypeVariables {
 //           ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#
+//                         display_name TypeVariables
 //                         documentation ```java\npublic class TypeVariables\n```
 //                         documentation Example from https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4 
 //           ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#`<init>`().
+//                         display_name <init>
 //                         documentation ```java\npublic TypeVariables()\n```
   static class C {
 //             ^ definition semanticdb maven . . minimized/TypeVariables#C#
+//               display_name C
 //               documentation ```java\nstatic class C\n```
 //             ^ definition semanticdb maven . . minimized/TypeVariables#C#`<init>`().
+//               display_name <init>
 //               documentation ```java\nC()\n```
     public void mCPublic() {}
 //              ^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCPublic().
+//                       display_name mCPublic
 //                       documentation ```java\npublic void mCPublic()\n```
 
     protected void mCProtected() {}
 //                 ^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCProtected().
+//                             display_name mCProtected
 //                             documentation ```java\nprotected void mCProtected()\n```
 
     void mCPackage() {}
 //       ^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCPackage().
+//                 display_name mCPackage
 //                 documentation ```java\nvoid mCPackage()\n```
   }
 
   interface I {
 //          ^ definition semanticdb maven . . minimized/TypeVariables#I#
+//            display_name I
 //            documentation ```java\ninterface I\n```
     void mI();
 //       ^^ definition semanticdb maven . . minimized/TypeVariables#I#mI().
+//          display_name mI
 //          documentation ```java\npublic abstract void mI()\n```
 //          relationship is_reference is_implementation semanticdb maven . . minimized/TypeVariables#CT#mI().
   }
 
   static class CT extends C implements I {
 //             ^^ definition semanticdb maven . . minimized/TypeVariables#CT#
+//                display_name CT
 //                documentation ```java\nstatic class CT\n```
 //                relationship is_implementation semanticdb maven . . minimized/TypeVariables#C#
 //                relationship is_implementation semanticdb maven . . minimized/TypeVariables#I#
 //             ^^ definition semanticdb maven . . minimized/TypeVariables#CT#`<init>`().
+//                display_name <init>
 //                documentation ```java\nCT()\n```
 //                        ^ reference semanticdb maven . . minimized/TypeVariables#C#
 //                                     ^ reference semanticdb maven . . minimized/TypeVariables#I#
     public void mI() {}
 //              ^^ definition semanticdb maven . . minimized/TypeVariables#CT#mI().
+//                 display_name mI
 //                 documentation ```java\npublic void mI()\n```
 //                 relationship is_reference is_implementation semanticdb maven . . minimized/TypeVariables#I#mI().
   }
 
   public static <T extends C & I> void app(T t) {
 //               ^ definition semanticdb maven . . minimized/TypeVariables#app().[T]
+//                 display_name T
 //                 documentation ```java\nT extends C & I\n```
 //                         ^ reference semanticdb maven . . minimized/TypeVariables#C#
 //                             ^ reference semanticdb maven . . minimized/TypeVariables#I#
 //                                     ^^^ definition semanticdb maven . . minimized/TypeVariables#app().
+//                                         display_name app
 //                                         documentation ```java\npublic static <T extends C & I> void app(T t)\n```
 //                                         ^ reference semanticdb maven . . minimized/TypeVariables#app().[T]
 //                                           ^ definition local 0
+//                                             display_name t
 //                                             documentation ```java\nT t\n```
     t.mI();
 //  ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/ujson/AstTransformer.scala b/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
index b6b58dd0f..618fa39e4 100644
--- a/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
+++ b/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
@@ -11,8 +11,10 @@ import upickle.core.compat._
 
 trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
+//                   display_name AstTransformer
 //                   documentation ```scala\ntrait AstTransformer[I]\n```
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
+//                     display_name I
 //                     documentation ```scala\nI\n```
 //                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
@@ -21,8 +23,10 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
   def apply(t: Readable): I = t.transform(this)
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#apply().
+//          display_name apply
 //          documentation ```scala\ndef apply(t: Readable): I\n```
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#apply().(t)
+//            display_name t
 //            documentation ```scala\nt: Readable \n```
 //             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
@@ -31,19 +35,24 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 
   def transformArray[T](f: Visitor[_, T], items: Iterable[I]) = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().
+//                   display_name transformArray
 //                   documentation ```scala\ndef transformArray(f: Visitor[local0, T[, items: Iterable[I]): T\n```
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().[T]
+//                     display_name T
 //                     documentation ```scala\nT\n```
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(f)
+//                        display_name f
 //                        documentation ```scala\nf: Visitor[local0, T[ \n```
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().[T]
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
+//                                              display_name items
 //                                              documentation ```scala\nitems: Iterable[I] \n```
 //                                               ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Iterable#
 //                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
     val ctx = f.visitArray(items.size, -1).narrow
 //      ^^^ definition local 1
+//          display_name ctx
 //          documentation ```scala\nctx: ArrVisitor[Any, T] \n```
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(f)
 //              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
@@ -52,6 +61,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#narrow().
     for(item <- items) ctx.visitValue(transform(item, ctx.subVisitor), -1)
 //      ^^^^ definition local 2
+//           display_name item
 //           documentation ```scala\nitem: I \n```
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
 //                     ^^^ reference local 1
@@ -66,20 +76,25 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
   }
   def transformObject[T](f: Visitor[_, T], items: Iterable[(String, I)]) = {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().
+//                    display_name transformObject
 //                    documentation ```scala\ndef transformObject(f: Visitor[local3, T[, items: Iterable[(String, I)]): T\n```
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().[T]
+//                      display_name T
 //                      documentation ```scala\nT\n```
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(f)
+//                         display_name f
 //                         documentation ```scala\nf: Visitor[local3, T[ \n```
 //                          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().[T]
 //                                         ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
+//                                               display_name items
 //                                               documentation ```scala\nitems: Iterable[(String, I)] \n```
 //                                                ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Iterable#
 //                                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
     val ctx = f.visitObject(items.size, -1).narrow
 //      ^^^ definition local 4
+//          display_name ctx
 //          documentation ```scala\nctx: ObjVisitor[Any, T] \n```
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(f)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
@@ -88,10 +103,12 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                          ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#narrow().
     for(kv <- items) {
 //      ^^ definition local 5
+//         display_name kv
 //         documentation ```scala\nkv: (String, I) \n```
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
       val keyVisitor = ctx.visitKey(-1)
 //        ^^^^^^^^^^ definition local 6
+//                   display_name keyVisitor
 //                   documentation ```scala\nkeyVisitor: Visitor[local7, Any[ \n```
 //                     ^^^ reference local 4
 //                         ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
@@ -118,24 +135,31 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 
   class AstObjVisitor[T](build: T => I)
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#
+//                    display_name AstObjVisitor
 //                    documentation ```scala\nclass AstObjVisitor[T]\n```
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#[T]
+//                      display_name T
 //                      documentation ```scala\nT\n```
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().
+//                        display_name <init>
 //                        documentation ```scala\ndef this(build: (T) => I)(factory: Factory[(String, I), T])\n```
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
+//                             display_name build
 //                             documentation ```scala\nprivate[this] val build: (T) => I\n```
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(build)
 //                       _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(build)
+//                             display_name build
 //                             documentation ```scala\nbuild: (T) => I \n```
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
 //                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#[T]
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
                         (implicit factory: Factory[(String, I), T])extends ObjVisitor[I, I] {
 //                                ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
+//                                        display_name factory
 //                                        documentation ```scala\nprivate[this] implicit val factory: Factory[(String, I), T]\n```
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(factory)
 //                                _______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(factory)
+//                                        display_name factory
 //                                        documentation ```scala\nimplicit factory: Factory[(String, I), T] \n```
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/compat/package.Factory#
@@ -149,26 +173,32 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 
     private[this] var key: String = null
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
+//                        display_name key
 //                        documentation ```scala\nprivate[this] var key: String\n```
 //                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`key_=`().
+//                        display_name key_=
 //                        documentation ```scala\nprivate[this] var key_=(x$1: String): Unit\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
 //                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
     private[this] val vs = factory.newBuilder
 //                    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
+//                       display_name vs
 //                       documentation ```scala\nprivate[this] val vs: Builder[(String, I), T]\n```
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
 //                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/Factory#newBuilder().
     def subVisitor = AstTransformer.this
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#subVisitor().
+//                 display_name subVisitor
 //                 documentation ```scala\ndef subVisitor: AstTransformer[I]\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
     def visitKey(index: Int) = upickle.core.StringVisitor
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKey().
+//               display_name visitKey
 //               documentation ```scala\ndef visitKey(index: Int): StringVisitor\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKey().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^^^ reference semanticdb maven . . upickle/
@@ -176,9 +206,11 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                          ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/StringVisitor.
     def visitKeyValue(s: Any): Unit = key = s.toString
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKeyValue().
+//                    display_name visitKeyValue
 //                    documentation ```scala\ndef visitKeyValue(s: Any): Unit\n```
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKeyValue().(s)
+//                      display_name s
 //                      documentation ```scala\ns: Any \n```
 //                       ^^^ reference semanticdb maven . . scala/Any#
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -188,12 +220,15 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 
     def visitValue(v: I, index: Int): Unit = vs += (key -> v)
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().
+//                 display_name visitValue
 //                 documentation ```scala\ndef visitValue(v: I, index: Int): Unit\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().(v)
+//                   display_name v
 //                   documentation ```scala\nv: I \n```
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().(index)
+//                             display_name index
 //                             documentation ```scala\nindex: Int \n```
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -205,9 +240,11 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 
     def visitEnd(index: Int) = build(vs.result)
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitEnd().
+//               display_name visitEnd
 //               documentation ```scala\ndef visitEnd(index: Int): I\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitEnd().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
@@ -216,15 +253,20 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
   }
   class AstArrVisitor[T[_]](build: T[I] => I)
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#
+//                    display_name AstArrVisitor
 //                    documentation ```scala\nclass AstArrVisitor[T]\n```
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#[T]
+//                      display_name T
 //                      documentation ```scala\nT\n```
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().
+//                           display_name <init>
 //                           documentation ```scala\ndef this(build: (T[I]) => I)(factory: Factory[I, T[I]])\n```
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
+//                                display_name build
 //                                documentation ```scala\nprivate[this] val build: (T[I]) => I\n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(build)
 //                          _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(build)
+//                                display_name build
 //                                documentation ```scala\nbuild: (T[I]) => I \n```
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#[T]
@@ -232,9 +274,11 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
                            (implicit factory: Factory[I, T[I]]) extends ArrVisitor[I, I]{
 //                                   ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
+//                                           display_name factory
 //                                           documentation ```scala\nprivate[this] implicit val factory: Factory[I, T[I]]\n```
 //                                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(factory)
 //                                   _______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(factory)
+//                                           display_name factory
 //                                           documentation ```scala\nimplicit factory: Factory[I, T[I]] \n```
 //                                           relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/compat/package.Factory#
@@ -247,22 +291,27 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                                                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def subVisitor = AstTransformer.this
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#subVisitor().
+//                 display_name subVisitor
 //                 documentation ```scala\ndef subVisitor: AstTransformer[I]\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
     private[this] val vs = factory.newBuilder
 //                    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
+//                       display_name vs
 //                       documentation ```scala\nprivate[this] val vs: Builder[I, T[I]]\n```
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
 //                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/Factory#newBuilder().
     def visitValue(v: I, index: Int): Unit = vs += v
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().
+//                 display_name visitValue
 //                 documentation ```scala\ndef visitValue(v: I, index: Int): Unit\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().(v)
+//                   display_name v
 //                   documentation ```scala\nv: I \n```
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().(index)
+//                             display_name index
 //                             documentation ```scala\nindex: Int \n```
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -272,9 +321,11 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 
     def visitEnd(index: Int) = build(vs.result())
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitEnd().
+//               display_name visitEnd
 //               documentation ```scala\ndef visitEnd(index: Int): I\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitEnd().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
diff --git a/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala b/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
index 3378f4f62..8d962e625 100644
--- a/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
@@ -34,15 +34,20 @@ import upickle.core.{ObjArrVisitor, Visitor}
   */
 final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#
+//                          display_name ByteArrayParser
 //                          documentation ```scala\nfinal class ByteArrayParser[J]\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#[J]
+//                            display_name J
 //                            documentation ```scala\nJ\n```
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().
+//                              display_name <init>
 //                              documentation ```scala\ndef this(src: Array[Byte])\n```
 //                             ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
+//                                 display_name src
 //                                 documentation ```scala\nprivate[this] val src: Array[Byte]\n```
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().(src)
 //                             ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().(src)
+//                                 display_name src
 //                                 documentation ```scala\nsrc: Array[Byte] \n```
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
 //                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
@@ -53,33 +58,40 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 
   val srcLength = src.length
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
+//              display_name srcLength
 //              documentation ```scala\nval srcLength: Int\n```
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#length().
   protected[this] final def close() = {}
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
+//                                display_name close
 //                                documentation ```scala\nfinal def close(): Unit\n```
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 
   // Never grow the buffer since it's a directly using the original
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#growBuffer().
+//                        display_name growBuffer
 //                        documentation ```scala\ndef growBuffer(until: Int): Unit\n```
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#growBuffer().(until)
+//                              display_name until
 //                              documentation ```scala\nuntil: Int \n```
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 
   def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().
+//                       display_name readDataIntoBuffer
 //                       documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)\n```
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(buffer)
+//                              display_name buffer
 //                              documentation ```scala\nbuffer: Array[Byte] \n```
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(bufferOffset)
+//                                                         display_name bufferOffset
 //                                                         documentation ```scala\nbufferOffset: Int \n```
 //                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if(buffer == null) (src, srcLength == 0, srcLength)
@@ -96,6 +108,7 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 
 object ByteArrayParser extends Transformer[Array[Byte]]{
 //     ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.
+//                     display_name ByteArrayParser
 //                     documentation ```scala\nobject ByteArrayParser\n```
 //                             ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
@@ -103,15 +116,19 @@ object ByteArrayParser extends Transformer[Array[Byte]]{
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: Array[Byte], f: Visitor[_, T]) = new ByteArrayParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(j: Array[Byte], f: Visitor[local0, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(j)
+//                   display_name j
 //                   documentation ```scala\nj: Array[Byte] \n```
 //                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
 //                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(f)
+//                                   display_name f
 //                                   documentation ```scala\nf: Visitor[local0, T[ \n```
 //                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().[T]
diff --git a/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala b/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
index 739c0fac7..65fdaea37 100644
--- a/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
@@ -34,15 +34,20 @@ import java.nio.charset.StandardCharsets
  */
 final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#
+//                           display_name ByteBufferParser
 //                           documentation ```scala\nfinal class ByteBufferParser[J]\n```
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#[J]
+//                             display_name J
 //                             documentation ```scala\nJ\n```
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().
+//                               display_name <init>
 //                               documentation ```scala\ndef this(src: ByteBuffer)\n```
 //                              ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
+//                                  display_name src
 //                                  documentation ```scala\nprivate[this] val src: ByteBuffer\n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().(src)
 //                              ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().(src)
+//                                  display_name src
 //                                  documentation ```scala\nsrc: ByteBuffer \n```
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                   ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
@@ -51,11 +56,13 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#`<init>`().
   private[this] final val start = src.position()
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#start.
+//                              display_name start
 //                              documentation ```scala\nprivate[this] final val start: Int\n```
 //                                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                    ^^^^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#position().
   private[this] final val limit = src.limit() - start
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
+//                              display_name limit
 //                              documentation ```scala\nprivate[this] final val limit: Int\n```
 //                                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                    ^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#limit().
@@ -65,6 +72,7 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 
   protected[this] final def close() = { src.position(start) }
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#close().
+//                                display_name close
 //                                documentation ```scala\nfinal def close(): Unit\n```
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
@@ -72,21 +80,26 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                                                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#start.
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#growBuffer().
+//                        display_name growBuffer
 //                        documentation ```scala\ndef growBuffer(until: Int): Unit\n```
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#growBuffer().(until)
+//                              display_name until
 //                              documentation ```scala\nuntil: Int \n```
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().
+//                       display_name readDataIntoBuffer
 //                       documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)\n```
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(buffer)
+//                              display_name buffer
 //                              documentation ```scala\nbuffer: Array[Byte] \n```
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(bufferOffset)
+//                                                         display_name bufferOffset
 //                                                         documentation ```scala\nbufferOffset: Int \n```
 //                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
@@ -113,20 +126,25 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 
 object ByteBufferParser extends Transformer[ByteBuffer]{
 //     ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.
+//                      display_name ByteBufferParser
 //                      documentation ```scala\nobject ByteBufferParser\n```
 //                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                          ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: ByteBuffer, f: Visitor[_, T]) = new ByteBufferParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(j: ByteBuffer, f: Visitor[local0, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().(j)
+//                   display_name j
 //                   documentation ```scala\nj: ByteBuffer \n```
 //                    ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().(f)
+//                                  display_name f
 //                                  documentation ```scala\nf: Visitor[local0, T[ \n```
 //                                   ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().[T]
diff --git a/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala b/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
index 821327c7e..57826ccc4 100644
--- a/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
@@ -15,15 +15,20 @@ import upickle.core.{ObjArrVisitor, Visitor}
 private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharParser[J]{
 //      ^^^^^ reference semanticdb maven . . ujson/
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#
+//                                            display_name CharSequenceParser
 //                                            documentation ```scala\nprotected[ujson] final class CharSequenceParser[J]\n```
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#[J]
+//                                              display_name J
 //                                              documentation ```scala\nJ\n```
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().
+//                                                display_name <init>
 //                                                documentation ```scala\ndef this(cs: CharSequence)\n```
 //                                               ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
+//                                                  display_name cs
 //                                                  documentation ```scala\nprivate[this] val cs: CharSequence\n```
 //                                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().(cs)
 //                                               __ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().(cs)
+//                                                  display_name cs
 //                                                  documentation ```scala\ncs: CharSequence \n```
 //                                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
@@ -32,21 +37,26 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //                                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#`<init>`().
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#growBuffer().
+//                        display_name growBuffer
 //                        documentation ```scala\ndef growBuffer(until: Int): Unit\n```
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#growBuffer().(until)
+//                              display_name until
 //                              documentation ```scala\nuntil: Int \n```
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().
+//                       display_name readDataIntoBuffer
 //                       documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int): (Array[Char], Boolean, Int)\n```
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(buffer)
+//                              display_name buffer
 //                              documentation ```scala\nbuffer: Array[Char] \n```
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(bufferOffset)
+//                                                         display_name bufferOffset
 //                                                         documentation ```scala\nbufferOffset: Int \n```
 //                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if(buffer == null) (cs.toString.toCharArray, cs.length == 0, cs.length)
@@ -65,26 +75,32 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
   }
   final def close() = ()
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#close().
+//                display_name close
 //                documentation ```scala\nfinal def close(): Unit\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
 }
 
 object CharSequenceParser extends Transformer[CharSequence]{
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.
+//                        display_name CharSequenceParser
 //                        documentation ```scala\nobject CharSequenceParser\n```
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                            ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: CharSequence, f: Visitor[_, T]) = new CharSequenceParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(j: CharSequence, f: Visitor[local0, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().(j)
+//                   display_name j
 //                   documentation ```scala\nj: CharSequence \n```
 //                    ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().(f)
+//                                    display_name f
 //                                    documentation ```scala\nf: Visitor[local0, T[ \n```
 //                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().[T]
diff --git a/tests/snapshots/src/main/generated/ujson/Exceptions.scala b/tests/snapshots/src/main/generated/ujson/Exceptions.scala
index 7bf0c2a39..d00e48a4d 100644
--- a/tests/snapshots/src/main/generated/ujson/Exceptions.scala
+++ b/tests/snapshots/src/main/generated/ujson/Exceptions.scala
@@ -4,75 +4,91 @@ package ujson
 
 sealed trait ParsingFailedException extends Exception
 //           ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParsingFailedException#
+//                                  display_name ParsingFailedException
 //                                  documentation ```scala\nsealed trait ParsingFailedException\n```
 //                                          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
 
 case class ParseException(clue: String, index: Int)
 //         ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
+//                        display_name ParseException
 //                        documentation ```scala\ncase class ParseException(clue: String, index: Int) extends Exception with ParsingFailedException\n```
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#productElementName().
+//                        display_name productElementName
 //                        documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
+//                        display_name apply
 //                        documentation ```scala\ndef apply(clue: String, index: Int): ParseException\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.
+//                        display_name ParseException
 //                        documentation ```scala\nobject ParseException\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().
+//                        display_name copy
 //                        documentation ```scala\ndef copy(clue: String, index: Int): ParseException\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#productElement().
+//                        display_name productElement
 //                        documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().
+//                         display_name <init>
 //                         documentation ```scala\ndef this(clue: String, index: Int)\n```
 //                        ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
+//                             display_name clue
 //                             documentation ```scala\nval clue: String\n```
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
+//                             display_name clue
 //                             documentation ```scala\nclue: String \n```
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
+//                             display_name clue
 //                             documentation ```scala\nclue: String \n```
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
+//                             display_name clue
 //                             documentation ```scala\ndefault clue: String \n```
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
+//                                            display_name index
 //                                            documentation ```scala\nval index: Int\n```
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
+//                                            display_name index
 //                                            documentation ```scala\nindex: Int \n```
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
+//                                            display_name index
 //                                            documentation ```scala\nindex: Int \n```
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
+//                                            display_name index
 //                                            documentation ```scala\ndefault index: Int \n```
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
@@ -89,49 +105,60 @@ case class ParseException(clue: String, index: Int)
 
 case class IncompleteParseException(msg: String)
 //         ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
+//                                  display_name IncompleteParseException
 //                                  documentation ```scala\ncase class IncompleteParseException(msg: String) extends Exception with ParsingFailedException\n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#productElement().
+//                                  display_name productElement
 //                                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
+//                                  display_name apply
 //                                  documentation ```scala\ndef apply(msg: String): IncompleteParseException\n```
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().
+//                                  display_name copy
 //                                  documentation ```scala\ndef copy(msg: String): IncompleteParseException\n```
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#productElementName().
+//                                  display_name productElementName
 //                                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.
+//                                  display_name IncompleteParseException
 //                                  documentation ```scala\nobject IncompleteParseException\n```
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().
+//                                   display_name <init>
 //                                   documentation ```scala\ndef this(msg: String)\n```
 //                                  ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
+//                                      display_name msg
 //                                      documentation ```scala\nval msg: String\n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
+//                                      display_name msg
 //                                      documentation ```scala\nmsg: String \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
+//                                      display_name msg
 //                                      documentation ```scala\ndefault msg: String \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
+//                                      display_name msg
 //                                      documentation ```scala\nmsg: String \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
diff --git a/tests/snapshots/src/main/generated/ujson/IndexedValue.scala b/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
index c148642a7..e2f072d07 100644
--- a/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
+++ b/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
@@ -30,9 +30,11 @@ import upickle.core.{Visitor, ObjVisitor, ArrVisitor, Abort, AbortException}
   */
 sealed trait IndexedValue {
 //           ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
+//                        display_name IndexedValue
 //                        documentation ```scala\nsealed trait IndexedValue\n```
   def index: Int
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
+//          display_name index
 //          documentation ```scala\ndef index: Int\n```
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
@@ -47,6 +49,7 @@ sealed trait IndexedValue {
 
 object IndexedValue extends Transformer[IndexedValue]{
 //     ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
+//                  display_name IndexedValue
 //                  documentation ```scala\nobject IndexedValue\n```
 //                          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
@@ -54,71 +57,86 @@ object IndexedValue extends Transformer[IndexedValue]{
   
   case class Str(index: Int, value0: java.lang.CharSequence) extends IndexedValue
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
+//               display_name Str
 //               documentation ```scala\ncase class Str(index: Int, value0: CharSequence) extends IndexedValue\n```
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().
+//               display_name copy
 //               documentation ```scala\ndef copy(index: Int, value0: CharSequence): Str\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
+//               display_name apply
 //               documentation ```scala\ndef apply(index: Int, value0: CharSequence): Str\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
+//               display_name Str
 //               documentation ```scala\nobject Str\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#productElement().
+//               display_name productElement
 //               documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#productElementName().
+//               display_name productElementName
 //               documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().
+//                display_name <init>
 //                documentation ```scala\ndef this(index: Int, value0: CharSequence)\n```
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
+//                     display_name index
 //                     documentation ```scala\nval index: Int\n```
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
+//                     display_name index
 //                     documentation ```scala\ndefault index: Int \n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
+//                                  display_name value0
 //                                  documentation ```scala\nval value0: CharSequence\n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
+//                                  display_name value0
 //                                  documentation ```scala\nvalue0: CharSequence \n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
+//                                  display_name value0
 //                                  documentation ```scala\nvalue0: CharSequence \n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
+//                                  display_name value0
 //                                  documentation ```scala\ndefault value0: CharSequence \n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
@@ -130,52 +148,64 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                               ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class Obj(index: Int, value0: (java.lang.CharSequence, IndexedValue)*) extends IndexedValue
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
+//               display_name Obj
 //               documentation ```scala\ncase class Obj(index: Int, value0: (CharSequence, IndexedValue)*) extends IndexedValue\n```
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
+//               display_name apply
 //               documentation ```scala\ndef apply(index: Int, value0: (CharSequence, IndexedValue)*): Obj\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#productElement().
+//               display_name productElement
 //               documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
+//               display_name Obj
 //               documentation ```scala\nobject Obj\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#productElementName().
+//               display_name productElementName
 //               documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().
+//                display_name <init>
 //                documentation ```scala\ndef this(index: Int, value0: (CharSequence, IndexedValue)*)\n```
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
+//                     display_name index
 //                     documentation ```scala\nval index: Int\n```
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
+//                                  display_name value0
 //                                  documentation ```scala\nval value0: (CharSequence, IndexedValue)*\n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
+//                                  display_name value0
 //                                  documentation ```scala\nvalue0: (CharSequence, IndexedValue)* \n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
+//                                  display_name value0
 //                                  documentation ```scala\nvalue0: (CharSequence, IndexedValue)* \n```
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
@@ -187,52 +217,64 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                                                ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class Arr(index: Int, value: IndexedValue*) extends IndexedValue
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
+//               display_name Arr
 //               documentation ```scala\ncase class Arr(index: Int, value: IndexedValue*) extends IndexedValue\n```
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#productElementName().
+//               display_name productElementName
 //               documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#productElement().
+//               display_name productElement
 //               documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
+//               display_name Arr
 //               documentation ```scala\nobject Arr\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
+//               display_name apply
 //               documentation ```scala\ndef apply(index: Int, value: IndexedValue*): Arr\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().
+//                display_name <init>
 //                documentation ```scala\ndef this(index: Int, value: IndexedValue*)\n```
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
+//                     display_name index
 //                     documentation ```scala\nval index: Int\n```
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
+//                                 display_name value
 //                                 documentation ```scala\nval value: IndexedValue*\n```
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
 //                           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
+//                                 display_name value
 //                                 documentation ```scala\nvalue: IndexedValue* \n```
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
 //                           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
+//                                 display_name value
 //                                 documentation ```scala\nvalue: IndexedValue* \n```
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
@@ -241,113 +283,136 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class Num(index: Int, s: CharSequence, decIndex: Int, expIndex: Int) extends IndexedValue
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
+//               display_name Num
 //               documentation ```scala\ncase class Num(index: Int, s: CharSequence, decIndex: Int, expIndex: Int) extends IndexedValue\n```
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
+//               display_name Num
 //               documentation ```scala\nobject Num\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().
+//               display_name copy
 //               documentation ```scala\ndef copy(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#productElement().
+//               display_name productElement
 //               documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#productElementName().
+//               display_name productElementName
 //               documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
+//               display_name apply
 //               documentation ```scala\ndef apply(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function4#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().
+//                display_name <init>
 //                documentation ```scala\ndef this(index: Int, s: CharSequence, decIndex: Int, expIndex: Int)\n```
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
+//                     display_name index
 //                     documentation ```scala\nval index: Int\n```
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
+//                     display_name index
 //                     documentation ```scala\ndefault index: Int \n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
+//                             display_name s
 //                             documentation ```scala\nval s: CharSequence\n```
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
+//                             display_name s
 //                             documentation ```scala\ns: CharSequence \n```
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
+//                             display_name s
 //                             documentation ```scala\ns: CharSequence \n```
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
+//                             display_name s
 //                             documentation ```scala\ndefault s: CharSequence \n```
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
+//                                                     display_name decIndex
 //                                                     documentation ```scala\nval decIndex: Int\n```
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
+//                                                     display_name decIndex
 //                                                     documentation ```scala\ndefault decIndex: Int \n```
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
+//                                                     display_name decIndex
 //                                                     documentation ```scala\ndecIndex: Int \n```
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
+//                                                     display_name decIndex
 //                                                     documentation ```scala\ndecIndex: Int \n```
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                           ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
+//                                                                    display_name expIndex
 //                                                                    documentation ```scala\nval expIndex: Int\n```
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
+//                                                                    display_name expIndex
 //                                                                    documentation ```scala\nexpIndex: Int \n```
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
+//                                                                    display_name expIndex
 //                                                                    documentation ```scala\nexpIndex: Int \n```
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
+//                                                                    display_name expIndex
 //                                                                    documentation ```scala\ndefault expIndex: Int \n```
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
@@ -357,71 +422,86 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                                              ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class NumRaw(index: Int, d: Double) extends IndexedValue
 //           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
+//                  display_name NumRaw
 //                  documentation ```scala\ncase class NumRaw(index: Int, d: Double) extends IndexedValue\n```
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().
+//                  display_name copy
 //                  documentation ```scala\ndef copy(index: Int, d: Double): NumRaw\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
+//                  display_name NumRaw
 //                  documentation ```scala\nobject NumRaw\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#productElement().
+//                  display_name productElement
 //                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
+//                  display_name apply
 //                  documentation ```scala\ndef apply(index: Int, d: Double): NumRaw\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#productElementName().
+//                  display_name productElementName
 //                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().
+//                   display_name <init>
 //                   documentation ```scala\ndef this(index: Int, d: Double)\n```
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
+//                        display_name index
 //                        documentation ```scala\nval index: Int\n```
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
+//                        display_name index
 //                        documentation ```scala\nindex: Int \n```
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
+//                        display_name index
 //                        documentation ```scala\nindex: Int \n```
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
+//                        display_name index
 //                        documentation ```scala\ndefault index: Int \n```
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
+//                                display_name d
 //                                documentation ```scala\nval d: Double\n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
+//                                display_name d
 //                                documentation ```scala\ndefault d: Double \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
+//                                display_name d
 //                                documentation ```scala\nd: Double \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
+//                                display_name d
 //                                documentation ```scala\nd: Double \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
@@ -431,50 +511,61 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                             ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class False(index: Int) extends IndexedValue{
 //           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
+//                 display_name False
 //                 documentation ```scala\ncase class False(index: Int) extends IndexedValue\n```
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
+//                 display_name False
 //                 documentation ```scala\nobject False\n```
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#productElementName().
+//                 display_name productElementName
 //                 documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
+//                 display_name apply
 //                 documentation ```scala\ndef apply(index: Int): False\n```
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#productElement().
+//                 display_name productElement
 //                 documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().
+//                 display_name copy
 //                 documentation ```scala\ndef copy(index: Int): False\n```
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().
+//                  display_name <init>
 //                  documentation ```scala\ndef this(index: Int)\n```
 //                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
+//                       display_name index
 //                       documentation ```scala\nval index: Int\n```
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
+//                       display_name index
 //                       documentation ```scala\nindex: Int \n```
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
+//                       display_name index
 //                       documentation ```scala\ndefault index: Int \n```
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
+//                       display_name index
 //                       documentation ```scala\nindex: Int \n```
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
@@ -484,54 +575,66 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                 ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = false
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#value().
+//            display_name value
 //            documentation ```scala\ndef value: Boolean\n```
   }
   case class True(index: Int) extends IndexedValue{
 //           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
+//                display_name True
 //                documentation ```scala\ncase class True(index: Int) extends IndexedValue\n```
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#productElement().
+//                display_name productElement
 //                documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
+//                display_name True
 //                documentation ```scala\nobject True\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().
+//                display_name copy
 //                documentation ```scala\ndef copy(index: Int): True\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
+//                display_name apply
 //                documentation ```scala\ndef apply(index: Int): True\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#productElementName().
+//                display_name productElementName
 //                documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().
+//                 display_name <init>
 //                 documentation ```scala\ndef this(index: Int)\n```
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
+//                      display_name index
 //                      documentation ```scala\nval index: Int\n```
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
+//                      display_name index
 //                      documentation ```scala\nindex: Int \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
+//                      display_name index
 //                      documentation ```scala\nindex: Int \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
+//                      display_name index
 //                      documentation ```scala\ndefault index: Int \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
@@ -541,54 +644,66 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = true
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#value().
+//            display_name value
 //            documentation ```scala\ndef value: Boolean\n```
   }
   case class Null(index: Int) extends IndexedValue{
 //           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
+//                display_name Null
 //                documentation ```scala\ncase class Null(index: Int) extends IndexedValue\n```
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().
+//                display_name copy
 //                documentation ```scala\ndef copy(index: Int): Null\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#productElement().
+//                display_name productElement
 //                documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#productElementName().
+//                display_name productElementName
 //                documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
+//                display_name apply
 //                documentation ```scala\ndef apply(index: Int): Null\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
+//                display_name Null
 //                documentation ```scala\nobject Null\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().
+//                 display_name <init>
 //                 documentation ```scala\ndef this(index: Int)\n```
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
+//                      display_name index
 //                      documentation ```scala\nval index: Int\n```
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
+//                      display_name index
 //                      documentation ```scala\nindex: Int \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
+//                      display_name index
 //                      documentation ```scala\nindex: Int \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
+//                      display_name index
 //                      documentation ```scala\ndefault index: Int \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
@@ -598,19 +713,24 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = null
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#value().
+//            display_name value
 //            documentation ```scala\ndef value: Null\n```
   }
 
   def transform[T](j: IndexedValue, f: Visitor[_, T]): T = try{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(j: IndexedValue, f: Visitor[local16, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(j)
+//                   display_name j
 //                   documentation ```scala\nj: IndexedValue \n```
 //                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
+//                                    display_name f
 //                                    documentation ```scala\nf: Visitor[local16, T[ \n```
 //                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().[T]
@@ -621,6 +741,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //         ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                      ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                           ^ definition local 17
+//                             display_name i
 //                             documentation ```scala\ni: Int \n```
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
@@ -629,6 +750,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //         ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                      ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                           ^ definition local 18
+//                             display_name i
 //                             documentation ```scala\ni: Int \n```
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
@@ -637,6 +759,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //         ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                            ^ definition local 19
+//                              display_name i
 //                              documentation ```scala\ni: Int \n```
 //                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
@@ -645,8 +768,10 @@ object IndexedValue extends Transformer[IndexedValue]{
 //         ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //                          ^ definition local 20
+//                            display_name i
 //                            documentation ```scala\ni: Int \n```
 //                             ^ definition local 21
+//                               display_name s
 //                               documentation ```scala\ns: CharSequence \n```
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
@@ -656,12 +781,16 @@ object IndexedValue extends Transformer[IndexedValue]{
 //         ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //                          ^ definition local 22
+//                            display_name i
 //                            documentation ```scala\ni: Int \n```
 //                             ^ definition local 23
+//                               display_name s
 //                               documentation ```scala\ns: CharSequence \n```
 //                                ^ definition local 24
+//                                  display_name d
 //                                  documentation ```scala\nd: Int \n```
 //                                   ^ definition local 25
+//                                     display_name e
 //                                     documentation ```scala\ne: Int \n```
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                           ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
@@ -673,8 +802,10 @@ object IndexedValue extends Transformer[IndexedValue]{
 //         ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                             ^ definition local 26
+//                               display_name i
 //                               documentation ```scala\ni: Int \n```
 //                                ^ definition local 27
+//                                  display_name d
 //                                  documentation ```scala\nd: Double \n```
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
@@ -684,17 +815,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //         ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //                          ^ definition local 28
+//                            display_name i
 //                            documentation ```scala\ni: Int \n```
 //                             ^^^^^ definition local 29
+//                                   display_name items
 //                                   documentation ```scala\nitems: Seq[IndexedValue] \n```
         val ctx = f.visitArray(-1, -1).narrow
 //          ^^^ definition local 30
+//              display_name ctx
 //              documentation ```scala\nctx: ArrVisitor[Any, T] \n```
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                                     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#narrow().
         for(item <- items) try ctx.visitValue(transform(item, ctx.subVisitor), item.index) catch reject(item.index)
 //          ^^^^ definition local 31
+//               display_name item
 //               documentation ```scala\nitem: IndexedValue \n```
 //                  ^^^^^ reference local 29
 //                             ^^^ reference local 30
@@ -716,23 +851,29 @@ object IndexedValue extends Transformer[IndexedValue]{
 //         ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //                          ^ definition local 34
+//                            display_name i
 //                            documentation ```scala\ni: Int \n```
 //                             ^^^^^ definition local 35
+//                                   display_name items
 //                                   documentation ```scala\nitems: Seq[(CharSequence, IndexedValue)] \n```
         val ctx = f.visitObject(-1, -1).narrow
 //          ^^^ definition local 36
+//              display_name ctx
 //              documentation ```scala\nctx: ObjVisitor[Any, T] \n```
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                                      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#narrow().
         for((k, item) <- items) {
 //           ^ definition local 37
+//             display_name k
 //             documentation ```scala\nk: CharSequence \n```
 //              ^^^^ definition local 38
+//                   display_name item
 //                   documentation ```scala\nitem: IndexedValue \n```
 //                       ^^^^^ reference local 35
           val keyVisitor = try ctx.visitKey(i) catch reject(i)
 //            ^^^^^^^^^^ definition local 40
+//                       display_name keyVisitor
 //                       documentation ```scala\nkeyVisitor: Visitor[local41, Any[ \n```
 //                             ^^^ reference local 36
 //                                 ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
@@ -773,6 +914,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 
   object Builder extends JsVisitor[IndexedValue, IndexedValue]{
 //       ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
+//               display_name Builder
 //               documentation ```scala\nobject Builder\n```
 //                       ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
@@ -780,15 +922,19 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                            ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def visitArray(length: Int, i: Int) = new ArrVisitor[IndexedValue, IndexedValue.Arr] {
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().
+//                 display_name visitArray
 //                 documentation ```scala\ndef visitArray(length: Int, i: Int): { def subVisitor: Builder }\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(length)
+//                        display_name length
 //                        documentation ```scala\nlength: Int \n```
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(i)
+//                                display_name i
 //                                documentation ```scala\ni: Int \n```
 //                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^ definition local 49
+//                                              display_name $anon
 //                                              documentation ```scala\nfinal class $anon\n```
 //                                            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                       ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
@@ -797,6 +943,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                                       ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       val out = mutable.Buffer.empty[IndexedValue]
 //        ^^^ definition local 50
+//            display_name out
 //            documentation ```scala\nprivate val out: Buffer[IndexedValue]\n```
 //              ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer.
@@ -804,17 +951,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                   ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
       def subVisitor = Builder
 //        ^^^^^^^^^^ definition local 48
+//                   display_name subVisitor
 //                   documentation ```scala\ndef subVisitor: Builder\n```
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitValue(v: IndexedValue, index: Int): Unit = {
 //        ^^^^^^^^^^ definition local 51
+//                   display_name visitValue
 //                   documentation ```scala\ndef visitValue(v: IndexedValue, index: Int): Unit\n```
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                   ^ definition local 53
+//                     display_name v
 //                     documentation ```scala\nv: IndexedValue \n```
 //                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                    ^^^^^ definition local 54
+//                                          display_name index
 //                                          documentation ```scala\nindex: Int \n```
 //                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -825,9 +976,11 @@ object IndexedValue extends Transformer[IndexedValue]{
       }
       def visitEnd(index: Int): IndexedValue.Arr = IndexedValue.Arr(i, out.toSeq:_*)
 //        ^^^^^^^^ definition local 52
+//                 display_name visitEnd
 //                 documentation ```scala\ndef visitEnd(index: Int): Arr\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                 ^^^^^ definition local 55
+//                       display_name index
 //                       documentation ```scala\nindex: Int \n```
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -841,15 +994,19 @@ object IndexedValue extends Transformer[IndexedValue]{
 
     def visitObject(length: Int, i: Int) = new ObjVisitor[IndexedValue, IndexedValue.Obj] {
 //      ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().
+//                  display_name visitObject
 //                  documentation ```scala\ndef visitObject(length: Int, i: Int): { def subVisitor: Builder; def visitKey(index: Int): Builder }\n```
 //                  relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                  ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(length)
+//                         display_name length
 //                         documentation ```scala\nlength: Int \n```
 //                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(i)
+//                                 display_name i
 //                                 documentation ```scala\ni: Int \n```
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^ definition local 59
+//                                               display_name $anon
 //                                               documentation ```scala\nfinal class $anon\n```
 //                                             ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
@@ -858,6 +1015,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                                        ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       val out = mutable.Buffer.empty[(String, IndexedValue)]
 //        ^^^ definition local 60
+//            display_name out
 //            documentation ```scala\nprivate val out: Buffer[(String, IndexedValue)]\n```
 //              ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer.
@@ -866,27 +1024,33 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                            ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
       var currentKey: String = _
 //        ^^^^^^^^^^ definition local 61
+//                   display_name currentKey
 //                   documentation ```scala\nprivate var currentKey: String\n```
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
       def subVisitor = Builder
 //        ^^^^^^^^^^ definition local 56
+//                   display_name subVisitor
 //                   documentation ```scala\ndef subVisitor: Builder\n```
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitKey(index: Int) = IndexedValue.Builder
 //        ^^^^^^^^ definition local 57
+//                 display_name visitKey
 //                 documentation ```scala\ndef visitKey(index: Int): Builder\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                 ^^^^^ definition local 58
+//                       display_name index
 //                       documentation ```scala\nindex: Int \n```
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                               ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitKeyValue(s: Any): Unit = currentKey = s.asInstanceOf[IndexedValue.Str].value0.toString
 //        ^^^^^^^^^^^^^ definition local 63
+//                      display_name visitKeyValue
 //                      documentation ```scala\ndef visitKeyValue(s: Any): Unit\n```
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                      ^ definition local 67
+//                        display_name s
 //                        documentation ```scala\ns: Any \n```
 //                         ^^^ reference semanticdb maven . . scala/Any#
 //                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -899,12 +1063,15 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                                           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#toString().
       def visitValue(v: IndexedValue, index: Int): Unit = {
 //        ^^^^^^^^^^ definition local 64
+//                   display_name visitValue
 //                   documentation ```scala\ndef visitValue(v: IndexedValue, index: Int): Unit\n```
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                   ^ definition local 68
+//                     display_name v
 //                     documentation ```scala\nv: IndexedValue \n```
 //                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                    ^^^^^ definition local 69
+//                                          display_name index
 //                                          documentation ```scala\nindex: Int \n```
 //                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -916,9 +1083,11 @@ object IndexedValue extends Transformer[IndexedValue]{
       }
       def visitEnd(index: Int): IndexedValue.Obj = IndexedValue.Obj(i, out.toSeq:_*)
 //        ^^^^^^^^ definition local 65
+//                 display_name visitEnd
 //                 documentation ```scala\ndef visitEnd(index: Int): Obj\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                 ^^^^^ definition local 70
+//                       display_name index
 //                       documentation ```scala\nindex: Int \n```
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -932,9 +1101,11 @@ object IndexedValue extends Transformer[IndexedValue]{
 
     def visitNull(i: Int) = IndexedValue.Null(i)
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitNull().
+//                display_name visitNull
 //                documentation ```scala\ndef visitNull(i: Int): Null\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitNull().(i)
+//                  display_name i
 //                  documentation ```scala\ni: Int \n```
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                          ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -943,9 +1114,11 @@ object IndexedValue extends Transformer[IndexedValue]{
 
     def visitFalse(i: Int) = IndexedValue.False(i)
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFalse().
+//                 display_name visitFalse
 //                 documentation ```scala\ndef visitFalse(i: Int): False\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFalse().(i)
+//                   display_name i
 //                   documentation ```scala\ni: Int \n```
 //                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -954,9 +1127,11 @@ object IndexedValue extends Transformer[IndexedValue]{
 
     def visitTrue(i: Int) = IndexedValue.True(i)
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitTrue().
+//                display_name visitTrue
 //                documentation ```scala\ndef visitTrue(i: Int): True\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitTrue().(i)
+//                  display_name i
 //                  documentation ```scala\ni: Int \n```
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                          ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -965,18 +1140,23 @@ object IndexedValue extends Transformer[IndexedValue]{
 
     def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, i: Int) = IndexedValue.Num(i, s, decIndex, expIndex)
 //      ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().
+//                              display_name visitFloat64StringParts
 //                              documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, i: Int): Num\n```
 //                              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(s)
+//                                display_name s
 //                                documentation ```scala\ns: CharSequence \n```
 //                                 ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(decIndex)
+//                                                        display_name decIndex
 //                                                        documentation ```scala\ndecIndex: Int \n```
 //                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                              ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(expIndex)
+//                                                                       display_name expIndex
 //                                                                       documentation ```scala\nexpIndex: Int \n```
 //                                                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(i)
+//                                                                               display_name i
 //                                                                               documentation ```scala\ni: Int \n```
 //                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                                       ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -987,13 +1167,16 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                                                                        ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(expIndex)
     override def visitFloat64(d: Double, i: Int) = IndexedValue.NumRaw(i, d)
 //               ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().
+//                            display_name visitFloat64
 //                            documentation ```scala\ndef visitFloat64(d: Double, i: Int): NumRaw\n```
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(d)
+//                              display_name d
 //                              documentation ```scala\nd: Double \n```
 //                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(i)
+//                                         display_name i
 //                                         documentation ```scala\ni: Int \n```
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -1003,12 +1186,15 @@ object IndexedValue extends Transformer[IndexedValue]{
 
     def visitString(s: CharSequence, i: Int) = IndexedValue.Str(i, s)
 //      ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().
+//                  display_name visitString
 //                  documentation ```scala\ndef visitString(s: CharSequence, i: Int): Str\n```
 //                  relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().(s)
+//                    display_name s
 //                    documentation ```scala\ns: CharSequence \n```
 //                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().(i)
+//                                     display_name i
 //                                     documentation ```scala\ni: Int \n```
 //                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
diff --git a/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala b/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
index 255d6b9f9..f20e8a786 100644
--- a/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
@@ -30,16 +30,21 @@ import upickle.core.{BufferingInputStreamParser, ObjArrVisitor, Visitor}
   */
 final class InputStreamParser[J](val inputStream: java.io.InputStream,
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#
+//                            display_name InputStreamParser
 //                            documentation ```scala\nfinal class InputStreamParser[J]\n```
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#[J]
+//                              display_name J
 //                              documentation ```scala\nJ\n```
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().
+//                                display_name <init>
 //                                documentation ```scala\ndef this(inputStream: InputStream, minBufferStartSize: Int, maxBufferStartSize: Int)\n```
 //                                   ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#inputStream.
+//                                               display_name inputStream
 //                                               documentation ```scala\nval inputStream: InputStream\n```
 //                                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(inputStream)
 //                                               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#inputStream().
 //                                   ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(inputStream)
+//                                               display_name inputStream
 //                                               documentation ```scala\ninputStream: InputStream \n```
 //                                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#inputStream.
 //                                                ^^^^ reference semanticdb maven . . java/
@@ -47,10 +52,12 @@ final class InputStreamParser[J](val inputStream: java.io.InputStream,
 //                                                        ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/InputStream#
                                  val minBufferStartSize: Int = BufferingInputStreamParser.defaultMinBufferStartSize,
 //                                   ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#minBufferStartSize.
+//                                                      display_name minBufferStartSize
 //                                                      documentation ```scala\nval minBufferStartSize: Int\n```
 //                                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(minBufferStartSize)
 //                                                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#minBufferStartSize().
 //                                   __________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(minBufferStartSize)
+//                                                      display_name minBufferStartSize
 //                                                      documentation ```scala\ndefault minBufferStartSize: Int \n```
 //                                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#minBufferStartSize.
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
@@ -58,10 +65,12 @@ final class InputStreamParser[J](val inputStream: java.io.InputStream,
 //                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser.defaultMinBufferStartSize.
                                  val maxBufferStartSize: Int = BufferingInputStreamParser.defaultMaxBufferStartSize)
 //                                   ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#maxBufferStartSize.
+//                                                      display_name maxBufferStartSize
 //                                                      documentation ```scala\nval maxBufferStartSize: Int\n```
 //                                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(maxBufferStartSize)
 //                                                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#maxBufferStartSize().
 //                                   __________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(maxBufferStartSize)
+//                                                      display_name maxBufferStartSize
 //                                                      documentation ```scala\ndefault maxBufferStartSize: Int \n```
 //                                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#maxBufferStartSize.
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
@@ -76,12 +85,14 @@ extends ByteParser[J] with upickle.core.BufferingInputStreamParser{
 //                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#
   protected[this] final def close() = {}
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#close().
+//                                display_name close
 //                                documentation ```scala\nfinal def close(): Unit\n```
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 }
 
 object InputStreamParser extends Transformer[java.io.InputStream]{
 //     ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.
+//                       display_name InputStreamParser
 //                       documentation ```scala\nobject InputStreamParser\n```
 //                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                           ^^^^ reference semanticdb maven . . java/
@@ -90,21 +101,26 @@ object InputStreamParser extends Transformer[java.io.InputStream]{
 //                                                               ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: java.io.InputStream, f: Visitor[_, T]) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(j: InputStream, f: Visitor[local0, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().(j)
+//                   display_name j
 //                   documentation ```scala\nj: InputStream \n```
 //                    ^^^^ reference semanticdb maven . . java/
 //                         ^^ reference semanticdb maven . . java/io/
 //                            ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/InputStream#
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().(f)
+//                                           display_name f
 //                                           documentation ```scala\nf: Visitor[local0, T[ \n```
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
     val p = new InputStreamParser[T](j)
 //      ^ definition local 1
+//        display_name p
 //        documentation ```scala\np: InputStreamParser[T] \n```
 //              ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
diff --git a/tests/snapshots/src/main/generated/ujson/JsVisitor.scala b/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
index 56b4b952d..a49451f27 100644
--- a/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
+++ b/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
@@ -15,16 +15,20 @@ import upickle.core.{ArrVisitor, ObjVisitor, Visitor}
   */
 trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
+//              display_name JsVisitor
 //              documentation ```scala\ntrait JsVisitor[T, J]\n```
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[T]
+//                 display_name T
 //                 documentation ```scala\nT\n```
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
+//                     display_name J
 //                     documentation ```scala\nJ\n```
 //                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[T]
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
   def visitFloat64(d: Double, index: Int): J = {
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
+//                 display_name visitFloat64
 //                 documentation ```scala\ndef visitFloat64(d: Double, index: Int): J\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().
@@ -32,14 +36,17 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
+//                   display_name d
 //                   documentation ```scala\nd: Double \n```
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(index)
+//                                  display_name index
 //                                  documentation ```scala\nindex: Int \n```
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val i = d.toLong
 //      ^ definition local 0
+//        display_name i
 //        documentation ```scala\ni: Long \n```
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
 //            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toLong().
@@ -61,12 +68,15 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 
   def visitFloat32(d: Float, index: Int): J = visitFloat64(d, index)
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().
+//                 display_name visitFloat32
 //                 documentation ```scala\ndef visitFloat32(d: Float, index: Int): J\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat32().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(d)
+//                   display_name d
 //                   documentation ```scala\nd: Float \n```
 //                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Float#
 //                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(index)
+//                                 display_name index
 //                                 documentation ```scala\nindex: Int \n```
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
@@ -75,12 +85,15 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                                                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(index)
   def visitInt32(i: Int, index: Int): J = visitFloat64(i, index)
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().
+//               display_name visitInt32
 //               documentation ```scala\ndef visitInt32(i: Int, index: Int): J\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitInt32().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(i)
+//                 display_name i
 //                 documentation ```scala\ni: Int \n```
 //                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(index)
+//                             display_name index
 //                             documentation ```scala\nindex: Int \n```
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
@@ -89,12 +102,15 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(index)
   def visitInt64(i: Long, index: Int): J = {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().
+//               display_name visitInt64
 //               documentation ```scala\ndef visitInt64(i: Long, index: Int): J\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitInt64().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
+//                 display_name i
 //                 documentation ```scala\ni: Long \n```
 //                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(index)
+//                              display_name index
 //                              documentation ```scala\nindex: Int \n```
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
@@ -119,12 +135,15 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   }
   def visitUInt64(i: Long, index: Int): J = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().
+//                display_name visitUInt64
 //                documentation ```scala\ndef visitUInt64(i: Long, index: Int): J\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitUInt64().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(i)
+//                  display_name i
 //                  documentation ```scala\ni: Long \n```
 //                   ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
 //                         ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(index)
+//                               display_name index
 //                               documentation ```scala\nindex: Int \n```
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
@@ -151,12 +170,15 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 
   def visitFloat64String(s: String, index: Int): J = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().
+//                       display_name visitFloat64String
 //                       documentation ```scala\ndef visitFloat64String(s: String, index: Int): J\n```
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64String().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().(s)
+//                         display_name s
 //                         documentation ```scala\ns: String \n```
 //                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().(index)
+//                                        display_name index
 //                                        documentation ```scala\nindex: Int \n```
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
@@ -175,6 +197,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                   ^^^^^^^ reference semanticdb maven jdk 11 java/lang/String#indexOf().
         case n => n
 //           ^ definition local 1
+//             display_name n
 //             documentation ```scala\nn: Int \n```
 //                ^ reference local 1
       },
@@ -184,30 +207,37 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 
   def visitBinary(bytes: Array[Byte], offset: Int, len: Int, index: Int): J = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().
+//                display_name visitBinary
 //                documentation ```scala\ndef visitBinary(bytes: Array[Byte], offset: Int, len: Int, index: Int): J\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitBinary().
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(bytes)
+//                      display_name bytes
 //                      documentation ```scala\nbytes: Array[Byte] \n```
 //                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(offset)
+//                                           display_name offset
 //                                           documentation ```scala\noffset: Int \n```
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
+//                                                     display_name len
 //                                                     documentation ```scala\nlen: Int \n```
 //                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
+//                                                                 display_name index
 //                                                                 documentation ```scala\nindex: Int \n```
 //                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val arr = visitArray(len, index)
 //      ^^^ definition local 2
+//          display_name arr
 //          documentation ```scala\narr: ArrVisitor[T, J] \n```
 //            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
     var i = 0
 //      ^ definition local 3
+//        display_name i
 //        documentation ```scala\ni: Int \n```
     while (i < len){
 //         ^ reference local 3
@@ -239,14 +269,18 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 
   def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int): J = visitFloat64StringParts(s, decIndex, expIndex, -1)
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().
+//                            display_name visitFloat64StringParts
 //                            documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int): J\n```
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(s)
+//                              display_name s
 //                              documentation ```scala\ns: CharSequence \n```
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(decIndex)
+//                                                      display_name decIndex
 //                                                      documentation ```scala\ndecIndex: Int \n```
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(expIndex)
+//                                                                     display_name expIndex
 //                                                                     documentation ```scala\nexpIndex: Int \n```
 //                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
@@ -257,27 +291,34 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 
   def visitExt(tag: Byte, bytes: Array[Byte], offset: Int, len: Int, index: Int): J = {
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().
+//             display_name visitExt
 //             documentation ```scala\ndef visitExt(tag: Byte, bytes: Array[Byte], offset: Int, len: Int, index: Int): J\n```
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitExt().
 //             ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(tag)
+//                 display_name tag
 //                 documentation ```scala\ntag: Byte \n```
 //                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(bytes)
+//                              display_name bytes
 //                              documentation ```scala\nbytes: Array[Byte] \n```
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(offset)
+//                                                   display_name offset
 //                                                   documentation ```scala\noffset: Int \n```
 //                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(len)
+//                                                             display_name len
 //                                                             documentation ```scala\nlen: Int \n```
 //                                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                   ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(index)
+//                                                                         display_name index
 //                                                                         documentation ```scala\nindex: Int \n```
 //                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val arr = visitArray(-1, index)
 //      ^^^ definition local 5
+//          display_name arr
 //          documentation ```scala\narr: ArrVisitor[T, J] \n```
 //            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(index)
@@ -306,12 +347,15 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 
   def visitChar(s: Char, index: Int) = visitString(s.toString, index)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().
+//              display_name visitChar
 //              documentation ```scala\ndef visitChar(s: Char, index: Int): J\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitChar().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(s)
+//                display_name s
 //                documentation ```scala\ns: Char \n```
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(index)
+//                             display_name index
 //                             documentation ```scala\nindex: Int \n```
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
diff --git a/tests/snapshots/src/main/generated/ujson/Readable.scala b/tests/snapshots/src/main/generated/ujson/Readable.scala
index 74b4d4b59..47be075a7 100644
--- a/tests/snapshots/src/main/generated/ujson/Readable.scala
+++ b/tests/snapshots/src/main/generated/ujson/Readable.scala
@@ -18,15 +18,19 @@ import upickle.core.{Visitor, ObjArrVisitor}
 //                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 trait Readable {
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
+//             display_name Readable
 //             documentation ```scala\ntrait Readable\n```
   def transform[T](f: Visitor[_, T]): T
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(f: Visitor[local0, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().(f)
+//                   display_name f
 //                   documentation ```scala\nf: Visitor[local0, T[ \n```
 //                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().[T]
@@ -35,76 +39,93 @@ trait Readable {
 
 object Readable extends ReadableLowPri{
 //     ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.
+//              display_name Readable
 //              documentation ```scala\nobject Readable\n```
 //                      ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#
 //                                    ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class fromTransformer[T](t: T, w: Transformer[T]) extends Readable{
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
+//                           display_name fromTransformer
 //                           documentation ```scala\ncase class fromTransformer(t: T, w: Transformer[T])[T] extends Readable\n```
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().
+//                           display_name copy
 //                           documentation ```scala\ndef copy(t: T, w: Transformer[T]): fromTransformer[T]\n```
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#productElement().
+//                           display_name productElement
 //                           documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
+//                           display_name apply
 //                           documentation ```scala\ndef apply(t: T, w: Transformer[T]): fromTransformer[T]\n```
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.
+//                           display_name fromTransformer
 //                           documentation ```scala\nobject fromTransformer\n```
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#productElementName().
+//                           display_name productElementName
 //                           documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#[T]
+//                             display_name T
 //                             documentation ```scala\nT\n```
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().
+//                               display_name <init>
 //                               documentation ```scala\ndef this(t: T, w: Transformer[T])\n```
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
+//                                display_name t
 //                                documentation ```scala\nval t: T\n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
+//                                display_name t
 //                                documentation ```scala\ndefault t: T \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
+//                                display_name t
 //                                documentation ```scala\nt: T \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
+//                                display_name t
 //                                documentation ```scala\nt: T \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#[T]
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
+//                                      display_name w
 //                                      documentation ```scala\nval w: Transformer[T]\n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
+//                                      display_name w
 //                                      documentation ```scala\ndefault w: Transformer[T] \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
+//                                      display_name w
 //                                      documentation ```scala\nw: Transformer[T] \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
+//                                      display_name w
 //                                      documentation ```scala\nw: Transformer[T] \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
@@ -115,11 +136,14 @@ object Readable extends ReadableLowPri{
 //                                                                       ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def transform[T](f: Visitor[_, T]): T = {
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().
+//                display_name transform
 //                documentation ```scala\ndef transform(f: Visitor[local1, T[): T\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().[T]
+//                  display_name T
 //                  documentation ```scala\nT\n```
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().(f)
+//                     display_name f
 //                     documentation ```scala\nf: Visitor[local1, T[ \n```
 //                      ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().[T]
@@ -133,8 +157,10 @@ object Readable extends ReadableLowPri{
   }
   implicit def fromString(s: String): fromTransformer[String] = new fromTransformer(s, StringParser)
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromString().
+//                        display_name fromString
 //                        documentation ```scala\nimplicit def fromString(s: String): fromTransformer[String]\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromString().(s)
+//                          display_name s
 //                          documentation ```scala\ns: String \n```
 //                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
@@ -145,8 +171,10 @@ object Readable extends ReadableLowPri{
 //                                                                                     ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.
   implicit def fromCharSequence(s: CharSequence): fromTransformer[CharSequence] = new fromTransformer(s, CharSequenceParser)
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromCharSequence().
+//                              display_name fromCharSequence
 //                              documentation ```scala\nimplicit def fromCharSequence(s: CharSequence): fromTransformer[CharSequence]\n```
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromCharSequence().(s)
+//                                display_name s
 //                                documentation ```scala\ns: CharSequence \n```
 //                                 ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
@@ -157,8 +185,10 @@ object Readable extends ReadableLowPri{
 //                                                                                                       ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.
   implicit def fromPath(s: java.nio.file.Path): Readable = new Readable {
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromPath().
+//                      display_name fromPath
 //                      documentation ```scala\nimplicit def fromPath(s: Path): Readable\n```
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromPath().(s)
+//                        display_name s
 //                        documentation ```scala\ns: Path \n```
 //                         ^^^^ reference semanticdb maven . . java/
 //                              ^^^ reference semanticdb maven . . java/nio/
@@ -166,21 +196,26 @@ object Readable extends ReadableLowPri{
 //                                       ^^^^ reference semanticdb maven jdk 11 java/nio/file/Path#
 //                                              ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                             ^ definition local 3
+//                                                               display_name $anon
 //                                                               documentation ```scala\nfinal class $anon\n```
 //                                                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     override def transform[T](f: Visitor[_, T]) = {
 //               ^^^^^^^^^ definition local 4
+//                         display_name transform
 //                         documentation ```scala\ndef transform(f: Visitor[local7, local6[): local6\n```
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                         ^ definition local 6
+//                           display_name T
 //                           documentation ```scala\nT\n```
 //                            ^ definition local 5
+//                              display_name f
 //                              documentation ```scala\nf: Visitor[local7, local6[ \n```
 //                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                          ^ reference local 6
       val inputStream = java.nio.file.Files.newInputStream(s)
 //        ^^^^^^^^^^^ definition local 8
+//                    display_name inputStream
 //                    documentation ```scala\ninputStream: InputStream \n```
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^^ reference semanticdb maven . . java/nio/
@@ -200,8 +235,10 @@ object Readable extends ReadableLowPri{
   }
   implicit def fromFile(s: java.io.File): Readable = fromPath(s.toPath)
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromFile().
+//                      display_name fromFile
 //                      documentation ```scala\nimplicit def fromFile(s: File): Readable\n```
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromFile().(s)
+//                        display_name s
 //                        documentation ```scala\ns: File \n```
 //                         ^^^^ reference semanticdb maven . . java/
 //                              ^^ reference semanticdb maven . . java/io/
@@ -212,8 +249,10 @@ object Readable extends ReadableLowPri{
 //                                                              ^^^^^^ reference semanticdb maven jdk 11 java/io/File#toPath().
   implicit def fromByteBuffer(s: ByteBuffer): fromTransformer[ByteBuffer] = new fromTransformer(s, ByteBufferParser)
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteBuffer().
+//                            display_name fromByteBuffer
 //                            documentation ```scala\nimplicit def fromByteBuffer(s: ByteBuffer): fromTransformer[ByteBuffer]\n```
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteBuffer().(s)
+//                              display_name s
 //                              documentation ```scala\ns: ByteBuffer \n```
 //                               ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
@@ -224,8 +263,10 @@ object Readable extends ReadableLowPri{
 //                                                                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.
   implicit def fromByteArray(s: Array[Byte]): fromTransformer[Array[Byte]] = new fromTransformer(s, ByteArrayParser)
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteArray().
+//                           display_name fromByteArray
 //                           documentation ```scala\nimplicit def fromByteArray(s: Array[Byte]): fromTransformer[Array[Byte]]\n```
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteArray().(s)
+//                             display_name s
 //                             documentation ```scala\ns: Array[Byte] \n```
 //                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
@@ -240,32 +281,41 @@ object Readable extends ReadableLowPri{
 
 trait ReadableLowPri{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#
+//                   display_name ReadableLowPri
 //                   documentation ```scala\ntrait ReadableLowPri\n```
   implicit def fromReadable[T](s: T)(implicit conv: T => geny.Readable): Readable = new Readable{
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().
+//                          display_name fromReadable
 //                          documentation ```scala\nimplicit def fromReadable(s: T)(conv: (T) => Readable): Readable\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
+//                            display_name T
 //                            documentation ```scala\nT\n```
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().(s)
+//                               display_name s
 //                               documentation ```scala\ns: T \n```
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
 //                                            ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().(conv)
+//                                                 display_name conv
 //                                                 documentation ```scala\nimplicit conv: (T) => Readable \n```
 //                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
 //                                                       ^^^^ reference semanticdb maven . . geny/
 //                                                            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Readable#
 //                                                                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                                                      ^ definition local 9
+//                                                                                        display_name $anon
 //                                                                                        documentation ```scala\nfinal class $anon\n```
 //                                                                                      ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                                                              ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def transform[T](f: Visitor[_, T]): T = conv(s).readBytesThrough(InputStreamParser.transform(_, f))
 //      ^^^^^^^^^ definition local 10
+//                display_name transform
 //                documentation ```scala\ndef transform(f: Visitor[local13, local12[): local12\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                ^ definition local 12
+//                  display_name T
 //                  documentation ```scala\nT\n```
 //                   ^ definition local 11
+//                     display_name f
 //                     documentation ```scala\nf: Visitor[local13, local12[ \n```
 //                      ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                 ^ reference local 12
diff --git a/tests/snapshots/src/main/generated/ujson/Renderer.scala b/tests/snapshots/src/main/generated/ujson/Renderer.scala
index f2826bcc7..54b97fed8 100644
--- a/tests/snapshots/src/main/generated/ujson/Renderer.scala
+++ b/tests/snapshots/src/main/generated/ujson/Renderer.scala
@@ -21,70 +21,85 @@ import scala.annotation.switch
 
 case class BytesRenderer(indent: Int = -1, escapeUnicode: Boolean = false)
 //         ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
+//                       display_name BytesRenderer
 //                       documentation ```scala\ncase class BytesRenderer(indent: Int, escapeUnicode: Boolean) extends BaseByteRenderer[ByteArrayOutputStream]\n```
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#productElement().
+//                       display_name productElement
 //                       documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#productElementName().
+//                       display_name productElementName
 //                       documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.
+//                       display_name BytesRenderer
 //                       documentation ```scala\nobject BytesRenderer\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().
+//                       display_name copy
 //                       documentation ```scala\ndef copy(indent: Int, escapeUnicode: Boolean): BytesRenderer\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
+//                       display_name apply
 //                       documentation ```scala\ndef apply(indent: Int, escapeUnicode: Boolean): BytesRenderer\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().
+//                        display_name <init>
 //                        documentation ```scala\ndef this(indent: Int, escapeUnicode: Boolean)\n```
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
+//                              display_name indent
 //                              documentation ```scala\nval indent: Int\n```
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
+//                              display_name indent
 //                              documentation ```scala\ndefault indent: Int \n```
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
+//                              display_name indent
 //                              documentation ```scala\ndefault indent: Int \n```
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
+//                              display_name indent
 //                              documentation ```scala\ndefault indent: Int \n```
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                         ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
+//                                                       display_name escapeUnicode
 //                                                       documentation ```scala\nval escapeUnicode: Boolean\n```
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
+//                                                       display_name escapeUnicode
 //                                                       documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
+//                                                       display_name escapeUnicode
 //                                                       documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
+//                                                       display_name escapeUnicode
 //                                                       documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
@@ -102,49 +117,60 @@ case class BytesRenderer(indent: Int = -1, escapeUnicode: Boolean = false)
 
 case class StringRenderer(indent: Int = -1,
 //         ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
+//                        display_name StringRenderer
 //                        documentation ```scala\ncase class StringRenderer(indent: Int, escapeUnicode: Boolean) extends BaseCharRenderer[StringWriter]\n```
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
+//                        display_name StringRenderer
 //                        documentation ```scala\nobject StringRenderer\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().
+//                        display_name copy
 //                        documentation ```scala\ndef copy(indent: Int, escapeUnicode: Boolean): StringRenderer\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
+//                        display_name apply
 //                        documentation ```scala\ndef apply(indent: Int, escapeUnicode: Boolean): StringRenderer\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#productElement().
+//                        display_name productElement
 //                        documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#productElementName().
+//                        display_name productElementName
 //                        documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().
+//                         display_name <init>
 //                         documentation ```scala\ndef this(indent: Int, escapeUnicode: Boolean)\n```
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
+//                               display_name indent
 //                               documentation ```scala\nval indent: Int\n```
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
+//                               display_name indent
 //                               documentation ```scala\ndefault indent: Int \n```
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
+//                               display_name indent
 //                               documentation ```scala\ndefault indent: Int \n```
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
+//                               display_name indent
 //                               documentation ```scala\ndefault indent: Int \n```
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
@@ -152,21 +178,25 @@ case class StringRenderer(indent: Int = -1,
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                           escapeUnicode: Boolean = false)
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
+//                                      display_name escapeUnicode
 //                                      documentation ```scala\nval escapeUnicode: Boolean\n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
+//                                      display_name escapeUnicode
 //                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
+//                                      display_name escapeUnicode
 //                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
+//                                      display_name escapeUnicode
 //                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
@@ -184,49 +214,60 @@ case class StringRenderer(indent: Int = -1,
 
 case class Renderer(out: java.io.Writer,
 //         ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
+//                  display_name Renderer
 //                  documentation ```scala\ncase class Renderer(out: Writer, indent: Int, escapeUnicode: Boolean) extends BaseCharRenderer[Writer]\n```
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.
+//                  display_name Renderer
 //                  documentation ```scala\nobject Renderer\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
+//                  display_name apply
 //                  documentation ```scala\ndef apply(out: Writer, indent: Int, escapeUnicode: Boolean): Renderer\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function3#apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#productElementName().
+//                  display_name productElementName
 //                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().
+//                  display_name copy
 //                  documentation ```scala\ndef copy(out: Writer, indent: Int, escapeUnicode: Boolean): Renderer\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#productElement().
+//                  display_name productElement
 //                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().
+//                   display_name <init>
 //                   documentation ```scala\ndef this(out: Writer, indent: Int, escapeUnicode: Boolean)\n```
 //                  ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
+//                      display_name out
 //                      documentation ```scala\nval out: Writer\n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
+//                      display_name out
 //                      documentation ```scala\nout: Writer \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
+//                      display_name out
 //                      documentation ```scala\ndefault out: Writer \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
+//                      display_name out
 //                      documentation ```scala\nout: Writer \n```
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
@@ -236,21 +277,25 @@ case class Renderer(out: java.io.Writer,
 //                               ^^^^^^ reference semanticdb maven jdk 11 java/io/Writer#
                     indent: Int = -1,
 //                  ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
+//                         display_name indent
 //                         documentation ```scala\nval indent: Int\n```
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
+//                         display_name indent
 //                         documentation ```scala\ndefault indent: Int \n```
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
+//                         display_name indent
 //                         documentation ```scala\ndefault indent: Int \n```
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
+//                         display_name indent
 //                         documentation ```scala\ndefault indent: Int \n```
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
@@ -258,21 +303,25 @@ case class Renderer(out: java.io.Writer,
 //                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                     escapeUnicode: Boolean = false)
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
+//                                display_name escapeUnicode
 //                                documentation ```scala\nval escapeUnicode: Boolean\n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
+//                                display_name escapeUnicode
 //                                documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
+//                                display_name escapeUnicode
 //                                documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
+//                                display_name escapeUnicode
 //                                documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
diff --git a/tests/snapshots/src/main/generated/ujson/StringParser.scala b/tests/snapshots/src/main/generated/ujson/StringParser.scala
index 33db2bd79..6a9754b85 100644
--- a/tests/snapshots/src/main/generated/ujson/StringParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/StringParser.scala
@@ -23,15 +23,20 @@ import upickle.core.{ObjArrVisitor, Visitor}
 private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //      ^^^^^ reference semanticdb maven . . ujson/
 //                         ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#
+//                                      display_name StringParser
 //                                      documentation ```scala\nprotected[ujson] final class StringParser[J]\n```
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#[J]
+//                                        display_name J
 //                                        documentation ```scala\nJ\n```
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().
+//                                          display_name <init>
 //                                          documentation ```scala\ndef this(s: String)\n```
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
+//                                           display_name s
 //                                           documentation ```scala\nprivate[this] val s: String\n```
 //                                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().(s)
 //                                         _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().(s)
+//                                           display_name s
 //                                           documentation ```scala\ns: String \n```
 //                                           relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                                            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
@@ -40,26 +45,32 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#`<init>`().
   private[this] val sLength = s.length
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#sLength.
+//                          display_name sLength
 //                          documentation ```scala\nprivate[this] val sLength: Int\n```
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#length().
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#growBuffer().
+//                        display_name growBuffer
 //                        documentation ```scala\ndef growBuffer(until: Int): Unit\n```
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#growBuffer().(until)
+//                              display_name until
 //                              documentation ```scala\nuntil: Int \n```
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().
+//                       display_name readDataIntoBuffer
 //                       documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int): (Array[Char], Boolean, Int)\n```
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(buffer)
+//                              display_name buffer
 //                              documentation ```scala\nbuffer: Array[Char] \n```
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(bufferOffset)
+//                                                         display_name bufferOffset
 //                                                         documentation ```scala\nbufferOffset: Int \n```
 //                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if(buffer == null) (s.toCharArray, sLength == 0, sLength)
@@ -75,26 +86,32 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
   }
   final def close() = ()
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#close().
+//                display_name close
 //                documentation ```scala\nfinal def close(): Unit\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
 }
 
 object StringParser extends Transformer[String]{
 //     ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.
+//                  display_name StringParser
 //                  documentation ```scala\nobject StringParser\n```
 //                          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                             ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: String, f: Visitor[_, T]) = new StringParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(j: String, f: Visitor[local0, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().(j)
+//                   display_name j
 //                   documentation ```scala\nj: String \n```
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().(f)
+//                              display_name f
 //                              documentation ```scala\nf: Visitor[local0, T[ \n```
 //                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().[T]
diff --git a/tests/snapshots/src/main/generated/ujson/Transformer.scala b/tests/snapshots/src/main/generated/ujson/Transformer.scala
index 5a60f2ecf..a283c3a06 100644
--- a/tests/snapshots/src/main/generated/ujson/Transformer.scala
+++ b/tests/snapshots/src/main/generated/ujson/Transformer.scala
@@ -8,11 +8,14 @@ import upickle.core.Visitor
 
 trait Transformer[I] {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
+//                display_name Transformer
 //                documentation ```scala\ntrait Transformer[I]\n```
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
+//                  display_name I
 //                  documentation ```scala\nI\n```
   def transform[T](j: I, f: Visitor[_, T]): T
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(j: I, f: Visitor[local0, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().
@@ -22,21 +25,27 @@ trait Transformer[I] {
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().(j)
+//                   display_name j
 //                   documentation ```scala\nj: I \n```
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().(f)
+//                         display_name f
 //                         documentation ```scala\nf: Visitor[local0, T[ \n```
 //                          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
   def transformable[T](j: I) = Readable.fromTransformer(j, this)
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().
+//                  display_name transformable
 //                  documentation ```scala\ndef transformable(j: I): fromTransformer[I]\n```
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().[T]
+//                    display_name T
 //                    documentation ```scala\nT\n```
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().(j)
+//                       display_name j
 //                       documentation ```scala\nj: I \n```
 //                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
 //                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.
diff --git a/tests/snapshots/src/main/generated/ujson/Value.scala b/tests/snapshots/src/main/generated/ujson/Value.scala
index 338eca741..814909465 100644
--- a/tests/snapshots/src/main/generated/ujson/Value.scala
+++ b/tests/snapshots/src/main/generated/ujson/Value.scala
@@ -31,17 +31,20 @@ import scala.collection.mutable.ArrayBuffer
 
 sealed trait Value extends Readable with geny.Writable{
 //           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
+//                 display_name Value
 //                 documentation ```scala\nsealed trait Value\n```
 //                         ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                       ^^^^ reference semanticdb maven . . geny/
 //                                            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#
   override def httpContentType = Some("application/json")
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#httpContentType().
+//                             display_name httpContentType
 //                             documentation ```scala\ndef httpContentType: Some[String]\n```
 //                             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#httpContentType().
 //                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
   def value: Any
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
+//          display_name value
 //          documentation ```scala\ndef value: Any\n```
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
@@ -59,11 +62,13 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def str = this match{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#str().
+//        display_name str
 //        documentation ```scala\ndef str: String\n```
     case ujson.Str(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //                 ^^^^^ definition local 0
+//                       display_name value
 //                       documentation ```scala\nvalue: String \n```
 //                           ^^^^^ reference local 0
     case _ => throw Value.InvalidData(this, "Expected ujson.Str")
@@ -76,10 +81,12 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def strOpt = this match{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#strOpt().
+//           display_name strOpt
 //           documentation ```scala\ndef strOpt: Option[String]\n```
     case Str(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //           ^^^^^ definition local 1
+//                 display_name value
 //                 documentation ```scala\nvalue: String \n```
 //                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                          ^^^^^ reference local 1
@@ -93,11 +100,13 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def obj = this match{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#obj().
+//        display_name obj
 //        documentation ```scala\ndef obj: LinkedHashMap[String, Value]\n```
     case ujson.Obj(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                 ^^^^^ definition local 2
+//                       display_name value
 //                       documentation ```scala\nvalue: LinkedHashMap[String, Value] \n```
 //                           ^^^^^ reference local 2
     case _ => throw Value.InvalidData(this, "Expected ujson.Obj")
@@ -109,10 +118,12 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def objOpt = this match{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#objOpt().
+//           display_name objOpt
 //           documentation ```scala\ndef objOpt: Option[LinkedHashMap[String, Value]]\n```
     case Obj(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //           ^^^^^ definition local 3
+//                 display_name value
 //                 documentation ```scala\nvalue: LinkedHashMap[String, Value] \n```
 //                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                          ^^^^^ reference local 3
@@ -125,11 +136,13 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def arr = this match{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#arr().
+//        display_name arr
 //        documentation ```scala\ndef arr: ArrayBuffer[Value]\n```
     case ujson.Arr(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //                 ^^^^^ definition local 4
+//                       display_name value
 //                       documentation ```scala\nvalue: ArrayBuffer[Value] \n```
 //                           ^^^^^ reference local 4
     case _ => throw Value.InvalidData(this, "Expected ujson.Arr")
@@ -141,10 +154,12 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def arrOpt = this match{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#arrOpt().
+//           display_name arrOpt
 //           documentation ```scala\ndef arrOpt: Option[ArrayBuffer[Value]]\n```
     case Arr(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //           ^^^^^ definition local 5
+//                 display_name value
 //                 documentation ```scala\nvalue: ArrayBuffer[Value] \n```
 //                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                          ^^^^^ reference local 5
@@ -157,11 +172,13 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def num = this match{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#num().
+//        display_name num
 //        documentation ```scala\ndef num: Double\n```
     case ujson.Num(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //                 ^^^^^ definition local 6
+//                       display_name value
 //                       documentation ```scala\nvalue: Double \n```
 //                           ^^^^^ reference local 6
     case _ => throw Value.InvalidData(this, "Expected ujson.Num")
@@ -173,10 +190,12 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def numOpt = this match{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#numOpt().
+//           display_name numOpt
 //           documentation ```scala\ndef numOpt: Option[Double]\n```
     case Num(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //           ^^^^^ definition local 7
+//                 display_name value
 //                 documentation ```scala\nvalue: Double \n```
 //                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                          ^^^^^ reference local 7
@@ -189,11 +208,13 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def bool = this match{
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#bool().
+//         display_name bool
 //         documentation ```scala\ndef bool: Boolean\n```
     case ujson.Bool(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
 //                  ^^^^^ definition local 8
+//                        display_name value
 //                        documentation ```scala\nvalue: Boolean \n```
 //                            ^^^^^ reference local 8
     case _ => throw Value.InvalidData(this, "Expected ujson.Bool")
@@ -205,10 +226,12 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def boolOpt = this match{
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#boolOpt().
+//            display_name boolOpt
 //            documentation ```scala\ndef boolOpt: Option[Boolean]\n```
     case Bool(value) => Some(value)
 //       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
 //            ^^^^^ definition local 9
+//                  display_name value
 //                  documentation ```scala\nvalue: Boolean \n```
 //                      ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                           ^^^^^ reference local 9
@@ -220,6 +243,7 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def isNull = this match {
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#isNull().
+//           display_name isNull
 //           documentation ```scala\ndef isNull: Boolean\n```
     case ujson.Null => true
 //       ^^^^^ reference semanticdb maven . . ujson/
@@ -229,8 +253,10 @@ sealed trait Value extends Readable with geny.Writable{
 
   def apply(s: Value.Selector): Value = s(this)
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#apply().
+//          display_name apply
 //          documentation ```scala\ndef apply(s: Selector): Value\n```
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#apply().(s)
+//            display_name s
 //            documentation ```scala\ns: Selector \n```
 //             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                   ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
@@ -238,12 +264,15 @@ sealed trait Value extends Readable with geny.Writable{
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#apply().(s)
   def update(s: Value.Selector, v: Value): Unit = s(this) = v
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().
+//           display_name update
 //           documentation ```scala\ndef update(s: Selector, v: Value): Unit\n```
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(s)
+//             display_name s
 //             documentation ```scala\ns: Selector \n```
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(v)
+//                                display_name v
 //                                documentation ```scala\nv: Value \n```
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -259,12 +288,15 @@ sealed trait Value extends Readable with geny.Writable{
     */
   def update(s: Value.Selector, f: Value => Value): Unit = s(this) = f(s(this))
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).
+//           display_name update
 //           documentation ```scala\ndef update(s: Selector, f: (Value) => Value): Unit\n```
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(s)
+//             display_name s
 //             documentation ```scala\ns: Selector \n```
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(f)
+//                                display_name f
 //                                documentation ```scala\nf: (Value) => Value \n```
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -275,11 +307,14 @@ sealed trait Value extends Readable with geny.Writable{
 
   def transform[T](f: Visitor[_, T]) = Value.transform(this, f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(f: Visitor[local10, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().(f)
+//                   display_name f
 //                   documentation ```scala\nf: Visitor[local10, T[ \n```
 //                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().[T]
@@ -288,17 +323,21 @@ sealed trait Value extends Readable with geny.Writable{
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().(f)
   override def toString = render()
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#toString().
+//                      display_name toString
 //                      documentation ```scala\ndef toString(): String\n```
 //                      relationship is_reference is_implementation semanticdb maven . . scala/Any#toString().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 //                        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().
   def render(indent: Int = -1, escapeUnicode: Boolean = false) = this.transform(StringRenderer(indent, escapeUnicode)).toString
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().
+//           display_name render
 //           documentation ```scala\ndef render(indent: Int, escapeUnicode: Boolean): String\n```
 //           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(indent)
+//                  display_name indent
 //                  documentation ```scala\ndefault indent: Int \n```
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(escapeUnicode)
+//                                           display_name escapeUnicode
 //                                           documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                            ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                                    ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
@@ -309,16 +348,20 @@ sealed trait Value extends Readable with geny.Writable{
 
   def writeBytesTo(out: java.io.OutputStream, indent: Int = -1, escapeUnicode: Boolean = false): Unit = {
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().
+//                 display_name writeBytesTo
 //                 documentation ```scala\ndef writeBytesTo(out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit\n```
 //                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(out)
+//                     display_name out
 //                     documentation ```scala\nout: OutputStream \n```
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^ reference semanticdb maven . . java/io/
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(indent)
+//                                                   display_name indent
 //                                                   documentation ```scala\ndefault indent: Int \n```
 //                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                              ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(escapeUnicode)
+//                                                                            display_name escapeUnicode
 //                                                                            documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                                                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -333,9 +376,11 @@ sealed trait Value extends Readable with geny.Writable{
   }
   def writeBytesTo(out: java.io.OutputStream): Unit = writeBytesTo(out, -1, false)
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo(+1).
+//                 display_name writeBytesTo
 //                 documentation ```scala\ndef writeBytesTo(out: OutputStream): Unit\n```
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#writeBytesTo().
 //                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo(+1).(out)
+//                     display_name out
 //                     documentation ```scala\nout: OutputStream \n```
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^ reference semanticdb maven . . java/io/
@@ -353,52 +398,65 @@ sealed trait Value extends Readable with geny.Writable{
 */
 object Value extends AstTransformer[Value]{
 //     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
+//           display_name Value
 //           documentation ```scala\nobject Value\n```
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
 //                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                        ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   type Value = ujson.Value
 //     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
+//           display_name Value
 //           documentation ```scala\ntype Value >: Value <: Value\n```
 //             ^^^^^ reference semanticdb maven . . ujson/
 //                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
   sealed trait Selector{
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
+//                      display_name Selector
 //                      documentation ```scala\nsealed trait Selector\n```
     def apply(x: Value): Value
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
+//            display_name apply
 //            documentation ```scala\ndef apply(x: Value): Value\n```
 //            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().
 //            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().(x)
+//              display_name x
 //              documentation ```scala\nx: Value \n```
 //               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
     def update(x: Value, y: Value): Unit
 //      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
+//             display_name update
 //             documentation ```scala\ndef update(x: Value, y: Value): Unit\n```
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().(x)
+//               display_name x
 //               documentation ```scala\nx: Value \n```
 //                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().(y)
+//                         display_name y
 //                         documentation ```scala\ny: Value \n```
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
   }
   object Selector{
 //       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.
+//                display_name Selector
 //                documentation ```scala\nobject Selector\n```
     implicit class IntSelector(i: Int) extends Selector{
 //                 ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#
+//                             display_name IntSelector
 //                             documentation ```scala\nimplicit class IntSelector\n```
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().
+//                              display_name <init>
 //                              documentation ```scala\ndef this(i: Int)\n```
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#i.
+//                               display_name i
 //                               documentation ```scala\nprivate[this] val i: Int\n```
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().(i)
 //                             _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().(i)
+//                               display_name i
 //                               documentation ```scala\ni: Int \n```
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#i.
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
@@ -406,9 +464,11 @@ object Value extends AstTransformer[Value]{
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       def apply(x: Value): Value = x.arr(i)
 //        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().
+//              display_name apply
 //              documentation ```scala\ndef apply(x: Value): Value\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().(x)
+//                display_name x
 //                documentation ```scala\nx: Value \n```
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
@@ -417,12 +477,15 @@ object Value extends AstTransformer[Value]{
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#i.
       def update(x: Value, y: Value) = x.arr(i) = y
 //        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().
+//               display_name update
 //               documentation ```scala\ndef update(x: Value, y: Value): Unit\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(x)
+//                 display_name x
 //                 documentation ```scala\nx: Value \n```
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(y)
+//                           display_name y
 //                           documentation ```scala\ny: Value \n```
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(x)
@@ -432,13 +495,17 @@ object Value extends AstTransformer[Value]{
     }
     implicit class StringSelector(i: String) extends Selector{
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#
+//                                display_name StringSelector
 //                                documentation ```scala\nimplicit class StringSelector\n```
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().
+//                                 display_name <init>
 //                                 documentation ```scala\ndef this(i: String)\n```
 //                                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#i.
+//                                  display_name i
 //                                  documentation ```scala\nprivate[this] val i: String\n```
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().(i)
 //                                _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().(i)
+//                                  display_name i
 //                                  documentation ```scala\ni: String \n```
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#i.
 //                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
@@ -446,9 +513,11 @@ object Value extends AstTransformer[Value]{
 //                                                           ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       def apply(x: Value): Value = x.obj(i)
 //        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().
+//              display_name apply
 //              documentation ```scala\ndef apply(x: Value): Value\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().(x)
+//                display_name x
 //                documentation ```scala\nx: Value \n```
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
@@ -457,12 +526,15 @@ object Value extends AstTransformer[Value]{
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#i.
       def update(x: Value, y: Value) = x.obj(i) = y
 //        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().
+//               display_name update
 //               documentation ```scala\ndef update(x: Value, y: Value): Unit\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(x)
+//                 display_name x
 //                 documentation ```scala\nx: Value \n```
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(y)
+//                           display_name y
 //                           documentation ```scala\ny: Value \n```
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(x)
@@ -477,6 +549,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Str = ujson.Str
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
+//        display_name Str
 //        documentation ```scala\n@deprecated\nval Str: Str.type\n```
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
@@ -485,6 +558,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Str = ujson.Str
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
+//         display_name Str
 //         documentation ```scala\ntype Str >: Str <: Str\n```
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
@@ -493,6 +567,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Obj = ujson.Obj
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj.
+//        display_name Obj
 //        documentation ```scala\n@deprecated\nval Obj: Obj.type\n```
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
@@ -501,6 +576,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Obj = ujson.Obj
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj#
+//         display_name Obj
 //         documentation ```scala\ntype Obj >: Obj <: Obj\n```
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
@@ -509,6 +585,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Arr = ujson.Arr
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr.
+//        display_name Arr
 //        documentation ```scala\n@deprecated\nval Arr: Arr.type\n```
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
@@ -517,6 +594,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Arr = ujson.Arr
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr#
+//         display_name Arr
 //         documentation ```scala\ntype Arr >: Arr <: Arr\n```
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
@@ -525,6 +603,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Num = ujson.Num
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
+//        display_name Num
 //        documentation ```scala\n@deprecated\nval Num: Num.type\n```
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
@@ -533,6 +612,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Num = ujson.Num
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
+//         display_name Num
 //         documentation ```scala\ntype Num >: Num <: Num\n```
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
@@ -541,6 +621,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Bool = ujson.Bool
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool.
+//         display_name Bool
 //         documentation ```scala\n@deprecated\nval Bool: Bool.type\n```
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
@@ -549,6 +630,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Bool = ujson.Bool
 //     ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool#
+//          display_name Bool
 //          documentation ```scala\ntype Bool >: Bool <: Bool\n```
 //            ^^^^^ reference semanticdb maven . . ujson/
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
@@ -557,6 +639,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val True = ujson.True
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.True.
+//         display_name True
 //         documentation ```scala\n@deprecated\nval True: True.type\n```
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
@@ -565,6 +648,7 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val False = ujson.False
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.False.
+//          display_name False
 //          documentation ```scala\n@deprecated\nval False: False.type\n```
 //            ^^^^^ reference semanticdb maven . . ujson/
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
@@ -573,20 +657,25 @@ object Value extends AstTransformer[Value]{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Null = ujson.Null
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
+//         display_name Null
 //         documentation ```scala\n@deprecated\nval Null: Null.type\n```
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
   implicit def JsonableSeq[T](items: TraversableOnce[T])
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().
+//                         display_name JsonableSeq
 //                         documentation ```scala\nimplicit def JsonableSeq(items: TraversableOnce[T])(f: (T) => Value): Arr\n```
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
+//                           display_name T
 //                           documentation ```scala\nT\n```
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(items)
+//                                  display_name items
 //                                  documentation ```scala\nitems: TraversableOnce[T] \n```
 //                                   ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
                              (implicit f: T => Value): Arr = Arr.from(items.map(f))
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(f)
+//                                       display_name f
 //                                       documentation ```scala\nimplicit f: (T) => Value \n```
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
 //                                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
@@ -598,16 +687,20 @@ object Value extends AstTransformer[Value]{
 //                                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(f)
   implicit def JsonableDict[T](items: TraversableOnce[(String, T)])
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().
+//                          display_name JsonableDict
 //                          documentation ```scala\nimplicit def JsonableDict(items: TraversableOnce[(String, T)])(f: (T) => Value): Obj\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
+//                            display_name T
 //                            documentation ```scala\nT\n```
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(items)
+//                                   display_name items
 //                                   documentation ```scala\nitems: TraversableOnce[(String, T)] \n```
 //                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
 //                                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
                               (implicit f: T => Value): Obj = Obj.from(items.map(x => (x._1, f(x._2))))
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(f)
+//                                        display_name f
 //                                        documentation ```scala\nimplicit f: (T) => Value \n```
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
@@ -617,6 +710,7 @@ object Value extends AstTransformer[Value]{
 //                                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(items)
 //                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#map().
 //                                                                               ^ definition local 11
+//                                                                                 display_name x
 //                                                                                 documentation ```scala\nx: (String, T) \n```
 //                                                                                     ^ reference local 11
 //                                                                                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
@@ -625,8 +719,10 @@ object Value extends AstTransformer[Value]{
 //                                                                                               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
   implicit def JsonableBoolean(i: Boolean): Bool = if (i) ujson.True else ujson.False
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().
+//                             display_name JsonableBoolean
 //                             documentation ```scala\nimplicit def JsonableBoolean(i: Boolean): Bool\n```
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().(i)
+//                               display_name i
 //                               documentation ```scala\ni: Boolean \n```
 //                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                          ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool#
@@ -637,8 +733,10 @@ object Value extends AstTransformer[Value]{
 //                                                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
   implicit def JsonableByte(i: Byte): Num = Num(i)
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().
+//                          display_name JsonableByte
 //                          documentation ```scala\nimplicit def JsonableByte(i: Byte): Num\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().(i)
+//                            display_name i
 //                            documentation ```scala\ni: Byte \n```
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
@@ -646,8 +744,10 @@ object Value extends AstTransformer[Value]{
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().(i)
   implicit def JsonableShort(i: Short): Num = Num(i)
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().
+//                           display_name JsonableShort
 //                           documentation ```scala\nimplicit def JsonableShort(i: Short): Num\n```
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().(i)
+//                             display_name i
 //                             documentation ```scala\ni: Short \n```
 //                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Short#
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
@@ -655,8 +755,10 @@ object Value extends AstTransformer[Value]{
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().(i)
   implicit def JsonableInt(i: Int): Num = Num(i)
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().
+//                         display_name JsonableInt
 //                         documentation ```scala\nimplicit def JsonableInt(i: Int): Num\n```
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().(i)
+//                           display_name i
 //                           documentation ```scala\ni: Int \n```
 //                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
@@ -664,8 +766,10 @@ object Value extends AstTransformer[Value]{
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().(i)
   implicit def JsonableLong(i: Long): Str = Str(i.toString)
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableLong().
+//                          display_name JsonableLong
 //                          documentation ```scala\nimplicit def JsonableLong(i: Long): Str\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableLong().(i)
+//                            display_name i
 //                            documentation ```scala\ni: Long \n```
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
@@ -674,8 +778,10 @@ object Value extends AstTransformer[Value]{
 //                                                ^^^^^^^^ reference semanticdb maven . . scala/Any#toString().
   implicit def JsonableFloat(i: Float): Num = Num(i)
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().
+//                           display_name JsonableFloat
 //                           documentation ```scala\nimplicit def JsonableFloat(i: Float): Num\n```
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().(i)
+//                             display_name i
 //                             documentation ```scala\ni: Float \n```
 //                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Float#
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
@@ -683,8 +789,10 @@ object Value extends AstTransformer[Value]{
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().(i)
   implicit def JsonableDouble(i: Double): Num = Num(i)
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().
+//                            display_name JsonableDouble
 //                            documentation ```scala\nimplicit def JsonableDouble(i: Double): Num\n```
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().(i)
+//                              display_name i
 //                              documentation ```scala\ni: Double \n```
 //                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
@@ -692,16 +800,20 @@ object Value extends AstTransformer[Value]{
 //                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().(i)
   implicit def JsonableNull(i: Null): Null.type = Null
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableNull().
+//                          display_name JsonableNull
 //                          documentation ```scala\nimplicit def JsonableNull(i: Null): Null.type\n```
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableNull().(i)
+//                            display_name i
 //                            documentation ```scala\ni: Null \n```
 //                             ^^^^ reference semanticdb maven . . scala/Null#
 //                                    ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
 //                                                ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
   implicit def JsonableString(s: CharSequence): Str = Str(s.toString)
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableString().
+//                            display_name JsonableString
 //                            documentation ```scala\nimplicit def JsonableString(s: CharSequence): Str\n```
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableString().(s)
+//                              display_name s
 //                              documentation ```scala\ns: CharSequence \n```
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
@@ -712,14 +824,18 @@ object Value extends AstTransformer[Value]{
 
   def transform[T](j: Value, f: Visitor[_, T]): T = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(j: Value, f: Visitor[local12, T[): T\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(j)
+//                   display_name j
 //                   documentation ```scala\nj: Value \n```
 //                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
+//                             display_name f
 //                             documentation ```scala\nf: Visitor[local12, T[ \n```
 //                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().[T]
@@ -745,6 +861,7 @@ object Value extends AstTransformer[Value]{
 //         ^^^^^ reference semanticdb maven . . ujson/
 //               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //                   ^ definition local 13
+//                     display_name s
 //                     documentation ```scala\ns: String \n```
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                           ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
@@ -753,6 +870,7 @@ object Value extends AstTransformer[Value]{
 //         ^^^^^ reference semanticdb maven . . ujson/
 //               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //                   ^ definition local 14
+//                     display_name d
 //                     documentation ```scala\nd: Double \n```
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                           ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
@@ -761,6 +879,7 @@ object Value extends AstTransformer[Value]{
 //         ^^^^^ reference semanticdb maven . . ujson/
 //               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //                   ^^^^^ definition local 15
+//                         display_name items
 //                         documentation ```scala\nitems: ArrayBuffer[Value] \n```
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
@@ -769,6 +888,7 @@ object Value extends AstTransformer[Value]{
 //         ^^^^^ reference semanticdb maven . . ujson/
 //               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                   ^^^^^ definition local 16
+//                         display_name items
 //                         documentation ```scala\nitems: LinkedHashMap[String, Value] \n```
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().
 //                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
@@ -778,18 +898,22 @@ object Value extends AstTransformer[Value]{
 
   def visitArray(length: Int, index: Int) = new AstArrVisitor[ArrayBuffer](xs => ujson.Arr(xs))
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().
+//               display_name visitArray
 //               documentation ```scala\ndef visitArray(length: Int, index: Int): AstArrVisitor[ArrayBuffer]\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().(length)
+//                      display_name length
 //                      documentation ```scala\nlength: Int \n```
 //                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().(index)
+//                                  display_name index
 //                                  documentation ```scala\nindex: Int \n```
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#
 //                                                            ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().
 //                                                                         ^^ definition local 17
+//                                                                            display_name xs
 //                                                                            documentation ```scala\nxs: ArrayBuffer[Value] \n```
 //                                                                               ^^^^^ reference semanticdb maven . . ujson/
 //                                                                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
@@ -797,12 +921,15 @@ object Value extends AstTransformer[Value]{
 
   def visitObject(length: Int, index: Int) = new AstObjVisitor[mutable.LinkedHashMap[String, Value]](xs => ujson.Obj(xs))
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().
+//                display_name visitObject
 //                documentation ```scala\ndef visitObject(length: Int, index: Int): AstObjVisitor[LinkedHashMap[String, Value]]\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().(length)
+//                       display_name length
 //                       documentation ```scala\nlength: Int \n```
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().(index)
+//                                   display_name index
 //                                   documentation ```scala\nindex: Int \n```
 //                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#
@@ -812,6 +939,7 @@ object Value extends AstTransformer[Value]{
 //                                                                                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().
 //                                                                                                   ^^ definition local 18
+//                                                                                                      display_name xs
 //                                                                                                      documentation ```scala\nxs: LinkedHashMap[String, Value] \n```
 //                                                                                                         ^^^^^ reference semanticdb maven . . ujson/
 //                                                                                                               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
@@ -819,9 +947,11 @@ object Value extends AstTransformer[Value]{
 
   def visitNull(index: Int) = ujson.Null
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitNull().
+//              display_name visitNull
 //              documentation ```scala\ndef visitNull(index: Int): Null\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitNull().(index)
+//                    display_name index
 //                    documentation ```scala\nindex: Int \n```
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^^ reference semanticdb maven . . ujson/
@@ -829,9 +959,11 @@ object Value extends AstTransformer[Value]{
 
   def visitFalse(index: Int) = ujson.False
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFalse().
+//               display_name visitFalse
 //               documentation ```scala\ndef visitFalse(index: Int): False\n```
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFalse().(index)
+//                     display_name index
 //                     documentation ```scala\nindex: Int \n```
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ reference semanticdb maven . . ujson/
@@ -839,9 +971,11 @@ object Value extends AstTransformer[Value]{
 
   def visitTrue(index: Int) = True
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitTrue().
+//              display_name visitTrue
 //              documentation ```scala\ndef visitTrue(index: Int): True\n```
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitTrue().(index)
+//                    display_name index
 //                    documentation ```scala\nindex: Int \n```
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.True.
@@ -849,18 +983,23 @@ object Value extends AstTransformer[Value]{
 
   override def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int) = {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().
+//                                     display_name visitFloat64StringParts
 //                                     documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): Num\n```
 //                                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(s)
+//                                       display_name s
 //                                       documentation ```scala\ns: CharSequence \n```
 //                                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(decIndex)
+//                                                               display_name decIndex
 //                                                               documentation ```scala\ndecIndex: Int \n```
 //                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                     ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(expIndex)
+//                                                                              display_name expIndex
 //                                                                              documentation ```scala\nexpIndex: Int \n```
 //                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(index)
+//                                                                                          display_name index
 //                                                                                          documentation ```scala\nindex: Int \n```
 //                                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     ujson.Num(
@@ -887,13 +1026,16 @@ object Value extends AstTransformer[Value]{
 
   override def visitFloat64(d: Double, index: Int) = ujson.Num(d)
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().
+//                          display_name visitFloat64
 //                          documentation ```scala\ndef visitFloat64(d: Double, index: Int): Num\n```
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(d)
+//                            display_name d
 //                            documentation ```scala\nd: Double \n```
 //                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(index)
+//                                           display_name index
 //                                           documentation ```scala\nindex: Int \n```
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^ reference semanticdb maven . . ujson/
@@ -902,12 +1044,15 @@ object Value extends AstTransformer[Value]{
 
   def visitString(s: CharSequence, index: Int) = ujson.Str(s.toString)
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().
+//                display_name visitString
 //                documentation ```scala\ndef visitString(s: CharSequence, index: Int): Str\n```
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().(s)
+//                  display_name s
 //                  documentation ```scala\ns: CharSequence \n```
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().(index)
+//                                       display_name index
 //                                       documentation ```scala\nindex: Int \n```
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^^^^^ reference semanticdb maven . . ujson/
@@ -925,70 +1070,85 @@ object Value extends AstTransformer[Value]{
     */
   case class InvalidData(data: Value, msg: String)
 //           ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
+//                       display_name InvalidData
 //                       documentation ```scala\ncase class InvalidData(data: Value, msg: String) extends Exception\n```
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().
+//                       display_name copy
 //                       documentation ```scala\ndef copy(data: Value, msg: String): InvalidData\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.
+//                       display_name InvalidData
 //                       documentation ```scala\nobject InvalidData\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
+//                       display_name apply
 //                       documentation ```scala\ndef apply(data: Value, msg: String): InvalidData\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#productElementName().
+//                       display_name productElementName
 //                       documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#productElement().
+//                       display_name productElement
 //                       documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().
+//                        display_name <init>
 //                        documentation ```scala\ndef this(data: Value, msg: String)\n```
 //                       ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
+//                            display_name data
 //                            documentation ```scala\nval data: Value\n```
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
+//                            display_name data
 //                            documentation ```scala\ndata: Value \n```
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
+//                            display_name data
 //                            documentation ```scala\ndata: Value \n```
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
+//                            display_name data
 //                            documentation ```scala\ndefault data: Value \n```
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
+//                                        display_name msg
 //                                        documentation ```scala\nval msg: String\n```
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
+//                                        display_name msg
 //                                        documentation ```scala\nmsg: String \n```
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
+//                                        display_name msg
 //                                        documentation ```scala\ndefault msg: String \n```
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
+//                                        display_name msg
 //                                        documentation ```scala\nmsg: String \n```
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
@@ -1004,50 +1164,61 @@ object Value extends AstTransformer[Value]{
 
 case class Str(value: String) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
+//             display_name Str
 //             documentation ```scala\ncase class Str(value: String) extends Value\n```
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#productElement().
+//             display_name productElement
 //             documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().
+//             display_name copy
 //             documentation ```scala\ndef copy(value: String): Str\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
+//             display_name Str
 //             documentation ```scala\nobject Str\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#productElementName().
+//             display_name productElementName
 //             documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
+//             display_name apply
 //             documentation ```scala\ndef apply(value: String): Str\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().
+//              display_name <init>
 //              documentation ```scala\ndef this(value: String)\n```
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
+//                   display_name value
 //                   documentation ```scala\nval value: String\n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
+//                   display_name value
 //                   documentation ```scala\nvalue: String \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
+//                   display_name value
 //                   documentation ```scala\nvalue: String \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
+//                   display_name value
 //                   documentation ```scala\ndefault value: String \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
@@ -1057,37 +1228,46 @@ case class Str(value: String) extends Value
 //                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
+//             display_name Obj
 //             documentation ```scala\ncase class Obj(value: LinkedHashMap[String, Value]) extends Value\n```
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#productElementName().
+//             display_name productElementName
 //             documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#productElement().
+//             display_name productElement
 //             documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().
+//             display_name copy
 //             documentation ```scala\ndef copy(value: LinkedHashMap[String, Value]): Obj\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().
+//              display_name <init>
 //              documentation ```scala\ndef this(value: LinkedHashMap[String, Value])\n```
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
+//                   display_name value
 //                   documentation ```scala\nval value: LinkedHashMap[String, Value]\n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
+//                   display_name value
 //                   documentation ```scala\nvalue: LinkedHashMap[String, Value] \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
+//                   display_name value
 //                   documentation ```scala\nvalue: LinkedHashMap[String, Value] \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
+//                   display_name value
 //                   documentation ```scala\ndefault value: LinkedHashMap[String, Value] \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
@@ -1101,14 +1281,18 @@ case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
 //^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 object Obj{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
+//         display_name Obj
 //         documentation ```scala\nobject Obj\n```
 //     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).
+//         display_name apply
 //         documentation ```scala\ndef apply(value: LinkedHashMap[String, Value]): Obj\n```
 //         relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
   implicit def from(items: TraversableOnce[(String, Value)]): Obj = {
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().
+//                  display_name from
 //                  documentation ```scala\nimplicit def from(items: TraversableOnce[(String, Value)]): Obj\n```
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().(items)
+//                        display_name items
 //                        documentation ```scala\nitems: TraversableOnce[(String, Value)] \n```
 //                         ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
 //                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
@@ -1127,25 +1311,31 @@ object Obj{
   // https://github.com/lihaoyi/upickle/issues/230
   def apply[V](item: (String, V),
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().
+//          display_name apply
 //          documentation ```scala\ndef apply(item: (String, V), items: (String, Value)*)(conv: (V) => Value): Obj\n```
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
+//            display_name V
 //            documentation ```scala\nV\n```
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(item)
+//                  display_name item
 //                  documentation ```scala\nitem: (String, V) \n```
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
                         items: (String, Value)*)(implicit conv: V => Value): Obj = {
 //                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(items)
+//                            display_name items
 //                            documentation ```scala\nitems: (String, Value)* \n```
 //                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                        ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(conv)
+//                                                             display_name conv
 //                                                             documentation ```scala\nimplicit conv: (V) => Value \n```
 //                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
 //                                                                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
     val map = new mutable.LinkedHashMap[String, Value]()
 //      ^^^ definition local 22
+//          display_name map
 //          documentation ```scala\nmap: LinkedHashMap[String, Value] \n```
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                        ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
@@ -1162,6 +1352,7 @@ object Obj{
 //                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
     for (i <- items) map.put(i._1, i._2)
 //       ^ definition local 23
+//         display_name i
 //         documentation ```scala\ni: (String, Value) \n```
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(items)
 //                   ^^^ reference local 22
@@ -1177,6 +1368,7 @@ object Obj{
 
   def apply(): Obj = Obj(new mutable.LinkedHashMap[String, Value]())
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+1).
+//          display_name apply
 //          documentation ```scala\ndef apply(): Obj\n```
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //                   ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
@@ -1188,37 +1380,46 @@ object Obj{
 }
 case class Arr(value: ArrayBuffer[Value]) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
+//             display_name Arr
 //             documentation ```scala\ncase class Arr(value: ArrayBuffer[Value]) extends Value\n```
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#productElement().
+//             display_name productElement
 //             documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#productElementName().
+//             display_name productElementName
 //             documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().
+//             display_name copy
 //             documentation ```scala\ndef copy(value: ArrayBuffer[Value]): Arr\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().
+//              display_name <init>
 //              documentation ```scala\ndef this(value: ArrayBuffer[Value])\n```
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
+//                   display_name value
 //                   documentation ```scala\nval value: ArrayBuffer[Value]\n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
+//                   display_name value
 //                   documentation ```scala\nvalue: ArrayBuffer[Value] \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
+//                   display_name value
 //                   documentation ```scala\ndefault value: ArrayBuffer[Value] \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
+//                   display_name value
 //                   documentation ```scala\nvalue: ArrayBuffer[Value] \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
@@ -1230,26 +1431,33 @@ case class Arr(value: ArrayBuffer[Value]) extends Value
 //^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 object Arr{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
+//         display_name Arr
 //         documentation ```scala\nobject Arr\n```
 //     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).
+//         display_name apply
 //         documentation ```scala\ndef apply(value: ArrayBuffer[Value]): Arr\n```
 //         relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
   implicit def from[T](items: TraversableOnce[T])(implicit conv: T => Value): Arr = {
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().
+//                  display_name from
 //                  documentation ```scala\nimplicit def from(items: TraversableOnce[T])(conv: (T) => Value): Arr\n```
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
+//                    display_name T
 //                    documentation ```scala\nT\n```
 //                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(items)
+//                           display_name items
 //                           documentation ```scala\nitems: TraversableOnce[T] \n```
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                                                         ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(conv)
+//                                                              display_name conv
 //                                                              documentation ```scala\nimplicit conv: (T) => Value \n```
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                                                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
     val buf = new mutable.ArrayBuffer[Value]()
 //      ^^^ definition local 25
+//          display_name buf
 //          documentation ```scala\nbuf: ArrayBuffer[Value] \n```
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
@@ -1259,6 +1467,7 @@ object Arr{
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(items)
 //        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#foreach().
 //                 ^^^^ definition local 26
+//                      display_name item
 //                      documentation ```scala\nitem: T \n```
       buf += (conv(item): Value)
 //    ^^^ reference local 25
@@ -1274,13 +1483,16 @@ object Arr{
 
   def apply(items: Value*): Arr = {
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().
+//          display_name apply
 //          documentation ```scala\ndef apply(items: Value*): Arr\n```
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().(items)
+//                display_name items
 //                documentation ```scala\nitems: Value* \n```
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
     val buf = new mutable.ArrayBuffer[Value](items.length)
 //      ^^^ definition local 27
+//          display_name buf
 //          documentation ```scala\nbuf: ArrayBuffer[Value] \n```
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
@@ -1292,6 +1504,7 @@ object Arr{
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().(items)
 //        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#foreach().
 //                 ^^^^ definition local 28
+//                      display_name item
 //                      documentation ```scala\nitem: Value \n```
       buf += item
 //    ^^^ reference local 27
@@ -1305,50 +1518,61 @@ object Arr{
 }
 case class Num(value: Double) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
+//             display_name Num
 //             documentation ```scala\ncase class Num(value: Double) extends Value\n```
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#productElement().
+//             display_name productElement
 //             documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().
+//             display_name copy
 //             documentation ```scala\ndef copy(value: Double): Num\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
+//             display_name apply
 //             documentation ```scala\ndef apply(value: Double): Num\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#productElementName().
+//             display_name productElementName
 //             documentation ```scala\ndef productElementName(x$1: Int): String\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
+//             display_name Num
 //             documentation ```scala\nobject Num\n```
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().
+//              display_name <init>
 //              documentation ```scala\ndef this(value: Double)\n```
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
+//                   display_name value
 //                   documentation ```scala\nval value: Double\n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
+//                   display_name value
 //                   documentation ```scala\nvalue: Double \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
+//                   display_name value
 //                   documentation ```scala\ndefault value: Double \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
+//                   display_name value
 //                   documentation ```scala\nvalue: Double \n```
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
@@ -1358,13 +1582,16 @@ case class Num(value: Double) extends Value
 //                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 sealed abstract class Bool extends Value{
 //                    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
+//                         display_name Bool
 //                         documentation ```scala\nabstract sealed class Bool\n```
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
+//                           display_name <init>
 //                           documentation ```scala\ndef this()\n```
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def value: Boolean
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
+//          display_name value
 //          documentation ```scala\ndef value: Boolean\n```
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.value().
@@ -1373,11 +1600,14 @@ sealed abstract class Bool extends Value{
 }
 object Bool{
 //     ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
+//          display_name Bool
 //          documentation ```scala\nobject Bool\n```
   def apply(value: Boolean): Bool = if (value) True else False
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().
+//          display_name apply
 //          documentation ```scala\ndef apply(value: Boolean): Bool\n```
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().(value)
+//                display_name value
 //                documentation ```scala\nvalue: Boolean \n```
 //                 ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                           ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
@@ -1386,8 +1616,10 @@ object Bool{
 //                                                       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
   def unapply(bool: Bool): Option[Boolean] = Some(bool.value)
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.unapply().
+//            display_name unapply
 //            documentation ```scala\ndef unapply(bool: Bool): Option[Boolean]\n```
 //            ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.unapply().(bool)
+//                 display_name bool
 //                 documentation ```scala\nbool: Bool \n```
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Option#
@@ -1398,8 +1630,10 @@ object Bool{
 }
 case object False extends Bool{
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
+//                display_name False
 //                documentation ```scala\ncase object False\n```
 //          _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.productElement().
+//                display_name productElement
 //                documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
@@ -1407,14 +1641,17 @@ case object False extends Bool{
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
   def value = false
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
+//          display_name value
 //          documentation ```scala\ndef value: Boolean\n```
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
 case object True extends Bool{
 //          ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
+//               display_name True
 //               documentation ```scala\ncase object True\n```
 //          ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.productElement().
+//               display_name productElement
 //               documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
@@ -1422,14 +1659,17 @@ case object True extends Bool{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
   def value = true
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.value().
+//          display_name value
 //          documentation ```scala\ndef value: Boolean\n```
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
 case object Null extends Value{
 //          ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
+//               display_name Null
 //               documentation ```scala\ncase object Null\n```
 //          ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.productElement().
+//               display_name productElement
 //               documentation ```scala\ndef productElement(x$1: Int): Any\n```
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
@@ -1437,6 +1677,7 @@ case object Null extends Value{
 //                            ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def value = null
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.value().
+//          display_name value
 //          documentation ```scala\ndef value: Null\n```
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
diff --git a/tests/snapshots/src/main/generated/ujson/package.scala b/tests/snapshots/src/main/generated/ujson/package.scala
index b05ae3fe3..3273ae5b6 100644
--- a/tests/snapshots/src/main/generated/ujson/package.scala
+++ b/tests/snapshots/src/main/generated/ujson/package.scala
@@ -5,16 +5,21 @@ import upickle.core.NoOpVisitor
 
 package object ujson{
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.
+//                   display_name ujson
 //                   documentation ```scala\npackage object ujson\n```
   def transform[T](t: Readable, v: upickle.core.Visitor[_, T]) = t.transform(v)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
+//              display_name transform
 //              documentation ```scala\ndef transform(t: Readable, v: Visitor[local0, T[): T\n```
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().[T]
+//                display_name T
 //                documentation ```scala\nT\n```
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().(t)
+//                   display_name t
 //                   documentation ```scala\nt: Readable \n```
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().(v)
+//                                display_name v
 //                                documentation ```scala\nv: Visitor[local0, T[ \n```
 //                                 ^^^^^^^ reference semanticdb maven . . upickle/
 //                                         ^^^^ reference semanticdb maven . . upickle/core/
@@ -29,11 +34,14 @@ package object ujson{
     */
   def read(s: Readable, trace: Boolean = false): Value.Value =
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().
+//         display_name read
 //         documentation ```scala\ndef read(s: Readable, trace: Boolean): Value\n```
 //         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().(s)
+//           display_name s
 //           documentation ```scala\ns: Readable \n```
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().(trace)
+//                            display_name trace
 //                            documentation ```scala\ndefault trace: Boolean \n```
 //                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -50,8 +58,10 @@ package object ujson{
 
   def copy(t: Value.Value): Value.Value = transform(t, Value)
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.copy().
+//         display_name copy
 //         documentation ```scala\ndef copy(t: Value): Value\n```
 //         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.copy().(t)
+//           display_name t
 //           documentation ```scala\nt: Value \n```
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
@@ -66,22 +76,27 @@ package object ujson{
     */
   def write(t: Value.Value,
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().
+//          display_name write
 //          documentation ```scala\ndef write(t: Value, indent: Int, escapeUnicode: Boolean): String\n```
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(t)
+//            display_name t
 //            documentation ```scala\nt: Value \n```
 //             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
             indent: Int = -1,
 //          ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(indent)
+//                 display_name indent
 //                 documentation ```scala\ndefault indent: Int \n```
 //                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
             escapeUnicode: Boolean = false): String = {
 //          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(escapeUnicode)
+//                        display_name escapeUnicode
 //                        documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                         ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
     val writer = new java.io.StringWriter
 //      ^^^^^^ definition local 1
+//             display_name writer
 //             documentation ```scala\nwriter: StringWriter \n```
 //                   ^^^^ reference semanticdb maven . . java/
 //                        ^^ reference semanticdb maven . . java/io/
@@ -103,23 +118,28 @@ package object ujson{
     */
   def writeTo(t: Value.Value,
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().
+//            display_name writeTo
 //            documentation ```scala\ndef writeTo(t: Value, out: Writer, indent: Int, escapeUnicode: Boolean): Unit\n```
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(t)
+//              display_name t
 //              documentation ```scala\nt: Value \n```
 //               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
               out: java.io.Writer,
 //            ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(out)
+//                display_name out
 //                documentation ```scala\nout: Writer \n```
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/io/Writer#
               indent: Int = -1,
 //            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(indent)
+//                   display_name indent
 //                   documentation ```scala\ndefault indent: Int \n```
 //                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
               escapeUnicode: Boolean = false): Unit = {
 //            ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(escapeUnicode)
+//                          display_name escapeUnicode
 //                          documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -133,23 +153,28 @@ package object ujson{
   }
   def writeToOutputStream(t: Value.Value,
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().
+//                        display_name writeToOutputStream
 //                        documentation ```scala\ndef writeToOutputStream(t: Value, out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(t)
+//                          display_name t
 //                          documentation ```scala\nt: Value \n```
 //                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
                           out: java.io.OutputStream,
 //                        ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(out)
+//                            display_name out
 //                            documentation ```scala\nout: OutputStream \n```
 //                             ^^^^ reference semanticdb maven . . java/
 //                                  ^^ reference semanticdb maven . . java/io/
 //                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
                           indent: Int = -1,
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(indent)
+//                               display_name indent
 //                               documentation ```scala\ndefault indent: Int \n```
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                           escapeUnicode: Boolean = false): Unit = {
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(escapeUnicode)
+//                                      display_name escapeUnicode
 //                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -165,21 +190,26 @@ package object ujson{
 
   def writeToByteArray(t: Value.Value,
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().
+//                     display_name writeToByteArray
 //                     documentation ```scala\ndef writeToByteArray(t: Value, indent: Int, escapeUnicode: Boolean): Array[Byte]\n```
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(t)
+//                       display_name t
 //                       documentation ```scala\nt: Value \n```
 //                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(indent)
+//                            display_name indent
 //                            documentation ```scala\ndefault indent: Int \n```
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                        escapeUnicode: Boolean = false) = {
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(escapeUnicode)
+//                                   display_name escapeUnicode
 //                                   documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
     val baos = new java.io.ByteArrayOutputStream
 //      ^^^^ definition local 2
+//           display_name baos
 //           documentation ```scala\nbaos: ByteArrayOutputStream \n```
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
@@ -201,8 +231,10 @@ package object ujson{
     */
   def validate(s: Readable): Unit = transform(s, NoOpVisitor)
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.validate().
+//             display_name validate
 //             documentation ```scala\ndef validate(s: Readable): Unit\n```
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.validate().(s)
+//               display_name s
 //               documentation ```scala\ns: Readable \n```
 //                ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -215,19 +247,24 @@ package object ujson{
     */
   def reformat(s: Readable, indent: Int = -1, escapeUnicode: Boolean = false): String = {
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().
+//             display_name reformat
 //             documentation ```scala\ndef reformat(s: Readable, indent: Int, escapeUnicode: Boolean): String\n```
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(s)
+//               display_name s
 //               documentation ```scala\ns: Readable \n```
 //                ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                          ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(indent)
+//                                 display_name indent
 //                                 documentation ```scala\ndefault indent: Int \n```
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(escapeUnicode)
+//                                                          display_name escapeUnicode
 //                                                          documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
     val writer = new java.io.StringWriter()
 //      ^^^^^^ definition local 3
+//             display_name writer
 //             documentation ```scala\nwriter: StringWriter \n```
 //                   ^^^^ reference semanticdb maven . . java/
 //                        ^^ reference semanticdb maven . . java/io/
@@ -249,19 +286,24 @@ package object ujson{
     */
   def reformatTo(s: Readable, out: java.io.Writer, indent: Int = -1, escapeUnicode: Boolean = false): Unit = {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().
+//               display_name reformatTo
 //               documentation ```scala\ndef reformatTo(s: Readable, out: Writer, indent: Int, escapeUnicode: Boolean): Unit\n```
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(s)
+//                 display_name s
 //                 documentation ```scala\ns: Readable \n```
 //                  ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                            ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(out)
+//                                display_name out
 //                                documentation ```scala\nout: Writer \n```
 //                                 ^^^^ reference semanticdb maven . . java/
 //                                      ^^ reference semanticdb maven . . java/io/
 //                                         ^^^^^^ reference semanticdb maven jdk 11 java/io/Writer#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(indent)
+//                                                        display_name indent
 //                                                        documentation ```scala\ndefault indent: Int \n```
 //                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                   ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(escapeUnicode)
+//                                                                                 display_name escapeUnicode
 //                                                                                 documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                                                                  ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                                                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -279,22 +321,27 @@ package object ujson{
     */
   def reformatToOutputStream(s: Readable,
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().
+//                           display_name reformatToOutputStream
 //                           documentation ```scala\ndef reformatToOutputStream(s: Readable, out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit\n```
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(s)
+//                             display_name s
 //                             documentation ```scala\ns: Readable \n```
 //                              ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
                              out: java.io.OutputStream,
 //                           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(out)
+//                               display_name out
 //                               documentation ```scala\nout: OutputStream \n```
 //                                ^^^^ reference semanticdb maven . . java/
 //                                     ^^ reference semanticdb maven . . java/io/
 //                                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
                              indent: Int = -1,
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(indent)
+//                                  display_name indent
 //                                  documentation ```scala\ndefault indent: Int \n```
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                              escapeUnicode: Boolean = false): Unit = {
 //                           ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(escapeUnicode)
+//                                         display_name escapeUnicode
 //                                         documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                          ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
@@ -309,20 +356,25 @@ package object ujson{
   }
   def reformatToByteArray(s: Readable,
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().
+//                        display_name reformatToByteArray
 //                        documentation ```scala\ndef reformatToByteArray(s: Readable, indent: Int, escapeUnicode: Boolean): Array[Byte]\n```
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(s)
+//                          display_name s
 //                          documentation ```scala\ns: Readable \n```
 //                           ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
                           indent: Int = -1,
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(indent)
+//                               display_name indent
 //                               documentation ```scala\ndefault indent: Int \n```
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                           escapeUnicode: Boolean = false) = {
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(escapeUnicode)
+//                                      display_name escapeUnicode
 //                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
 //                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
     val baos = new java.io.ByteArrayOutputStream
 //      ^^^^ definition local 4
+//           display_name baos
 //           documentation ```scala\nbaos: ByteArrayOutputStream \n```
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
@@ -344,6 +396,7 @@ package object ujson{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Js = Value
 //     ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.Js#
+//        display_name Js
 //        documentation ```scala\ntype Js >: Value <: Value\n```
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
   @deprecated("use ujson.Value")
@@ -351,6 +404,7 @@ package object ujson{
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Js = Value
 //    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.Js.
+//       display_name Js
 //       documentation ```scala\n@deprecated\nval Js: \n```
 //         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 }

From 638d0117b17cffa1dad97f175258a2c02c4a8227 Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Mon, 11 Dec 2023 16:43:56 +0100
Subject: [PATCH 04/11] Move signature documentation to its new dedicated field

SemanticDB provides a structured version of the signature in the
signature field. Instead of turning it into a markdown-encoded string
for the documentation field, this builds a Document for the
signature_documentation field.

This also updates the ScipPrinters testing utility and the tests
accordingly.
---
 .../sourcegraph/scip_java/ScipPrinters.scala  |   9 +
 .../scip_semanticdb/ScipSemanticdb.java       |   7 +-
 .../src/main/generated/BaseByteRenderer.scala | 226 ++---
 .../src/main/generated/BaseCharRenderer.scala | 226 ++---
 .../src/main/generated/ByteParser.scala       | 806 +++++++++---------
 .../src/main/generated/CharParser.scala       | 806 +++++++++---------
 .../airbnb/epoxy/AsyncEpoxyController.java    |  18 +-
 .../com/airbnb/epoxy/AsyncEpoxyDiffer.java    | 136 +--
 .../com/airbnb/epoxy/BaseEpoxyAdapter.java    | 166 ++--
 .../airbnb/epoxy/BaseEpoxyTouchCallback.java  |  18 +-
 .../com/airbnb/epoxy/BoundViewHolders.java    |  38 +-
 .../generated/com/airbnb/epoxy/Carousel.java  | 238 +++---
 .../com/airbnb/epoxy/ControllerHelper.java    |  24 +-
 .../airbnb/epoxy/ControllerHelperLookup.java  |  38 +-
 .../com/airbnb/epoxy/ControllerModelList.java |  22 +-
 .../com/airbnb/epoxy/DebugTimer.java          |  22 +-
 .../com/airbnb/epoxy/DiffHelper.java          | 128 +--
 .../com/airbnb/epoxy/DiffPayload.java         |  48 +-
 .../com/airbnb/epoxy/DiffResult.java          |  44 +-
 .../com/airbnb/epoxy/EpoxyAdapter.java        | 150 ++--
 .../com/airbnb/epoxy/EpoxyAsyncUtil.java      |  26 +-
 .../com/airbnb/epoxy/EpoxyController.java     | 342 ++++----
 .../airbnb/epoxy/EpoxyControllerAdapter.java  | 142 +--
 .../com/airbnb/epoxy/EpoxyDiffLogger.java     |  42 +-
 .../com/airbnb/epoxy/EpoxyDragCallback.java   |  28 +-
 .../com/airbnb/epoxy/EpoxyHolder.java         |  12 +-
 .../epoxy/EpoxyItemSpacingDecorator.java      | 126 +--
 .../com/airbnb/epoxy/EpoxyModel.java          | 246 +++---
 .../com/airbnb/epoxy/EpoxyModelGroup.java     | 174 ++--
 .../airbnb/epoxy/EpoxyModelTouchCallback.java | 184 ++--
 .../airbnb/epoxy/EpoxyModelWithHolder.java    |  64 +-
 .../com/airbnb/epoxy/EpoxyModelWithView.java  |  18 +-
 .../com/airbnb/epoxy/EpoxySwipeCallback.java  |  38 +-
 .../com/airbnb/epoxy/EpoxyTouchHelper.java    | 380 ++++-----
 .../epoxy/EpoxyTouchHelperCallback.java       | 216 ++---
 .../com/airbnb/epoxy/EpoxyViewHolder.java     |  60 +-
 .../com/airbnb/epoxy/GeneratedModel.java      |  18 +-
 .../com/airbnb/epoxy/HandlerExecutor.java     |  12 +-
 .../com/airbnb/epoxy/HiddenEpoxyModel.java    |  14 +-
 .../generated/com/airbnb/epoxy/IdUtils.java   |  18 +-
 .../com/airbnb/epoxy/IllegalEpoxyUsage.java   |   6 +-
 .../airbnb/epoxy/ImmutableModelException.java |  26 +-
 .../com/airbnb/epoxy/ListenersUtils.java      |  18 +-
 .../com/airbnb/epoxy/MainThreadExecutor.java  |  10 +-
 .../generated/com/airbnb/epoxy/ModelList.java | 288 +++----
 .../com/airbnb/epoxy/ModelState.java          |  30 +-
 .../airbnb/epoxy/NoOpControllerHelper.java    |   6 +-
 .../generated/com/airbnb/epoxy/NoOpTimer.java |  10 +-
 .../com/airbnb/epoxy/NotifyBlocker.java       |  46 +-
 .../airbnb/epoxy/OnModelBoundListener.java    |  14 +-
 .../epoxy/OnModelBuildFinishedListener.java   |   6 +-
 .../epoxy/OnModelCheckedChangeListener.java   |  18 +-
 .../airbnb/epoxy/OnModelClickListener.java    |  16 +-
 .../epoxy/OnModelLongClickListener.java       |  16 +-
 .../airbnb/epoxy/OnModelUnboundListener.java  |  12 +-
 .../OnModelVisibilityChangedListener.java     |  20 +-
 ...OnModelVisibilityStateChangedListener.java |  14 +-
 .../epoxy/QuantityStringResAttribute.java     |  42 +-
 .../com/airbnb/epoxy/SimpleEpoxyAdapter.java  | 100 +--
 .../airbnb/epoxy/SimpleEpoxyController.java   |  16 +-
 .../com/airbnb/epoxy/SimpleEpoxyModel.java    |  48 +-
 .../com/airbnb/epoxy/StringAttributeData.java |  66 +-
 .../airbnb/epoxy/StyleBuilderCallback.java    |   8 +-
 .../generated/com/airbnb/epoxy/Timer.java     |   8 +-
 .../airbnb/epoxy/Typed2EpoxyController.java   |  46 +-
 .../airbnb/epoxy/Typed3EpoxyController.java   |  54 +-
 .../airbnb/epoxy/Typed4EpoxyController.java   |  62 +-
 .../airbnb/epoxy/TypedEpoxyController.java    |  40 +-
 .../generated/com/airbnb/epoxy/UpdateOp.java  |  56 +-
 .../com/airbnb/epoxy/UpdateOpHelper.java      | 104 +--
 .../com/airbnb/epoxy/ViewHolderState.java     |  92 +-
 .../com/airbnb/epoxy/ViewTypeManager.java     |  34 +-
 .../com/airbnb/epoxy/VisibilityState.java     |  22 +-
 ...rappedEpoxyModelCheckedChangeListener.java |  30 +-
 .../src/main/scala/minimized/Issue396.scala   |  24 +-
 .../src/main/scala/minimized/Issue397.scala   |   8 +-
 .../src/main/scala/minimized/Issue403.scala   |  28 +-
 .../src/main/scala/minimized/Issue412.scala   |  12 +-
 .../src/main/scala/minimized/Issue413.scala   |  22 +-
 .../src/main/scala/minimized/Issue414.scala   |  14 +-
 .../scala/minimized/Issue414Reference.scala   |   2 +-
 .../scala/minimized/MinimizedScalaMain.scala  |   6 +-
 .../minimized/MinimizedScalaSignatures.scala  | 132 +--
 .../minimized/MinimizedScalaSynthetic.scala   |  22 +-
 .../main/scala/minimized/ReflectiveCall.scala |  10 +-
 .../main/java/minimized/AbstractClasses.java  |   8 +-
 .../src/main/java/minimized/Annotations.java  |   8 +-
 .../main/java/minimized/AnonymousClasses.java |  14 +-
 .../src/main/java/minimized/Arrays.java       |  14 +-
 .../src/main/java/minimized/ClassOf.java      |   6 +-
 .../src/main/java/minimized/Docstrings.java   |  14 +-
 .../src/main/java/minimized/Enums.java        |  22 +-
 .../src/main/java/minimized/Fields.java       |  38 +-
 .../java/minimized/ForComprehensions.java     |  14 +-
 .../src/main/java/minimized/InnerClasses.java |  90 +-
 .../src/main/java/minimized/Interfaces.java   |   8 +-
 .../main/java/minimized/LombokBuilder.java    |  24 +-
 .../src/main/java/minimized/Methods.java      |  36 +-
 .../java/minimized/MinimizedJavaMain.java     |   8 +-
 .../java/minimized/ParameterizedTypes.java    |  36 +-
 .../src/main/java/minimized/Primitives.java   |  26 +-
 .../src/main/java/minimized/RawTypes.java     |   6 +-
 .../src/main/java/minimized/SubClasses.java   |  12 +-
 .../src/main/java/minimized/TabIndented.java  |  16 +-
 .../main/java/minimized/TypeVariables.java    |  30 +-
 .../main/generated/ujson/AstTransformer.scala | 150 ++--
 .../generated/ujson/ByteArrayParser.scala     |  64 +-
 .../generated/ujson/ByteBufferParser.scala    |  54 +-
 .../generated/ujson/CharSequenceParser.scala  |  44 +-
 .../src/main/generated/ujson/Exceptions.scala |  78 +-
 .../main/generated/ujson/IndexedValue.scala   | 508 +++++------
 .../generated/ujson/InputStreamParser.scala   |  32 +-
 .../src/main/generated/ujson/JsVisitor.scala  | 170 ++--
 .../src/main/generated/ujson/Readable.scala   | 116 +--
 .../src/main/generated/ujson/Renderer.scala   |  98 +--
 .../main/generated/ujson/StringParser.scala   |  52 +-
 .../main/generated/ujson/Transformer.scala    |  18 +-
 .../src/main/generated/ujson/Value.scala      | 764 ++++++++---------
 .../src/main/generated/ujson/package.scala    | 164 ++--
 119 files changed, 4876 insertions(+), 4860 deletions(-)

diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
index e257abd5c..6664d0f67 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
@@ -177,6 +177,15 @@ object ScipPrinters {
             .append(info.getDisplayName)
             .append("\n")
         }
+        if (info.hasSignatureDocumentation) {
+          out
+            .append(prefix)
+            .append("signature_documentation ")
+            .append(info.getSignatureDocumentation.getLanguage)
+            .append(" ")
+            .append(info.getSignatureDocumentation.getText.replace("\n", "\\n").replace("\t", "\\t"))
+            .append("\n")
+        }
         0.until(info.getDocumentationCount)
           .foreach { n =>
             val documentation = info.getDocumentation(n)
diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
index 5a06af821..b0d2d05b0 100644
--- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
@@ -194,7 +194,12 @@ private void processTypedDocument(
           String language =
               doc.semanticdb.getLanguage().toString().toLowerCase(Locale.ROOT).intern();
           String signature = new SignatureFormatter(info, symtab).formatSymbol();
-          scipInfo.addDocumentation("```" + language + "\n" + signature + "\n```");
+          Scip.Document.Builder signatureDocumentation =
+              Scip.Document.newBuilder()
+                  .setRelativePath(relativePath)
+                  .setLanguage(language)
+                  .setText(signature);
+          scipInfo.setSignatureDocumentation(signatureDocumentation);
         }
         String documentation = info.getDocumentation().getMessage();
         if (!documentation.isEmpty()) {
diff --git a/tests/snapshots/src/main/generated/BaseByteRenderer.scala b/tests/snapshots/src/main/generated/BaseByteRenderer.scala
index be4ae23bb..4e599d507 100644
--- a/tests/snapshots/src/main/generated/BaseByteRenderer.scala
+++ b/tests/snapshots/src/main/generated/BaseByteRenderer.scala
@@ -3,7 +3,7 @@ package ujson
 import scala.annotation.switch
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
 import upickle.core.{ArrVisitor, ObjVisitor}
 //     ^^^^^^^ reference semanticdb maven . . upickle/
 //             ^^^^ reference semanticdb maven . . upickle/core/
@@ -24,15 +24,15 @@ import upickle.core.{ArrVisitor, ObjVisitor}
 class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
 //                     display_name BaseByteRenderer
-//                     documentation ```scala\nclass BaseByteRenderer[T <: Output]\n```
+//                     signature_documentation scala class BaseByteRenderer[T <: Output]
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer.
 //    ________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer.
 //                     display_name BaseByteRenderer
-//                     documentation ```scala\nobject BaseByteRenderer\n```
+//                     signature_documentation scala object BaseByteRenderer
 //                     relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                       display_name T
-//                       documentation ```scala\nT <: Output\n```
+//                       signature_documentation scala T <: Output
 //                          ^^^^^^^ reference semanticdb maven . . upickle/
 //                                  ^^^^ reference semanticdb maven . . upickle/core/
 //                                       ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.
@@ -40,33 +40,33 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
                       (out: T,
 //                     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
 //                         display_name out
-//                         documentation ```scala\nprivate[this] val out: T\n```
+//                         signature_documentation scala private[this] val out: T
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(out)
 //                     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(out)
 //                         display_name out
-//                         documentation ```scala\nout: T \n```
+//                         signature_documentation scala out: T 
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
 //                            display_name indent
-//                            documentation ```scala\nprivate[this] val indent: Int\n```
+//                            signature_documentation scala private[this] val indent: Int
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(indent)
 //                     ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(indent)
 //                            display_name indent
-//                            documentation ```scala\ndefault indent: Int \n```
+//                            signature_documentation scala default indent: Int 
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                        escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
 //                                   display_name escapeUnicode
-//                                   documentation ```scala\nprivate[this] val escapeUnicode: Boolean\n```
+//                                   signature_documentation scala private[this] val escapeUnicode: Boolean
 //                                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(escapeUnicode)
 //                     _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(escapeUnicode)
 //                                   display_name escapeUnicode
-//                                   documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                   signature_documentation scala default escapeUnicode: Boolean 
 //                                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
-//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -74,7 +74,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   private[this] val elemBuilder = new upickle.core.ByteBuilder
 //                  ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                              display_name elemBuilder
-//                              documentation ```scala\nprivate[this] val elemBuilder: ByteBuilder\n```
+//                              signature_documentation scala private[this] val elemBuilder: ByteBuilder
 //                                    ^^^^^^^ reference semanticdb maven . . upickle/
 //                                            ^^^^ reference semanticdb maven . . upickle/core/
 //                                                 ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#
@@ -82,7 +82,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   private[this] val unicodeCharBuilder = new upickle.core.CharBuilder()
 //                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#unicodeCharBuilder.
 //                                     display_name unicodeCharBuilder
-//                                     documentation ```scala\nprivate[this] val unicodeCharBuilder: CharBuilder\n```
+//                                     signature_documentation scala private[this] val unicodeCharBuilder: CharBuilder
 //                                           ^^^^^^^ reference semanticdb maven . . upickle/
 //                                                   ^^^^ reference semanticdb maven . . upickle/core/
 //                                                        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -90,39 +90,39 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def flushByteBuilder() = {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushByteBuilder().
 //                     display_name flushByteBuilder
-//                     documentation ```scala\ndef flushByteBuilder(): Unit\n```
+//                     signature_documentation scala def flushByteBuilder(): Unit
     elemBuilder.writeOutToIfLongerThan(out, if (depth == 0) 0 else 1000)
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#writeOutToIfLongerThan().
 //                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
   }
 
   private[this] var depth: Int = 0
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
 //                        display_name depth
-//                        documentation ```scala\nprivate[this] var depth: Int\n```
+//                        signature_documentation scala private[this] var depth: Int
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`depth_=`().
 //                        display_name depth_=
-//                        documentation ```scala\nprivate[this] var depth_=(x$1: Int): Unit\n```
+//                        signature_documentation scala private[this] var depth_=(x$1: Int): Unit
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
 
   private[this] var commaBuffered = false
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
 //                                display_name commaBuffered
-//                                documentation ```scala\nprivate[this] var commaBuffered: Boolean\n```
+//                                signature_documentation scala private[this] var commaBuffered: Boolean
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`commaBuffered_=`().
 //                                display_name commaBuffered_=
-//                                documentation ```scala\nprivate[this] var commaBuffered_=(x$1: Boolean): Unit\n```
+//                                signature_documentation scala private[this] var commaBuffered_=(x$1: Boolean): Unit
 //                                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
 
   def flushBuffer() = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
 //                display_name flushBuffer
-//                documentation ```scala\ndef flushBuffer(): Unit\n```
+//                signature_documentation scala def flushBuffer(): Unit
     if (commaBuffered) {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
       commaBuffered = false
@@ -137,19 +137,19 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def visitArray(length: Int, index: Int) = new ArrVisitor[T, T] {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().
 //               display_name visitArray
-//               documentation ```scala\ndef visitArray(length: Int, index: Int): { def subVisitor: BaseByteRenderer[T] }\n```
+//               signature_documentation scala def visitArray(length: Int, index: Int): { def subVisitor: BaseByteRenderer[T] }
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().(length)
 //                      display_name length
-//                      documentation ```scala\nlength: Int \n```
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                      signature_documentation scala length: Int 
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().(index)
 //                                  display_name index
-//                                  documentation ```scala\nindex: Int \n```
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                  signature_documentation scala index: Int 
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                              ^ definition local 1
 //                                                display_name $anon
-//                                                documentation ```scala\nfinal class $anon\n```
+//                                                signature_documentation scala final class $anon
 //                                              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -162,29 +162,29 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
     depth += 1
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     renderIndent()
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
     def subVisitor = BaseByteRenderer.this
 //      ^^^^^^^^^^ definition local 0
 //                 display_name subVisitor
-//                 documentation ```scala\ndef subVisitor: BaseByteRenderer[T]\n```
+//                 signature_documentation scala def subVisitor: BaseByteRenderer[T]
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 2
 //                 display_name visitValue
-//                 documentation ```scala\ndef visitValue(v: T, index: Int): Unit\n```
+//                 signature_documentation scala def visitValue(v: T, index: Int): Unit
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 4
 //                   display_name v
-//                   documentation ```scala\nv: T \n```
+//                   signature_documentation scala v: T 
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                       ^^^^^ definition local 5
 //                             display_name index
-//                             documentation ```scala\nindex: Int \n```
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             signature_documentation scala index: Int 
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       flushBuffer()
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
       commaBuffered = true
@@ -193,17 +193,17 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
     def visitEnd(index: Int) = {
 //      ^^^^^^^^ definition local 3
 //               display_name visitEnd
-//               documentation ```scala\ndef visitEnd(index: Int): T\n```
+//               signature_documentation scala def visitEnd(index: Int): T
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 6
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
       depth -= 1
 //    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
       renderIndent()
 //    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
       elemBuilder.append(']')
@@ -219,19 +219,19 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def visitObject(length: Int, index: Int) = new ObjVisitor[T, T] {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().
 //                display_name visitObject
-//                documentation ```scala\ndef visitObject(length: Int, index: Int): { def subVisitor: BaseByteRenderer[T]; def visitKey(index: Int): BaseByteRenderer[T] }\n```
+//                signature_documentation scala def visitObject(length: Int, index: Int): { def subVisitor: BaseByteRenderer[T]; def visitKey(index: Int): BaseByteRenderer[T] }
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().(length)
 //                       display_name length
-//                       documentation ```scala\nlength: Int \n```
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                       signature_documentation scala length: Int 
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().(index)
 //                                   display_name index
-//                                   documentation ```scala\nindex: Int \n```
-//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                   signature_documentation scala index: Int 
+//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^ definition local 10
 //                                                 display_name $anon
-//                                                 documentation ```scala\nfinal class $anon\n```
+//                                                 signature_documentation scala final class $anon
 //                                               ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -243,75 +243,75 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
     depth += 1
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     renderIndent()
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
     def subVisitor = BaseByteRenderer.this
 //      ^^^^^^^^^^ definition local 7
 //                 display_name subVisitor
-//                 documentation ```scala\ndef subVisitor: BaseByteRenderer[T]\n```
+//                 signature_documentation scala def subVisitor: BaseByteRenderer[T]
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitKey(index: Int) = BaseByteRenderer.this
 //      ^^^^^^^^ definition local 8
 //               display_name visitKey
-//               documentation ```scala\ndef visitKey(index: Int): BaseByteRenderer[T]\n```
+//               signature_documentation scala def visitKey(index: Int): BaseByteRenderer[T]
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition local 9
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitKeyValue(s: Any): Unit = {
 //      ^^^^^^^^^^^^^ definition local 11
 //                    display_name visitKeyValue
-//                    documentation ```scala\ndef visitKeyValue(s: Any): Unit\n```
+//                    signature_documentation scala def visitKeyValue(s: Any): Unit
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition local 14
 //                      display_name s
-//                      documentation ```scala\ns: Any \n```
+//                      signature_documentation scala s: Any 
 //                       ^^^ reference semanticdb maven . . scala/Any#
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       elemBuilder.append(':')
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
       if (indent != -1) elemBuilder.append(' ')
 //        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+3).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+3).
 //                      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
     }
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 12
 //                 display_name visitValue
-//                 documentation ```scala\ndef visitValue(v: T, index: Int): Unit\n```
+//                 signature_documentation scala def visitValue(v: T, index: Int): Unit
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 15
 //                   display_name v
-//                   documentation ```scala\nv: T \n```
+//                   signature_documentation scala v: T 
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                       ^^^^^ definition local 16
 //                             display_name index
-//                             documentation ```scala\nindex: Int \n```
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             signature_documentation scala index: Int 
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       commaBuffered = true
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
     }
     def visitEnd(index: Int) = {
 //      ^^^^^^^^ definition local 13
 //               display_name visitEnd
-//               documentation ```scala\ndef visitEnd(index: Int): T\n```
+//               signature_documentation scala def visitEnd(index: Int): T
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 17
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
       depth -= 1
 //    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
       renderIndent()
 //    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
       elemBuilder.append('}')
@@ -327,12 +327,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def visitNull(index: Int) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNull().
 //              display_name visitNull
-//              documentation ```scala\ndef visitNull(index: Int): T\n```
+//              signature_documentation scala def visitNull(index: Int): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNull().(index)
 //                    display_name index
-//                    documentation ```scala\nindex: Int \n```
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                    signature_documentation scala index: Int 
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     elemBuilder.ensureLength(4)
@@ -359,12 +359,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def visitFalse(index: Int) = {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFalse().
 //               display_name visitFalse
-//               documentation ```scala\ndef visitFalse(index: Int): T\n```
+//               signature_documentation scala def visitFalse(index: Int): T
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFalse().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     elemBuilder.ensureLength(5)
@@ -394,12 +394,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def visitTrue(index: Int) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitTrue().
 //              display_name visitTrue
-//              documentation ```scala\ndef visitTrue(index: Int): T\n```
+//              signature_documentation scala def visitTrue(index: Int): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitTrue().(index)
 //                    display_name index
-//                    documentation ```scala\nindex: Int \n```
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                    signature_documentation scala index: Int 
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     elemBuilder.ensureLength(4)
@@ -426,24 +426,24 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().
 //                            display_name visitFloat64StringParts
-//                            documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): T\n```
+//                            signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): T
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(s)
 //                              display_name s
-//                              documentation ```scala\ns: CharSequence \n```
+//                              signature_documentation scala s: CharSequence 
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(decIndex)
 //                                                      display_name decIndex
-//                                                      documentation ```scala\ndecIndex: Int \n```
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                      signature_documentation scala decIndex: Int 
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
-//                                                                     documentation ```scala\nexpIndex: Int \n```
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                     signature_documentation scala expIndex: Int 
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(index)
 //                                                                                 display_name index
-//                                                                                 documentation ```scala\nindex: Int \n```
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                 signature_documentation scala index: Int 
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     elemBuilder.ensureLength(s.length())
@@ -454,16 +454,16 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
     var i = 0
 //      ^ definition local 18
 //        display_name i
-//        documentation ```scala\ni: Int \n```
+//        signature_documentation scala i: Int 
     val sLength = s.length
 //      ^^^^^^^ definition local 19
 //              display_name sLength
-//              documentation ```scala\nsLength: Int \n```
+//              signature_documentation scala sLength: Int 
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(s)
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     while(i < sLength){
 //        ^ reference local 18
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+3).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+3).
 //            ^^^^^^^ reference local 19
       elemBuilder.appendUnsafeC(s.charAt(i))
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
@@ -473,7 +473,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                       ^ reference local 18
       i += 1
 //    ^ reference local 18
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     }
     flushByteBuilder()
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushByteBuilder().
@@ -484,31 +484,31 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   override def visitFloat64(d: Double, index: Int) = {
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().
 //                          display_name visitFloat64
-//                          documentation ```scala\ndef visitFloat64(d: Double, index: Int): T\n```
+//                          signature_documentation scala def visitFloat64(d: Double, index: Int): T
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(d)
 //                            display_name d
-//                            documentation ```scala\nd: Double \n```
-//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
+//                            signature_documentation scala d: Double 
+//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(index)
 //                                           display_name index
-//                                           documentation ```scala\nindex: Int \n```
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           signature_documentation scala index: Int 
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     d match{
 //  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(d)
       case Double.PositiveInfinity => visitNonNullString("Infinity", -1)
-//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.
-//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.PositiveInfinity.
+//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.
+//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.PositiveInfinity.
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
       case Double.NegativeInfinity => visitNonNullString("-Infinity", -1)
-//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.
-//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.NegativeInfinity.
+//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.
+//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.NegativeInfinity.
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
       case d if java.lang.Double.isNaN(d) => visitNonNullString("NaN", -1)
 //         ^ definition local 21
 //           display_name d
-//           documentation ```scala\nd: Double \n```
+//           signature_documentation scala d: Double 
 //              ^^^^ reference semanticdb maven . . java/
 //                   ^^^^ reference semanticdb maven . . java/lang/
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Double#
@@ -518,16 +518,16 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
       case d =>
 //         ^ definition local 22
 //           display_name d
-//           documentation ```scala\nd: Double \n```
+//           signature_documentation scala d: Double 
         val i = d.toInt
 //          ^ definition local 23
 //            display_name i
-//            documentation ```scala\ni: Int \n```
+//            signature_documentation scala i: Int 
 //              ^ reference local 22
-//                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toInt().
+//                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toInt().
         if (d == i) visitFloat64StringParts(i.toString, -1, -1, index)
 //          ^ reference local 22
-//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#`==`(+3).
+//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#`==`(+3).
 //               ^ reference local 23
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().
 //                                          ^ reference local 23
@@ -550,16 +550,16 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def visitString(s: CharSequence, index: Int) = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().
 //                display_name visitString
-//                documentation ```scala\ndef visitString(s: CharSequence, index: Int): T\n```
+//                signature_documentation scala def visitString(s: CharSequence, index: Int): T
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().(s)
 //                  display_name s
-//                  documentation ```scala\ns: CharSequence \n```
+//                  signature_documentation scala s: CharSequence 
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().(index)
 //                                       display_name index
-//                                       documentation ```scala\nindex: Int \n```
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                       signature_documentation scala index: Int 
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     if (s eq null) visitNull(index)
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().(s)
@@ -575,15 +575,15 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   def visitNonNullString(s: CharSequence, index: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
 //                       display_name visitNonNullString
-//                       documentation ```scala\ndef visitNonNullString(s: CharSequence, index: Int): T\n```
+//                       signature_documentation scala def visitNonNullString(s: CharSequence, index: Int): T
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().(s)
 //                         display_name s
-//                         documentation ```scala\ns: CharSequence \n```
+//                         signature_documentation scala s: CharSequence 
 //                          ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().(index)
 //                                              display_name index
-//                                              documentation ```scala\nindex: Int \n```
-//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                              signature_documentation scala index: Int 
+//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     upickle.core.RenderUtils.escapeByte(unicodeCharBuilder, elemBuilder, s, escapeUnicode)
@@ -604,35 +604,35 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
   final def renderIndent() = {
 //          ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
 //                       display_name renderIndent
-//                       documentation ```scala\nfinal def renderIndent(): Unit\n```
+//                       signature_documentation scala final def renderIndent(): Unit
     if (indent == -1) ()
 //      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
-//             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
     else {
       var i = indent * depth
 //        ^ definition local 24
 //          display_name i
-//          documentation ```scala\ni: Int \n```
+//          signature_documentation scala i: Int 
 //            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
-//                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`*`(+3).
+//                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`*`(+3).
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
       elemBuilder.ensureLength(i + 1)
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#ensureLength().
 //                             ^ reference local 24
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       elemBuilder.appendUnsafe('\n')
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#appendUnsafe().
       while(i > 0) {
 //          ^ reference local 24
-//            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>`(+3).
+//            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>`(+3).
         elemBuilder.appendUnsafe(' ')
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#appendUnsafe().
         i -= 1
 //      ^ reference local 24
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
       }
     }
   }
diff --git a/tests/snapshots/src/main/generated/BaseCharRenderer.scala b/tests/snapshots/src/main/generated/BaseCharRenderer.scala
index 3bff02ebb..bfb581d54 100644
--- a/tests/snapshots/src/main/generated/BaseCharRenderer.scala
+++ b/tests/snapshots/src/main/generated/BaseCharRenderer.scala
@@ -3,7 +3,7 @@ package ujson
 import scala.annotation.switch
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
 import upickle.core.{ArrVisitor, ObjVisitor}
 //     ^^^^^^^ reference semanticdb maven . . upickle/
 //             ^^^^ reference semanticdb maven . . upickle/core/
@@ -24,15 +24,15 @@ import upickle.core.{ArrVisitor, ObjVisitor}
 class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
 //                     display_name BaseCharRenderer
-//                     documentation ```scala\nclass BaseCharRenderer[T <: Output]\n```
+//                     signature_documentation scala class BaseCharRenderer[T <: Output]
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer.
 //    ________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer.
 //                     display_name BaseCharRenderer
-//                     documentation ```scala\nobject BaseCharRenderer\n```
+//                     signature_documentation scala object BaseCharRenderer
 //                     relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                       display_name T
-//                       documentation ```scala\nT <: Output\n```
+//                       signature_documentation scala T <: Output
 //                          ^^^^^^^ reference semanticdb maven . . upickle/
 //                                  ^^^^ reference semanticdb maven . . upickle/core/
 //                                       ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.
@@ -40,33 +40,33 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
                       (out: T,
 //                     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
 //                         display_name out
-//                         documentation ```scala\nprivate[this] val out: T\n```
+//                         signature_documentation scala private[this] val out: T
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(out)
 //                     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(out)
 //                         display_name out
-//                         documentation ```scala\nout: T \n```
+//                         signature_documentation scala out: T 
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
 //                            display_name indent
-//                            documentation ```scala\nprivate[this] val indent: Int\n```
+//                            signature_documentation scala private[this] val indent: Int
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(indent)
 //                     ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(indent)
 //                            display_name indent
-//                            documentation ```scala\ndefault indent: Int \n```
+//                            signature_documentation scala default indent: Int 
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                        escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
 //                                   display_name escapeUnicode
-//                                   documentation ```scala\nprivate[this] val escapeUnicode: Boolean\n```
+//                                   signature_documentation scala private[this] val escapeUnicode: Boolean
 //                                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(escapeUnicode)
 //                     _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(escapeUnicode)
 //                                   display_name escapeUnicode
-//                                   documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                   signature_documentation scala default escapeUnicode: Boolean 
 //                                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
-//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -74,7 +74,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   private[this] val elemBuilder = new upickle.core.CharBuilder
 //                  ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                              display_name elemBuilder
-//                              documentation ```scala\nprivate[this] val elemBuilder: CharBuilder\n```
+//                              signature_documentation scala private[this] val elemBuilder: CharBuilder
 //                                    ^^^^^^^ reference semanticdb maven . . upickle/
 //                                            ^^^^ reference semanticdb maven . . upickle/core/
 //                                                 ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -82,7 +82,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   private[this] val unicodeCharBuilder = new upickle.core.CharBuilder()
 //                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#unicodeCharBuilder.
 //                                     display_name unicodeCharBuilder
-//                                     documentation ```scala\nprivate[this] val unicodeCharBuilder: CharBuilder\n```
+//                                     signature_documentation scala private[this] val unicodeCharBuilder: CharBuilder
 //                                           ^^^^^^^ reference semanticdb maven . . upickle/
 //                                                   ^^^^ reference semanticdb maven . . upickle/core/
 //                                                        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -90,39 +90,39 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def flushCharBuilder() = {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushCharBuilder().
 //                     display_name flushCharBuilder
-//                     documentation ```scala\ndef flushCharBuilder(): Unit\n```
+//                     signature_documentation scala def flushCharBuilder(): Unit
     elemBuilder.writeOutToIfLongerThan(out, if (depth == 0) 0 else 1000)
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#writeOutToIfLongerThan().
 //                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
   }
 
   private[this] var depth: Int = 0
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
 //                        display_name depth
-//                        documentation ```scala\nprivate[this] var depth: Int\n```
+//                        signature_documentation scala private[this] var depth: Int
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`depth_=`().
 //                        display_name depth_=
-//                        documentation ```scala\nprivate[this] var depth_=(x$1: Int): Unit\n```
+//                        signature_documentation scala private[this] var depth_=(x$1: Int): Unit
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
 
   private[this] var commaBuffered = false
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
 //                                display_name commaBuffered
-//                                documentation ```scala\nprivate[this] var commaBuffered: Boolean\n```
+//                                signature_documentation scala private[this] var commaBuffered: Boolean
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`commaBuffered_=`().
 //                                display_name commaBuffered_=
-//                                documentation ```scala\nprivate[this] var commaBuffered_=(x$1: Boolean): Unit\n```
+//                                signature_documentation scala private[this] var commaBuffered_=(x$1: Boolean): Unit
 //                                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
 
   def flushBuffer() = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
 //                display_name flushBuffer
-//                documentation ```scala\ndef flushBuffer(): Unit\n```
+//                signature_documentation scala def flushBuffer(): Unit
     if (commaBuffered) {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
       commaBuffered = false
@@ -137,19 +137,19 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def visitArray(length: Int, index: Int) = new ArrVisitor[T, T] {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().
 //               display_name visitArray
-//               documentation ```scala\ndef visitArray(length: Int, index: Int): { def subVisitor: BaseCharRenderer[T] }\n```
+//               signature_documentation scala def visitArray(length: Int, index: Int): { def subVisitor: BaseCharRenderer[T] }
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().(length)
 //                      display_name length
-//                      documentation ```scala\nlength: Int \n```
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                      signature_documentation scala length: Int 
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().(index)
 //                                  display_name index
-//                                  documentation ```scala\nindex: Int \n```
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                  signature_documentation scala index: Int 
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                              ^ definition local 1
 //                                                display_name $anon
-//                                                documentation ```scala\nfinal class $anon\n```
+//                                                signature_documentation scala final class $anon
 //                                              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -162,29 +162,29 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
     depth += 1
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     renderIndent()
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
     def subVisitor = BaseCharRenderer.this
 //      ^^^^^^^^^^ definition local 0
 //                 display_name subVisitor
-//                 documentation ```scala\ndef subVisitor: BaseCharRenderer[T]\n```
+//                 signature_documentation scala def subVisitor: BaseCharRenderer[T]
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 2
 //                 display_name visitValue
-//                 documentation ```scala\ndef visitValue(v: T, index: Int): Unit\n```
+//                 signature_documentation scala def visitValue(v: T, index: Int): Unit
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 4
 //                   display_name v
-//                   documentation ```scala\nv: T \n```
+//                   signature_documentation scala v: T 
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                       ^^^^^ definition local 5
 //                             display_name index
-//                             documentation ```scala\nindex: Int \n```
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             signature_documentation scala index: Int 
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       flushBuffer()
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
       commaBuffered = true
@@ -193,17 +193,17 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
     def visitEnd(index: Int) = {
 //      ^^^^^^^^ definition local 3
 //               display_name visitEnd
-//               documentation ```scala\ndef visitEnd(index: Int): T\n```
+//               signature_documentation scala def visitEnd(index: Int): T
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 6
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
       depth -= 1
 //    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
       renderIndent()
 //    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
       elemBuilder.append(']')
@@ -219,19 +219,19 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def visitObject(length: Int, index: Int) = new ObjVisitor[T, T] {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().
 //                display_name visitObject
-//                documentation ```scala\ndef visitObject(length: Int, index: Int): { def subVisitor: BaseCharRenderer[T]; def visitKey(index: Int): BaseCharRenderer[T] }\n```
+//                signature_documentation scala def visitObject(length: Int, index: Int): { def subVisitor: BaseCharRenderer[T]; def visitKey(index: Int): BaseCharRenderer[T] }
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().(length)
 //                       display_name length
-//                       documentation ```scala\nlength: Int \n```
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                       signature_documentation scala length: Int 
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().(index)
 //                                   display_name index
-//                                   documentation ```scala\nindex: Int \n```
-//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                   signature_documentation scala index: Int 
+//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^ definition local 10
 //                                                 display_name $anon
-//                                                 documentation ```scala\nfinal class $anon\n```
+//                                                 signature_documentation scala final class $anon
 //                                               ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -243,75 +243,75 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
     depth += 1
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     renderIndent()
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
     def subVisitor = BaseCharRenderer.this
 //      ^^^^^^^^^^ definition local 7
 //                 display_name subVisitor
-//                 documentation ```scala\ndef subVisitor: BaseCharRenderer[T]\n```
+//                 signature_documentation scala def subVisitor: BaseCharRenderer[T]
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitKey(index: Int) = BaseCharRenderer.this
 //      ^^^^^^^^ definition local 8
 //               display_name visitKey
-//               documentation ```scala\ndef visitKey(index: Int): BaseCharRenderer[T]\n```
+//               signature_documentation scala def visitKey(index: Int): BaseCharRenderer[T]
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition local 9
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitKeyValue(s: Any): Unit = {
 //      ^^^^^^^^^^^^^ definition local 11
 //                    display_name visitKeyValue
-//                    documentation ```scala\ndef visitKeyValue(s: Any): Unit\n```
+//                    signature_documentation scala def visitKeyValue(s: Any): Unit
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition local 14
 //                      display_name s
-//                      documentation ```scala\ns: Any \n```
+//                      signature_documentation scala s: Any 
 //                       ^^^ reference semanticdb maven . . scala/Any#
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       elemBuilder.append(':')
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
       if (indent != -1) elemBuilder.append(' ')
 //        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+3).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+3).
 //                      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
     }
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 12
 //                 display_name visitValue
-//                 documentation ```scala\ndef visitValue(v: T, index: Int): Unit\n```
+//                 signature_documentation scala def visitValue(v: T, index: Int): Unit
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 15
 //                   display_name v
-//                   documentation ```scala\nv: T \n```
+//                   signature_documentation scala v: T 
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                       ^^^^^ definition local 16
 //                             display_name index
-//                             documentation ```scala\nindex: Int \n```
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             signature_documentation scala index: Int 
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       commaBuffered = true
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
     }
     def visitEnd(index: Int) = {
 //      ^^^^^^^^ definition local 13
 //               display_name visitEnd
-//               documentation ```scala\ndef visitEnd(index: Int): T\n```
+//               signature_documentation scala def visitEnd(index: Int): T
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 17
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
       depth -= 1
 //    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
       renderIndent()
 //    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
       elemBuilder.append('}')
@@ -327,12 +327,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def visitNull(index: Int) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNull().
 //              display_name visitNull
-//              documentation ```scala\ndef visitNull(index: Int): T\n```
+//              signature_documentation scala def visitNull(index: Int): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNull().(index)
 //                    display_name index
-//                    documentation ```scala\nindex: Int \n```
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                    signature_documentation scala index: Int 
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     elemBuilder.ensureLength(4)
@@ -359,12 +359,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def visitFalse(index: Int) = {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFalse().
 //               display_name visitFalse
-//               documentation ```scala\ndef visitFalse(index: Int): T\n```
+//               signature_documentation scala def visitFalse(index: Int): T
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFalse().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     elemBuilder.ensureLength(5)
@@ -394,12 +394,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def visitTrue(index: Int) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitTrue().
 //              display_name visitTrue
-//              documentation ```scala\ndef visitTrue(index: Int): T\n```
+//              signature_documentation scala def visitTrue(index: Int): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitTrue().(index)
 //                    display_name index
-//                    documentation ```scala\nindex: Int \n```
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                    signature_documentation scala index: Int 
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     elemBuilder.ensureLength(4)
@@ -426,24 +426,24 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().
 //                            display_name visitFloat64StringParts
-//                            documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): T\n```
+//                            signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): T
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(s)
 //                              display_name s
-//                              documentation ```scala\ns: CharSequence \n```
+//                              signature_documentation scala s: CharSequence 
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(decIndex)
 //                                                      display_name decIndex
-//                                                      documentation ```scala\ndecIndex: Int \n```
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                      signature_documentation scala decIndex: Int 
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
-//                                                                     documentation ```scala\nexpIndex: Int \n```
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                     signature_documentation scala expIndex: Int 
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(index)
 //                                                                                 display_name index
-//                                                                                 documentation ```scala\nindex: Int \n```
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                 signature_documentation scala index: Int 
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     elemBuilder.ensureLength(s.length())
@@ -454,16 +454,16 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
     var i = 0
 //      ^ definition local 18
 //        display_name i
-//        documentation ```scala\ni: Int \n```
+//        signature_documentation scala i: Int 
     val sLength = s.length
 //      ^^^^^^^ definition local 19
 //              display_name sLength
-//              documentation ```scala\nsLength: Int \n```
+//              signature_documentation scala sLength: Int 
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(s)
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     while(i < sLength){
 //        ^ reference local 18
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+3).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+3).
 //            ^^^^^^^ reference local 19
       elemBuilder.appendUnsafeC(s.charAt(i))
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
@@ -473,7 +473,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                       ^ reference local 18
       i += 1
 //    ^ reference local 18
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     }
     flushCharBuilder()
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushCharBuilder().
@@ -484,31 +484,31 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   override def visitFloat64(d: Double, index: Int) = {
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().
 //                          display_name visitFloat64
-//                          documentation ```scala\ndef visitFloat64(d: Double, index: Int): T\n```
+//                          signature_documentation scala def visitFloat64(d: Double, index: Int): T
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(d)
 //                            display_name d
-//                            documentation ```scala\nd: Double \n```
-//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
+//                            signature_documentation scala d: Double 
+//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(index)
 //                                           display_name index
-//                                           documentation ```scala\nindex: Int \n```
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           signature_documentation scala index: Int 
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     d match{
 //  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(d)
       case Double.PositiveInfinity => visitNonNullString("Infinity", -1)
-//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.
-//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.PositiveInfinity.
+//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.
+//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.PositiveInfinity.
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
       case Double.NegativeInfinity => visitNonNullString("-Infinity", -1)
-//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.
-//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.NegativeInfinity.
+//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.
+//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.NegativeInfinity.
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
       case d if java.lang.Double.isNaN(d) => visitNonNullString("NaN", -1)
 //         ^ definition local 21
 //           display_name d
-//           documentation ```scala\nd: Double \n```
+//           signature_documentation scala d: Double 
 //              ^^^^ reference semanticdb maven . . java/
 //                   ^^^^ reference semanticdb maven . . java/lang/
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Double#
@@ -518,16 +518,16 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
       case d =>
 //         ^ definition local 22
 //           display_name d
-//           documentation ```scala\nd: Double \n```
+//           signature_documentation scala d: Double 
         val i = d.toInt
 //          ^ definition local 23
 //            display_name i
-//            documentation ```scala\ni: Int \n```
+//            signature_documentation scala i: Int 
 //              ^ reference local 22
-//                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toInt().
+//                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toInt().
         if (d == i) visitFloat64StringParts(i.toString, -1, -1, index)
 //          ^ reference local 22
-//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#`==`(+3).
+//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#`==`(+3).
 //               ^ reference local 23
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().
 //                                          ^ reference local 23
@@ -550,16 +550,16 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def visitString(s: CharSequence, index: Int) = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().
 //                display_name visitString
-//                documentation ```scala\ndef visitString(s: CharSequence, index: Int): T\n```
+//                signature_documentation scala def visitString(s: CharSequence, index: Int): T
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().(s)
 //                  display_name s
-//                  documentation ```scala\ns: CharSequence \n```
+//                  signature_documentation scala s: CharSequence 
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().(index)
 //                                       display_name index
-//                                       documentation ```scala\nindex: Int \n```
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                       signature_documentation scala index: Int 
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     if (s eq null) visitNull(index)
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().(s)
@@ -575,15 +575,15 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   def visitNonNullString(s: CharSequence, index: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
 //                       display_name visitNonNullString
-//                       documentation ```scala\ndef visitNonNullString(s: CharSequence, index: Int): T\n```
+//                       signature_documentation scala def visitNonNullString(s: CharSequence, index: Int): T
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().(s)
 //                         display_name s
-//                         documentation ```scala\ns: CharSequence \n```
+//                         signature_documentation scala s: CharSequence 
 //                          ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().(index)
 //                                              display_name index
-//                                              documentation ```scala\nindex: Int \n```
-//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                              signature_documentation scala index: Int 
+//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     upickle.core.RenderUtils.escapeChar(unicodeCharBuilder, elemBuilder, s, escapeUnicode)
@@ -604,35 +604,35 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
   final def renderIndent() = {
 //          ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
 //                       display_name renderIndent
-//                       documentation ```scala\nfinal def renderIndent(): Unit\n```
+//                       signature_documentation scala final def renderIndent(): Unit
     if (indent == -1) ()
 //      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
-//             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
     else {
       var i = indent * depth
 //        ^ definition local 24
 //          display_name i
-//          documentation ```scala\ni: Int \n```
+//          signature_documentation scala i: Int 
 //            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
-//                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`*`(+3).
+//                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`*`(+3).
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
       elemBuilder.ensureLength(i + 1)
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#ensureLength().
 //                             ^ reference local 24
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       elemBuilder.appendUnsafe('\n')
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#appendUnsafe().
       while(i > 0) {
 //          ^ reference local 24
-//            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>`(+3).
+//            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>`(+3).
         elemBuilder.appendUnsafe(' ')
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#appendUnsafe().
         i -= 1
 //      ^ reference local 24
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
       }
     }
   }
diff --git a/tests/snapshots/src/main/generated/ByteParser.scala b/tests/snapshots/src/main/generated/ByteParser.scala
index 48793d3e4..171081dd2 100644
--- a/tests/snapshots/src/main/generated/ByteParser.scala
+++ b/tests/snapshots/src/main/generated/ByteParser.scala
@@ -26,8 +26,8 @@ import java.nio.charset.Charset
 import scala.annotation.{switch, tailrec}
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
-//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
+//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
+//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
 
 /**
   * A specialized JSON parse that can parse Bytes (Chars or Bytes), sending
@@ -40,27 +40,27 @@ import scala.annotation.{switch, tailrec}
 abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#
 //                        display_name ByteParser
-//                        documentation ```scala\nabstract class ByteParser[J]\n```
+//                        signature_documentation scala abstract class ByteParser[J]
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                          display_name J
-//                          documentation ```scala\nJ\n```
+//                          signature_documentation scala J
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#`<init>`().
 //                             display_name <init>
-//                             documentation ```scala\ndef this()\n```
+//                             signature_documentation scala def this()
 //                                   ^^^^^^^ reference semanticdb maven . . upickle/
 //                                           ^^^^ reference semanticdb maven . . upickle/core/
 //                                                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#
   private[this] val elemOps = upickle.core.ByteOps
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                          display_name elemOps
-//                          documentation ```scala\nprivate[this] val elemOps: \n```
+//                          signature_documentation scala private[this] val elemOps: 
 //                            ^^^^^^^ reference semanticdb maven . . upickle/
 //                                    ^^^^ reference semanticdb maven . . upickle/core/
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.
   private[this] val outputBuilder = new upickle.core.ByteBuilder()
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                display_name outputBuilder
-//                                documentation ```scala\nprivate[this] val outputBuilder: ByteBuilder\n```
+//                                signature_documentation scala private[this] val outputBuilder: ByteBuilder
 //                                      ^^^^^^^ reference semanticdb maven . . upickle/
 //                                              ^^^^ reference semanticdb maven . . upickle/core/
 //                                                   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#
@@ -69,11 +69,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   def requestUntilOrThrow(i: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                        display_name requestUntilOrThrow
-//                        documentation ```scala\ndef requestUntilOrThrow(i: Int): Unit\n```
+//                        signature_documentation scala def requestUntilOrThrow(i: Int): Unit
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().(i)
 //                          display_name i
-//                          documentation ```scala\ni: Int \n```
-//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                          signature_documentation scala i: Int 
+//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if (requestUntil(i)) throw new IncompleteParseException("exhausted input")
 //      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#requestUntil().
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().(i)
@@ -83,13 +83,13 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   override def getByteSafe(i: Int): Byte = {
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                         display_name getByteSafe
-//                         documentation ```scala\ndef getByteSafe(i: Int): Byte\n```
+//                         signature_documentation scala def getByteSafe(i: Int): Byte
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteSafe().
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().(i)
 //                           display_name i
-//                           documentation ```scala\ni: Int \n```
-//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                           signature_documentation scala i: Int 
+//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
     requestUntilOrThrow(i)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().(i)
@@ -104,11 +104,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] def atEof(i: Int) = requestUntil(i)
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                          display_name atEof
-//                          documentation ```scala\ndef atEof(i: Int): Boolean\n```
+//                          signature_documentation scala def atEof(i: Int): Boolean
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().(i)
 //                            display_name i
-//                            documentation ```scala\ni: Int \n```
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                            signature_documentation scala i: Int 
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#requestUntil().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().(i)
 
@@ -118,57 +118,57 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] def close(): Unit
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 //                          display_name close
-//                          documentation ```scala\ndef close(): Unit\n```
+//                          signature_documentation scala def close(): Unit
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#close().
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 
   /**
    * Valid parser states.
    */
   @inline private[this] final val ARRBEG = 6
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
 //                                       display_name ARRBEG
-//                                       documentation ```scala\n@inline\nprivate[this] final val ARRBEG: 6\n```
+//                                       signature_documentation scala @inline\nprivate[this] final val ARRBEG: 6
   @inline private[this] final val OBJBEG = 7
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
 //                                       display_name OBJBEG
-//                                       documentation ```scala\n@inline\nprivate[this] final val OBJBEG: 7\n```
+//                                       signature_documentation scala @inline\nprivate[this] final val OBJBEG: 7
   @inline private[this] final val DATA = 1
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
 //                                     display_name DATA
-//                                     documentation ```scala\n@inline\nprivate[this] final val DATA: 1\n```
+//                                     signature_documentation scala @inline\nprivate[this] final val DATA: 1
   @inline private[this] final val KEY = 2
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#KEY.
 //                                    display_name KEY
-//                                    documentation ```scala\n@inline\nprivate[this] final val KEY: 2\n```
+//                                    signature_documentation scala @inline\nprivate[this] final val KEY: 2
   @inline private[this] final val COLON = 3
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#COLON.
 //                                      display_name COLON
-//                                      documentation ```scala\n@inline\nprivate[this] final val COLON: 3\n```
+//                                      signature_documentation scala @inline\nprivate[this] final val COLON: 3
   @inline private[this] final val ARREND = 4
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARREND.
 //                                       display_name ARREND
-//                                       documentation ```scala\n@inline\nprivate[this] final val ARREND: 4\n```
+//                                       signature_documentation scala @inline\nprivate[this] final val ARREND: 4
   @inline private[this] final val OBJEND = 5
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJEND.
 //                                       display_name OBJEND
-//                                       documentation ```scala\n@inline\nprivate[this] final val OBJEND: 5\n```
+//                                       signature_documentation scala @inline\nprivate[this] final val OBJEND: 5
 
   /**
     * Parse the JSON document into a single JSON value.
@@ -180,29 +180,29 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   final def parse(facade: Visitor[_, J]): J = {
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().
 //                display_name parse
-//                documentation ```scala\nfinal def parse(facade: Visitor[local0, J[): J\n```
+//                signature_documentation scala final def parse(facade: Visitor[local0, J[): J
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().(facade)
 //                       display_name facade
-//                       documentation ```scala\nfacade: Visitor[local0, J[ \n```
+//                       signature_documentation scala facade: Visitor[local0, J[ 
 //                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     val (value, i) = parseTopLevel(0, facade)
 //       ^^^^^ definition local 2
 //             display_name value
-//             documentation ```scala\nvalue: J \n```
+//             signature_documentation scala value: J 
 //              ^ definition local 3
 //                display_name i
-//                documentation ```scala\ni: Int \n```
+//                signature_documentation scala i: Int 
 //                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().(facade)
     var j = i
 //      ^ definition local 4
 //        display_name j
-//        documentation ```scala\nj: Int \n```
+//        signature_documentation scala j: Int 
 //          ^ reference local 3
     while (!atEof(j)) {
-//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`unary_!`().
+//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                ^ reference local 4
       (getByteSafe(j): @switch) match {
@@ -210,14 +210,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                 ^ reference local 4
         case '\n' | ' ' | '\t' | '\r' => j += 1
 //                                       ^ reference local 4
-//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         case _ => die(j, "expected whitespace or eof")
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                    ^ reference local 4
       }
     }
     if (!atEof(j)) die(j, "expected eof")
-//      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`unary_!`().
+//      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
 //       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //             ^ reference local 4
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
@@ -234,20 +234,20 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] def die(i: Int, msg: String): Nothing = {
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                        display_name die
-//                        documentation ```scala\ndef die(i: Int, msg: String): Nothing\n```
+//                        signature_documentation scala def die(i: Int, msg: String): Nothing
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(i)
 //                          display_name i
-//                          documentation ```scala\ni: Int \n```
-//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                          signature_documentation scala i: Int 
+//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(msg)
 //                                    display_name msg
-//                                    documentation ```scala\nmsg: String \n```
-//                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                    signature_documentation scala msg: String 
+//                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                              ^^^^^^^ reference semanticdb maven . . scala/Nothing#
     val out = new upickle.core.ByteBuilder()
 //      ^^^ definition local 6
 //          display_name out
-//          documentation ```scala\nout: ByteBuilder \n```
+//          signature_documentation scala out: ByteBuilder 
 //                ^^^^^^^ reference semanticdb maven . . upickle/
 //                        ^^^^ reference semanticdb maven . . upickle/core/
 //                             ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#
@@ -265,22 +265,22 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       out,
 //    ^^^ reference local 6
       new ArrayCharSequence(Array(elemOps.toInt(getByteSafe(i)).toChar)),
-//        ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrayCharSequence#
-//                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrayCharSequence#`<init>`().
-//                          ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array.
+//        ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrayCharSequence#
+//                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrayCharSequence#`<init>`().
+//                          ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array.
 //                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.toInt().
 //                                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(i)
-//                                                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#toChar().
+//                                                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#toChar().
       unicode = false
 //    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.escapeByte().(unicode)
     )
     val s = "%s got %s" format (msg, out.makeString())
 //      ^ definition local 7
 //        display_name s
-//        documentation ```scala\ns: String \n```
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/StringOps#format().
+//        signature_documentation scala s: String 
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/StringOps#format().
 //                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(msg)
 //                                   ^^^ reference local 6
 //                                       ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#makeString().
@@ -303,49 +303,49 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[_, J]): Int = {
 //                          ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().
 //                                   display_name parseNum
-//                                   documentation ```scala\nfinal def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[local8, J[): Int\n```
+//                                   signature_documentation scala final def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[local8, J[): Int
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
 //                                     display_name i
-//                                     documentation ```scala\ni: Int \n```
-//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                     signature_documentation scala i: Int 
+//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(ctxt)
 //                                                display_name ctxt
-//                                                documentation ```scala\nctxt: ObjArrVisitor[Any, J] \n```
+//                                                signature_documentation scala ctxt: ObjArrVisitor[Any, J] 
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                               ^^^ reference semanticdb maven . . scala/Any#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(facade)
 //                                                                               display_name facade
-//                                                                               documentation ```scala\nfacade: Visitor[local8, J[ \n```
+//                                                                               signature_documentation scala facade: Visitor[local8, J[ 
 //                                                                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var j = i
 //      ^ definition local 9
 //        display_name j
-//        documentation ```scala\nj: Int \n```
+//        signature_documentation scala j: Int 
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
     var c = getByteSafe(j)
 //      ^ definition local 10
 //        display_name c
-//        documentation ```scala\nc: Byte \n```
+//        signature_documentation scala c: Byte 
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                      ^ reference local 9
     var decIndex = -1
 //      ^^^^^^^^ definition local 11
 //               display_name decIndex
-//               documentation ```scala\ndecIndex: Int \n```
+//               signature_documentation scala decIndex: Int 
     var expIndex = -1
 //      ^^^^^^^^ definition local 12
 //               display_name expIndex
-//               documentation ```scala\nexpIndex: Int \n```
+//               signature_documentation scala expIndex: Int 
 
     if (c == '-') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -353,10 +353,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     }
     if (c == '0') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -365,7 +365,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val j0 = j
 //        ^^ definition local 13
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -373,7 +373,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 10
         j += 1;
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -381,7 +381,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j == j0) die(i, "expected digit")
 //        ^ reference local 9
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //             ^^ reference local 13
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
@@ -389,15 +389,15 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == '.') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       decIndex = j - i
 //    ^^^^^^^^ reference local 11
 //               ^ reference local 9
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -405,7 +405,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val j0 = j
 //        ^^ definition local 15
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -413,7 +413,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 10
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -421,7 +421,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 15
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //              ^ reference local 9
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
@@ -429,31 +429,31 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == 'e' || c == 'E') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                  ^ reference local 10
-//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       expIndex = j - i
 //    ^^^^^^^^ reference local 12
 //               ^ reference local 9
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                    ^ reference local 9
       if (c == '+' || c == '-') {
 //        ^ reference local 10
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                    ^ reference local 10
-//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -462,7 +462,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val j0 = j
 //        ^^ definition local 17
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -470,7 +470,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 10
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -478,7 +478,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j0 == j)  die(i, "expected digit")
 //        ^^ reference local 17
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //              ^ reference local 9
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
@@ -501,32 +501,32 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   def visitFloat64StringPartsWithWrapper(facade: Visitor[_, J],
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().
 //                                       display_name visitFloat64StringPartsWithWrapper
-//                                       documentation ```scala\ndef visitFloat64StringPartsWithWrapper(facade: Visitor[local19, J[, decIndex: Int, expIndex: Int, i: Int, j: Int): J\n```
+//                                       signature_documentation scala def visitFloat64StringPartsWithWrapper(facade: Visitor[local19, J[, decIndex: Int, expIndex: Int, i: Int, j: Int): J
 //                                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(facade)
 //                                              display_name facade
-//                                              documentation ```scala\nfacade: Visitor[local19, J[ \n```
+//                                              signature_documentation scala facade: Visitor[local19, J[ 
 //                                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
                                          decIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(decIndex)
 //                                                display_name decIndex
-//                                                documentation ```scala\ndecIndex: Int \n```
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                signature_documentation scala decIndex: Int 
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          expIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(expIndex)
 //                                                display_name expIndex
-//                                                documentation ```scala\nexpIndex: Int \n```
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                signature_documentation scala expIndex: Int 
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          i: Int,
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(i)
 //                                         display_name i
-//                                         documentation ```scala\ni: Int \n```
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                         signature_documentation scala i: Int 
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          j: Int) = {
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(j)
 //                                         display_name j
-//                                         documentation ```scala\nj: Int \n```
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                         signature_documentation scala j: Int 
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     facade.visitFloat64StringParts(
 //  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(facade)
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
@@ -534,7 +534,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(i)
 //                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(j)
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(i)
       decIndex,
 //    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(decIndex)
@@ -562,45 +562,45 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseNumTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().
 //                                           display_name parseNumTopLevel
-//                                           documentation ```scala\nfinal def parseNumTopLevel(i: Int, facade: Visitor[local20, J[): (J, Int)\n```
+//                                           signature_documentation scala final def parseNumTopLevel(i: Int, facade: Visitor[local20, J[): (J, Int)
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
 //                                             display_name i
-//                                             documentation ```scala\ni: Int \n```
-//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                             signature_documentation scala i: Int 
+//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(facade)
 //                                                          display_name facade
-//                                                          documentation ```scala\nfacade: Visitor[local20, J[ \n```
+//                                                          signature_documentation scala facade: Visitor[local20, J[ 
 //                                                           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var j = i
 //      ^ definition local 21
 //        display_name j
-//        documentation ```scala\nj: Int \n```
+//        signature_documentation scala j: Int 
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
     var c = getByteSafe(j)
 //      ^ definition local 22
 //        display_name c
-//        documentation ```scala\nc: Byte \n```
+//        signature_documentation scala c: Byte 
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                      ^ reference local 21
     var decIndex = -1
 //      ^^^^^^^^ definition local 23
 //               display_name decIndex
-//               documentation ```scala\ndecIndex: Int \n```
+//               signature_documentation scala decIndex: Int 
     var expIndex = -1
 //      ^^^^^^^^ definition local 24
 //               display_name expIndex
-//               documentation ```scala\nexpIndex: Int \n```
+//               signature_documentation scala expIndex: Int 
 
     if (c == '-') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       // any valid input will require at least one digit after -
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -608,10 +608,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     }
     if (c == '0') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       if (atEof(j)) {
 //        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //              ^ reference local 21
@@ -632,7 +632,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val j0 = j
 //        ^^ definition local 25
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -640,7 +640,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                ^ reference local 21
@@ -660,7 +660,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 25
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //              ^ reference local 21
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
@@ -668,16 +668,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == '.') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       // any valid input will require at least one digit after .
       decIndex = j - i
 //    ^^^^^^^^ reference local 23
 //               ^ reference local 21
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -685,7 +685,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val j0 = j
 //        ^^ definition local 27
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -693,7 +693,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                ^ reference local 21
@@ -713,7 +713,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if(j0 == j) die(i, "expected digit")
 //       ^^ reference local 27
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //             ^ reference local 21
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
@@ -721,32 +721,32 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == 'e' || c == 'E') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                  ^ reference local 22
-//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       // any valid input will require at least one digit after e, e+, etc
       expIndex = j - i
 //    ^^^^^^^^ reference local 24
 //               ^ reference local 21
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                    ^ reference local 21
       if (c == '+' || c == '-') {
 //        ^ reference local 22
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                    ^ reference local 22
-//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 22
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -755,7 +755,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val j0 = j
 //        ^^ definition local 29
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -763,7 +763,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                ^ reference local 21
@@ -783,7 +783,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 29
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //              ^ reference local 21
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
@@ -808,12 +808,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def descape(i: Int): Char = {
 //                          ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().
 //                                  display_name descape
-//                                  documentation ```scala\nfinal def descape(i: Int): Char\n```
+//                                  signature_documentation scala final def descape(i: Int): Char
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
 //                                    display_name i
-//                                    documentation ```scala\ni: Int \n```
-//                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
+//                                    signature_documentation scala i: Int 
+//                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
     import upickle.core.RenderUtils.hex
 //         ^^^^^^^ reference semanticdb maven . . upickle/
 //                 ^^^^ reference semanticdb maven . . upickle/core/
@@ -822,50 +822,50 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     var x = 0
 //      ^ definition local 31
 //        display_name x
-//        documentation ```scala\nx: Int \n```
+//        signature_documentation scala x: Int 
     x = (x << 4) | hex(getByteSafe(i+2).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#toInt().
     x = (x << 4) | hex(getByteSafe(i+3).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#toInt().
     x = (x << 4) | hex(getByteSafe(i+4).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#toInt().
     x = (x << 4) | hex(getByteSafe(i+5).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#toInt().
     x.toChar
 //  ^ reference local 31
-//    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#toChar().
+//    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#toChar().
   }
 
 
@@ -877,36 +877,36 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseTrue(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().
 //                                    display_name parseTrue
-//                                    documentation ```scala\nfinal def parseTrue(i: Int, facade: Visitor[local32, J[): J\n```
+//                                    signature_documentation scala final def parseTrue(i: Int, facade: Visitor[local32, J[): J
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
 //                                      display_name i
-//                                      documentation ```scala\ni: Int \n```
-//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                      signature_documentation scala i: Int 
+//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(facade)
 //                                                   display_name facade
-//                                                   documentation ```scala\nfacade: Visitor[local32, J[ \n```
+//                                                   signature_documentation scala facade: Visitor[local32, J[ 
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     requestUntilOrThrow(i + 3)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (getByteUnsafe(i + 1) == 'r' && getByteUnsafe(i + 2) == 'u' && getByteUnsafe(i + 3) == 'e') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       facade.visitTrue(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(facade)
 //           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
@@ -926,42 +926,42 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseFalse(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().
 //                                     display_name parseFalse
-//                                     documentation ```scala\nfinal def parseFalse(i: Int, facade: Visitor[local33, J[): J\n```
+//                                     signature_documentation scala final def parseFalse(i: Int, facade: Visitor[local33, J[): J
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
 //                                       display_name i
-//                                       documentation ```scala\ni: Int \n```
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                       signature_documentation scala i: Int 
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(facade)
 //                                                    display_name facade
-//                                                    documentation ```scala\nfacade: Visitor[local33, J[ \n```
+//                                                    signature_documentation scala facade: Visitor[local33, J[ 
 //                                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     requestUntilOrThrow(i + 4)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
     if (getByteUnsafe(i + 1) == 'a' && getByteUnsafe(i + 2) == 'l' && getByteUnsafe(i + 3) == 's' && getByteUnsafe(i + 4) == 'e') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                                                                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                                                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                                                                                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                                                                                                                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                                                                                        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                                                                                                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                                                                                        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       facade.visitFalse(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(facade)
 //           ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
@@ -981,36 +981,36 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseNull(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().
 //                                    display_name parseNull
-//                                    documentation ```scala\nfinal def parseNull(i: Int, facade: Visitor[local34, J[): J\n```
+//                                    signature_documentation scala final def parseNull(i: Int, facade: Visitor[local34, J[): J
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
 //                                      display_name i
-//                                      documentation ```scala\ni: Int \n```
-//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                      signature_documentation scala i: Int 
+//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(facade)
 //                                                   display_name facade
-//                                                   documentation ```scala\nfacade: Visitor[local34, J[ \n```
+//                                                   signature_documentation scala facade: Visitor[local34, J[ 
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     requestUntilOrThrow(i + 3)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (getByteUnsafe(i + 1) == 'u' && getByteUnsafe(i + 2) == 'l' && getByteUnsafe(i + 3) == 'l') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
       facade.visitNull(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(facade)
 //           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
@@ -1025,18 +1025,18 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().
 //                                        display_name parseTopLevel
-//                                        documentation ```scala\nfinal def parseTopLevel(i: Int, facade: Visitor[local35, J[): (J, Int)\n```
+//                                        signature_documentation scala final def parseTopLevel(i: Int, facade: Visitor[local35, J[): (J, Int)
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(i)
 //                                          display_name i
-//                                          documentation ```scala\ni: Int \n```
-//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                          signature_documentation scala i: Int 
+//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(facade)
 //                                                       display_name facade
-//                                                       documentation ```scala\nfacade: Visitor[local35, J[ \n```
+//                                                       signature_documentation scala facade: Visitor[local35, J[ 
 //                                                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     try parseTopLevel0(i, facade)
 //      ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(i)
@@ -1049,23 +1049,23 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    * Parse and return the next JSON value and the position beyond it.
    */
   @tailrec
-// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
+// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseTopLevel0(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                                         display_name parseTopLevel0
-//                                         documentation ```scala\n@tailrec\nfinal def parseTopLevel0(i: Int, facade: Visitor[local38, J[): (J, Int)\n```
+//                                         signature_documentation scala @tailrec\nfinal def parseTopLevel0(i: Int, facade: Visitor[local38, J[): (J, Int)
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
 //                                           display_name i
-//                                           documentation ```scala\ni: Int \n```
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           signature_documentation scala i: Int 
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                                        display_name facade
-//                                                        documentation ```scala\nfacade: Visitor[local38, J[ \n```
+//                                                        signature_documentation scala facade: Visitor[local38, J[ 
 //                                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     (getByteSafe(i): @switch) match {
 //   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
@@ -1073,12 +1073,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       case ' ' | '\t' | 'r' => parseTopLevel0(i + 1, facade)
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                   ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
       case '\n' => parseTopLevel0(i + 1, facade)
 //                 ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                       ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 
       // if we have a recursive top-level structure, we'll delegate the parsing
@@ -1087,20 +1087,20 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                           ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Nil.
+//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Nil.
       case '{' => parseNested(OBJBEG, i + 1, facade.visitObject(-1, i), Nil)
 //                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                           ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                                  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Nil.
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Nil.
 
       // we have a single top-level number
       case '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' => parseNumTopLevel(i, facade)
@@ -1120,19 +1120,19 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
 //                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       case 'f' => (parseFalse(i, facade), i + 5)
 //                 ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       case 'n' => (parseNull(i, facade), i + 4)
 //                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
 //                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
       // invalid
       case _ => die(i, "expected json value")
@@ -1144,21 +1144,21 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   def reject(j: Int): PartialFunction[Throwable, Nothing] = {
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().
 //           display_name reject
-//           documentation ```scala\ndef reject(j: Int): PartialFunction[Throwable, Nothing]\n```
+//           signature_documentation scala def reject(j: Int): PartialFunction[Throwable, Nothing]
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().(j)
 //             display_name j
-//             documentation ```scala\nj: Int \n```
-//              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/PartialFunction#
-//                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Throwable#
+//             signature_documentation scala j: Int 
+//              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/PartialFunction#
+//                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Throwable#
 //                                               ^^^^^^^ reference semanticdb maven . . scala/Nothing#
 //                                                          ^ definition local 39
 //                                                            display_name $anonfun
-//                                                            documentation ```scala\n@SerialVersionUID\nfinal class $anonfun\n```
+//                                                            signature_documentation scala @SerialVersionUID\nfinal class $anonfun
     case e: Abort =>
 //       ^ definition local 46
 //         display_name e
-//         documentation ```scala\ne: Abort \n```
+//         signature_documentation scala e: Abort 
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort#
       throw new AbortException(e.msg, j, -1, -1, e)
 //              ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException#
@@ -1186,36 +1186,36 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    * @param path the json path in the tree
    */
   @tailrec
-// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
+// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseNested(state: Int,
 //                          ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                      display_name parseNested
-//                                      documentation ```scala\n@tailrec\nfinal def parseNested(state: Int, i: Int, stackHead: ObjArrVisitor[local50, J[, stackTail: List[ObjArrVisitor[local51, J[]): (J, Int)\n```
+//                                      signature_documentation scala @tailrec\nfinal def parseNested(state: Int, i: Int, stackHead: ObjArrVisitor[local50, J[, stackTail: List[ObjArrVisitor[local51, J[]): (J, Int)
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(state)
 //                                            display_name state
-//                                            documentation ```scala\nstate: Int \n```
-//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                            signature_documentation scala state: Int 
+//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                         i: Int,
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
 //                                        display_name i
-//                                        documentation ```scala\ni: Int \n```
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                        signature_documentation scala i: Int 
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                         stackHead: ObjArrVisitor[_, J],
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                display_name stackHead
-//                                                documentation ```scala\nstackHead: ObjArrVisitor[local50, J[ \n```
+//                                                signature_documentation scala stackHead: ObjArrVisitor[local50, J[ 
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
                                         stackTail: List[ObjArrVisitor[_, J]]) : (J, Int) = {
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                                display_name stackTail
-//                                                documentation ```scala\nstackTail: List[ObjArrVisitor[local51, J[] \n```
-//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
+//                                                signature_documentation scala stackTail: List[ObjArrVisitor[local51, J[] 
+//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     (getByteSafe(i): @switch) match{
 //   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
@@ -1224,7 +1224,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(state)
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
@@ -1237,7 +1237,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
             val nextJ = try parseStringKey(i, stackHead) catch reject(i)
 //              ^^^^^ definition local 52
 //                    display_name nextJ
-//                    documentation ```scala\nnextJ: Int \n```
+//                    signature_documentation scala nextJ: Int 
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
 //                                            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
@@ -1256,7 +1256,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
             val nextJ = try parseStringValue(i, stackHead) catch reject(i)
 //              ^^^^^ definition local 55
 //                    display_name nextJ
-//                    documentation ```scala\nnextJ: Int \n```
+//                    signature_documentation scala nextJ: Int 
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().
 //                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
 //                                              ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
@@ -1285,7 +1285,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
           case _ => dieWithFailureMessage(i, state)
@@ -1302,7 +1302,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
         val ctx =
 //          ^^^ definition local 58
 //              display_name ctx
-//              documentation ```scala\nctx: ArrVisitor[local59, J[ \n```
+//              signature_documentation scala ctx: ArrVisitor[local59, J[ 
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitArray(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1318,10 +1318,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                 ^^^ reference local 58
 //                                      ^^^^^^^^^ reference local 62
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#`::`().
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#`::`().
 //                                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
       case '{' =>
@@ -1332,7 +1332,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
         val ctx =
 //          ^^^ definition local 63
 //              display_name ctx
-//              documentation ```scala\nctx: ObjVisitor[local64, J[ \n```
+//              signature_documentation scala ctx: ObjVisitor[local64, J[ 
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitObject(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1348,10 +1348,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                 ^^^ reference local 63
 //                                      ^^^^^^^^^ reference local 67
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#`::`().
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#`::`().
 //                                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
       case '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' =>
@@ -1362,7 +1362,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
         val ctx =
 //          ^^^ definition local 68
 //              display_name ctx
-//              documentation ```scala\nctx: Int \n```
+//              signature_documentation scala ctx: Int 
           try parseNum(i, stackHead.narrow, stackHead.subVisitor.asInstanceOf[Visitor[_, J]])
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
@@ -1412,7 +1412,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
@@ -1444,7 +1444,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
@@ -1476,7 +1476,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
@@ -1491,7 +1491,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                   ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
           case OBJEND => parseNested(KEY, i + 1, stackHead, stackTail)
@@ -1499,7 +1499,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                   ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#KEY.
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
           case _ => dieWithFailureMessage(i, state)
@@ -1520,28 +1520,28 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                        ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
               case Some(t) => t
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                      ^ definition local 77
 //                        display_name t
-//                        documentation ```scala\nt: (J, Int) \n```
+//                        signature_documentation scala t: (J, Int) 
 //                            ^ reference local 77
               case None =>
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 78
 //                                display_name stackTailHead
-//                                documentation ```scala\nstackTailHead: ObjArrVisitor[local51, J[ \n```
+//                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
-//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
+//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                           ^^^^^^^^^^^^^ reference local 78
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                                  ^^^^^^^^^^^^^ reference local 78
 //                                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
-//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#tail().
+//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#tail().
             }
           case _ => dieWithFailureMessage(i, state)
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().
@@ -1561,28 +1561,28 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                        ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
               case Some(t) => t
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                      ^ definition local 79
 //                        display_name t
-//                        documentation ```scala\nt: (J, Int) \n```
+//                        signature_documentation scala t: (J, Int) 
 //                            ^ reference local 79
               case None =>
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 80
 //                                display_name stackTailHead
-//                                documentation ```scala\nstackTailHead: ObjArrVisitor[local51, J[ \n```
+//                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
-//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
+//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                           ^^^^^^^^^^^^^ reference local 80
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                                  ^^^^^^^^^^^^^ reference local 80
 //                                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
-//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#tail().
+//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#tail().
             }
           case _ => dieWithFailureMessage(i, state)
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().
@@ -1601,19 +1601,19 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   def dieWithFailureMessage(i: Int, state: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().
 //                          display_name dieWithFailureMessage
-//                          documentation ```scala\ndef dieWithFailureMessage(i: Int, state: Int): Nothing\n```
+//                          signature_documentation scala def dieWithFailureMessage(i: Int, state: Int): Nothing
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(i)
 //                            display_name i
-//                            documentation ```scala\ni: Int \n```
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                            signature_documentation scala i: Int 
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(state)
 //                                        display_name state
-//                                        documentation ```scala\nstate: Int \n```
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                        signature_documentation scala state: Int 
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     val expected = state match{
 //      ^^^^^^^^ definition local 81
 //               display_name expected
-//               documentation ```scala\nexpected: String \n```
+//               signature_documentation scala expected: String 
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(state)
       case ARRBEG => "json value or ]"
 //         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
@@ -1633,22 +1633,22 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     die(i, s"expected $expected")
 //  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(i)
-//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
 //                     ^^^^^^^^ reference local 81
   }
 
   def failIfNotData(state: Int, i: Int) = (state: @switch) match{
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().
 //                  display_name failIfNotData
-//                  documentation ```scala\ndef failIfNotData(state: Int, i: Int): Unit\n```
+//                  signature_documentation scala def failIfNotData(state: Int, i: Int): Unit
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(state)
 //                        display_name state
-//                        documentation ```scala\nstate: Int \n```
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                        signature_documentation scala state: Int 
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(i)
 //                                display_name i
-//                                documentation ```scala\ni: Int \n```
-//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                signature_documentation scala i: Int 
+//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(state)
     case DATA | ARRBEG => // do nothing
 //       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
@@ -1662,41 +1662,41 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   def tryCloseCollection(stackHead: ObjArrVisitor[_, J], stackTail: List[ObjArrVisitor[_, J]], i: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().
 //                       display_name tryCloseCollection
-//                       documentation ```scala\ndef tryCloseCollection(stackHead: ObjArrVisitor[local82, J[, stackTail: List[ObjArrVisitor[local83, J[], i: Int): Option[(J, Int)]\n```
+//                       signature_documentation scala def tryCloseCollection(stackHead: ObjArrVisitor[local82, J[, stackTail: List[ObjArrVisitor[local83, J[], i: Int): Option[(J, Int)]
 //                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackHead)
 //                                 display_name stackHead
-//                                 documentation ```scala\nstackHead: ObjArrVisitor[local82, J[ \n```
+//                                 signature_documentation scala stackHead: ObjArrVisitor[local82, J[ 
 //                                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
 //                                                                 display_name stackTail
-//                                                                 documentation ```scala\nstackTail: List[ObjArrVisitor[local83, J[] \n```
-//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
+//                                                                 signature_documentation scala stackTail: List[ObjArrVisitor[local83, J[] 
+//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
 //                                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
 //                                                                                               display_name i
-//                                                                                               documentation ```scala\ni: Int \n```
-//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                               signature_documentation scala i: Int 
+//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if (stackTail.isEmpty) {
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
-//                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#isEmpty().
+//                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#isEmpty().
       Some(try stackHead.visitEnd(i) catch reject(i), i + 1)
-//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackHead)
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
 //                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
-//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     } else {
       val ctxt2 = stackTail.head.narrow
 //        ^^^^^ definition local 86
 //              display_name ctxt2
-//              documentation ```scala\nctxt2: ObjArrVisitor[Any, J] \n```
+//              signature_documentation scala ctxt2: ObjArrVisitor[Any, J] 
 //                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
-//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
+//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#narrow().
       try ctxt2.visitValue(stackHead.visitEnd(i), i) catch reject(i)
 //        ^^^^^ reference local 86
@@ -1708,17 +1708,17 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
       None
-//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
 
     }
   }
   def collectionEndFor(stackHead: ObjArrVisitor[_, _]) = {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                     display_name collectionEndFor
-//                     documentation ```scala\ndef collectionEndFor(stackHead: ObjArrVisitor[local89, local90[): Int\n```
+//                     signature_documentation scala def collectionEndFor(stackHead: ObjArrVisitor[local89, local90[): Int
 //                     ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().(stackHead)
 //                               display_name stackHead
-//                               documentation ```scala\nstackHead: ObjArrVisitor[local89, local90[ \n```
+//                               signature_documentation scala stackHead: ObjArrVisitor[local89, local90[ 
 //                                ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
     if (stackHead.isObj) OBJEND
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().(stackHead)
@@ -1738,46 +1738,46 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseStringSimple(i: Int): Int = {
 //                          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                                            display_name parseStringSimple
-//                                            documentation ```scala\nfinal def parseStringSimple(i: Int): Int\n```
+//                                            signature_documentation scala final def parseStringSimple(i: Int): Int
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().(i)
 //                                              display_name i
-//                                              documentation ```scala\ni: Int \n```
-//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                              signature_documentation scala i: Int 
+//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var j = i
 //      ^ definition local 91
 //        display_name j
-//        documentation ```scala\nj: Int \n```
+//        signature_documentation scala j: Int 
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().(i)
     var c = elemOps.toUnsignedInt(getByteSafe(j))
 //      ^ definition local 92
 //        display_name c
-//        documentation ```scala\nc: Int \n```
+//        signature_documentation scala c: Int 
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.toUnsignedInt().
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                            ^ reference local 91
     while (c != '"') {
 //         ^ reference local 92
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+2).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+2).
       if (c < ' ') die(j, s"control char (${c}) in string")
 //        ^ reference local 92
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+2).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+2).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference local 91
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
 //                                          ^ reference local 92
       if (c == '\\' || c > 127) return -1 - j
 //        ^ reference local 92
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+2).
-//                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+2).
+//                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                     ^ reference local 92
-//                       ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>`(+3).
-//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                       ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>`(+3).
+//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                          ^ reference local 91
       j += 1
 //    ^ reference local 91
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = elemOps.toUnsignedInt(getByteSafe(j))
 //    ^ reference local 92
 //        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -1787,7 +1787,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     }
     j + 1
 //  ^ reference local 91
-//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
   }
 
   /**
@@ -1796,91 +1796,91 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseStringComplex(i0: Int): Int = {
 //                          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().
 //                                             display_name parseStringComplex
-//                                             documentation ```scala\nfinal def parseStringComplex(i0: Int): Int\n```
+//                                             signature_documentation scala final def parseStringComplex(i0: Int): Int
 //                                             ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().(i0)
 //                                                display_name i0
-//                                                documentation ```scala\ni0: Int \n```
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                signature_documentation scala i0: Int 
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var i = i0
 //      ^ definition local 94
 //        display_name i
-//        documentation ```scala\ni: Int \n```
+//        signature_documentation scala i: Int 
 //          ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().(i0)
     var c = elemOps.toUnsignedInt(getByteSafe(i))
 //      ^ definition local 95
 //        display_name c
-//        documentation ```scala\nc: Int \n```
+//        signature_documentation scala c: Int 
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.toUnsignedInt().
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                            ^ reference local 94
     while (c != '"') {
 //         ^ reference local 95
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+2).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+2).
 
       if (c < ' ') die(i, s"control char (${c}) in string")
 //        ^ reference local 95
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+2).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+2).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference local 94
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
 //                                          ^ reference local 95
       else if (c == '\\') {
 //             ^ reference local 95
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+2).
         (getByteSafe(i + 1): @switch) match {
 //       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                   ^ reference local 94
-//                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 'b' => { outputBuilder.append('\b'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 'f' => { outputBuilder.append('\f'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 'n' => { outputBuilder.append('\n'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 'r' => { outputBuilder.append('\r'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 't' => { outputBuilder.append('\t'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
           case '"' => { outputBuilder.append('"'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                 ^ reference local 94
-//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case '/' => { outputBuilder.append('/'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                 ^ reference local 94
-//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case '\\' => { outputBuilder.append('\\'); i += 2 }
 //                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                   ^ reference local 94
-//                                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
           // if there's a problem then descape will explode
           case 'u' =>
             val d = descape(i)
 //              ^ definition local 97
 //                display_name d
-//                documentation ```scala\nd: Char \n```
+//                signature_documentation scala d: Char 
 //                  ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().
 //                          ^ reference local 94
             outputBuilder.appendC(d)
@@ -1890,16 +1890,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
             i += 6
 //          ^ reference local 94
-//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
           case c => die(i + 1, s"illegal escape sequence after \\")
 //             ^ definition local 98
 //               display_name c
-//               documentation ```scala\nc: Byte \n```
+//               signature_documentation scala c: Byte 
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                      ^ reference local 94
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
         }
       } else {
         // this case is for "normal" code points that are just one Char.
@@ -1913,7 +1913,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                           ^ reference local 95
         i += 1
 //      ^ reference local 94
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       }
       c = elemOps.toUnsignedInt(getByteSafe(i))
 //    ^ reference local 95
@@ -1925,7 +1925,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     i + 1
 //  ^ reference local 94
-//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
   }
 
   /**
@@ -1939,38 +1939,38 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseStringValue(i: Int, stackHead: ObjArrVisitor[_, J]): Int = {
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().
 //                                           display_name parseStringValue
-//                                           documentation ```scala\nfinal def parseStringValue(i: Int, stackHead: ObjArrVisitor[local99, J[): Int\n```
+//                                           signature_documentation scala final def parseStringValue(i: Int, stackHead: ObjArrVisitor[local99, J[): Int
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
 //                                             display_name i
-//                                             documentation ```scala\ni: Int \n```
-//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                             signature_documentation scala i: Int 
+//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(stackHead)
 //                                                             display_name stackHead
-//                                                             documentation ```scala\nstackHead: ObjArrVisitor[local99, J[ \n```
+//                                                             signature_documentation scala stackHead: ObjArrVisitor[local99, J[ 
 //                                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 100
 //        display_name k
-//        documentation ```scala\nk: Int \n```
+//        signature_documentation scala k: Int 
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 100
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
       visitString(i, unsafeCharSeqForRange(i + 1, k - i - 2), stackHead)
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
 //                   ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
-//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                ^ reference local 100
-//                                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
-//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(stackHead)
       k
 //    ^ reference local 100
@@ -1978,7 +1978,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 101
 //           display_name k2
-//           documentation ```scala\nk2: Int \n```
+//           signature_documentation scala k2: Int 
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
 //                                           ^ reference local 100
@@ -1996,38 +1996,38 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseStringKey(i: Int, stackHead: ObjArrVisitor[_, J]): Int = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().
 //                                         display_name parseStringKey
-//                                         documentation ```scala\nfinal def parseStringKey(i: Int, stackHead: ObjArrVisitor[local102, J[): Int\n```
+//                                         signature_documentation scala final def parseStringKey(i: Int, stackHead: ObjArrVisitor[local102, J[): Int
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
 //                                           display_name i
-//                                           documentation ```scala\ni: Int \n```
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           signature_documentation scala i: Int 
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(stackHead)
 //                                                           display_name stackHead
-//                                                           documentation ```scala\nstackHead: ObjArrVisitor[local102, J[ \n```
+//                                                           signature_documentation scala stackHead: ObjArrVisitor[local102, J[ 
 //                                                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 103
 //        display_name k
-//        documentation ```scala\nk: Int \n```
+//        signature_documentation scala k: Int 
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 103
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
       visitStringKey(i, unsafeCharSeqForRange(i + 1, k - i - 2), stackHead)
 //    ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
 //                      ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
-//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                   ^ reference local 103
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
-//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(stackHead)
       k
 //    ^ reference local 103
@@ -2035,7 +2035,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 104
 //           display_name k2
-//           documentation ```scala\nk2: Int \n```
+//           signature_documentation scala k2: Int 
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
 //                                           ^ reference local 103
@@ -2054,15 +2054,15 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   def parseStringToOutputBuilder(i: Int, k: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                               display_name parseStringToOutputBuilder
-//                               documentation ```scala\ndef parseStringToOutputBuilder(i: Int, k: Int): Int\n```
+//                               signature_documentation scala def parseStringToOutputBuilder(i: Int, k: Int): Int
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(i)
 //                                 display_name i
-//                                 documentation ```scala\ni: Int \n```
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                 signature_documentation scala i: Int 
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
 //                                         display_name k
-//                                         documentation ```scala\nk: Int \n```
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                         signature_documentation scala k: Int 
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     outputBuilder.reset()
 //  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#reset().
@@ -2070,20 +2070,20 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //  ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#appendBytesToBuilder().
 //                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(i)
-//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
+//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
-//                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
-//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(i)
     val k2 = parseStringComplex(-k - 1)
 //      ^^ definition local 105
 //         display_name k2
-//         documentation ```scala\nk2: Int \n```
+//         signature_documentation scala k2: Int 
 //           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
-//                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
     k2
 //  ^^ reference local 105
   }
@@ -2091,24 +2091,24 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   def visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[_, J]) = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().
 //                display_name visitString
-//                documentation ```scala\ndef visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local106, J[): Unit\n```
+//                signature_documentation scala def visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local106, J[): Unit
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(i)
 //                  display_name i
-//                  documentation ```scala\ni: Int \n```
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                  signature_documentation scala i: Int 
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(s)
 //                          display_name s
-//                          documentation ```scala\ns: CharSequence \n```
+//                          signature_documentation scala s: CharSequence 
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                         ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(stackHead)
 //                                                   display_name stackHead
-//                                                   documentation ```scala\nstackHead: ObjArrVisitor[local106, J[ \n```
+//                                                   signature_documentation scala stackHead: ObjArrVisitor[local106, J[ 
 //                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     val v = stackHead.subVisitor.visitString(s, i)
 //      ^ definition local 107
 //        display_name v
-//        documentation ```scala\nv: Any \n```
+//        signature_documentation scala v: Any 
 //          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(stackHead)
 //                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
@@ -2124,24 +2124,24 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   def visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[_, J]) = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().
 //                   display_name visitStringKey
-//                   documentation ```scala\ndef visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local108, J[): Unit\n```
+//                   signature_documentation scala def visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local108, J[): Unit
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(i)
 //                     display_name i
-//                     documentation ```scala\ni: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala i: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(s)
 //                             display_name s
-//                             documentation ```scala\ns: CharSequence \n```
+//                             signature_documentation scala s: CharSequence 
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(stackHead)
 //                                                      display_name stackHead
-//                                                      documentation ```scala\nstackHead: ObjArrVisitor[local108, J[ \n```
+//                                                      signature_documentation scala stackHead: ObjArrVisitor[local108, J[ 
 //                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     val obj = stackHead.asInstanceOf[ObjVisitor[Any, _]]
 //      ^^^ definition local 109
 //          display_name obj
-//          documentation ```scala\nobj: ObjVisitor[Any, Any] \n```
+//          signature_documentation scala obj: ObjVisitor[Any, Any] 
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(stackHead)
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
 //                                   ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
@@ -2149,7 +2149,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     val keyVisitor = obj.visitKey(i)
 //      ^^^^^^^^^^ definition local 110
 //                 display_name keyVisitor
-//                 documentation ```scala\nkeyVisitor: Visitor[local111, Any[ \n```
+//                 signature_documentation scala keyVisitor: Visitor[local111, Any[ 
 //                   ^^^ reference local 109
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(i)
@@ -2166,42 +2166,42 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
   protected[this] final def parseStringTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().
 //                                              display_name parseStringTopLevel
-//                                              documentation ```scala\nfinal def parseStringTopLevel(i: Int, facade: Visitor[local112, J[): (J, Int)\n```
+//                                              signature_documentation scala final def parseStringTopLevel(i: Int, facade: Visitor[local112, J[): (J, Int)
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
 //                                                display_name i
-//                                                documentation ```scala\ni: Int \n```
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                signature_documentation scala i: Int 
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                                                             display_name facade
-//                                                             documentation ```scala\nfacade: Visitor[local112, J[ \n```
+//                                                             signature_documentation scala facade: Visitor[local112, J[ 
 //                                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 113
 //        display_name k
-//        documentation ```scala\nk: Int \n```
+//        signature_documentation scala k: Int 
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 113
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
       val res = facade.visitString(unsafeCharSeqForRange(i + 1, k - i - 2), i)
 //        ^^^ definition local 114
 //            display_name res
-//            documentation ```scala\nres: J \n```
+//            signature_documentation scala res: J 
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
-//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                              ^ reference local 113
-//                                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
-//                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
       (res, k)
 //     ^^^ reference local 114
@@ -2210,14 +2210,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 115
 //           display_name k2
-//           documentation ```scala\nk2: Int \n```
+//           signature_documentation scala k2: Int 
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
 //                                           ^ reference local 113
       val res = facade.visitString(outputBuilder.makeString(), i)
 //        ^^^ definition local 116
 //            display_name res
-//            documentation ```scala\nres: J \n```
+//            signature_documentation scala res: J 
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
diff --git a/tests/snapshots/src/main/generated/CharParser.scala b/tests/snapshots/src/main/generated/CharParser.scala
index d8f099f1c..202d5dd57 100644
--- a/tests/snapshots/src/main/generated/CharParser.scala
+++ b/tests/snapshots/src/main/generated/CharParser.scala
@@ -26,8 +26,8 @@ import java.nio.charset.Charset
 import scala.annotation.{switch, tailrec}
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
-//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
+//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
+//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
 
 /**
   * A specialized JSON parse that can parse Chars (Chars or Bytes), sending
@@ -40,27 +40,27 @@ import scala.annotation.{switch, tailrec}
 abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#
 //                        display_name CharParser
-//                        documentation ```scala\nabstract class CharParser[J]\n```
+//                        signature_documentation scala abstract class CharParser[J]
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                          display_name J
-//                          documentation ```scala\nJ\n```
+//                          signature_documentation scala J
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#`<init>`().
 //                             display_name <init>
-//                             documentation ```scala\ndef this()\n```
+//                             signature_documentation scala def this()
 //                                   ^^^^^^^ reference semanticdb maven . . upickle/
 //                                           ^^^^ reference semanticdb maven . . upickle/core/
 //                                                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#
   private[this] val elemOps = upickle.core.CharOps
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                          display_name elemOps
-//                          documentation ```scala\nprivate[this] val elemOps: \n```
+//                          signature_documentation scala private[this] val elemOps: 
 //                            ^^^^^^^ reference semanticdb maven . . upickle/
 //                                    ^^^^ reference semanticdb maven . . upickle/core/
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.
   private[this] val outputBuilder = new upickle.core.CharBuilder()
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                display_name outputBuilder
-//                                documentation ```scala\nprivate[this] val outputBuilder: CharBuilder\n```
+//                                signature_documentation scala private[this] val outputBuilder: CharBuilder
 //                                      ^^^^^^^ reference semanticdb maven . . upickle/
 //                                              ^^^^ reference semanticdb maven . . upickle/core/
 //                                                   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -69,11 +69,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   def requestUntilOrThrow(i: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                        display_name requestUntilOrThrow
-//                        documentation ```scala\ndef requestUntilOrThrow(i: Int): Unit\n```
+//                        signature_documentation scala def requestUntilOrThrow(i: Int): Unit
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().(i)
 //                          display_name i
-//                          documentation ```scala\ni: Int \n```
-//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                          signature_documentation scala i: Int 
+//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if (requestUntil(i)) throw new IncompleteParseException("exhausted input")
 //      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#requestUntil().
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().(i)
@@ -83,13 +83,13 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   override def getCharSafe(i: Int): Char = {
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                         display_name getCharSafe
-//                         documentation ```scala\ndef getCharSafe(i: Int): Char\n```
+//                         signature_documentation scala def getCharSafe(i: Int): Char
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharSafe().
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().(i)
 //                           display_name i
-//                           documentation ```scala\ni: Int \n```
-//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
+//                           signature_documentation scala i: Int 
+//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
     requestUntilOrThrow(i)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().(i)
@@ -104,11 +104,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] def atEof(i: Int) = requestUntil(i)
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                          display_name atEof
-//                          documentation ```scala\ndef atEof(i: Int): Boolean\n```
+//                          signature_documentation scala def atEof(i: Int): Boolean
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().(i)
 //                            display_name i
-//                            documentation ```scala\ni: Int \n```
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                            signature_documentation scala i: Int 
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#requestUntil().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().(i)
 
@@ -118,56 +118,56 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] def close(): Unit
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
 //                          display_name close
-//                          documentation ```scala\ndef close(): Unit\n```
+//                          signature_documentation scala def close(): Unit
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#close().
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 
   /**
    * Valid parser states.
    */
   @inline private[this] final val ARRBEG = 6
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
 //                                       display_name ARRBEG
-//                                       documentation ```scala\n@inline\nprivate[this] final val ARRBEG: 6\n```
+//                                       signature_documentation scala @inline\nprivate[this] final val ARRBEG: 6
   @inline private[this] final val OBJBEG = 7
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
 //                                       display_name OBJBEG
-//                                       documentation ```scala\n@inline\nprivate[this] final val OBJBEG: 7\n```
+//                                       signature_documentation scala @inline\nprivate[this] final val OBJBEG: 7
   @inline private[this] final val DATA = 1
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
 //                                     display_name DATA
-//                                     documentation ```scala\n@inline\nprivate[this] final val DATA: 1\n```
+//                                     signature_documentation scala @inline\nprivate[this] final val DATA: 1
   @inline private[this] final val KEY = 2
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#KEY.
 //                                    display_name KEY
-//                                    documentation ```scala\n@inline\nprivate[this] final val KEY: 2\n```
+//                                    signature_documentation scala @inline\nprivate[this] final val KEY: 2
   @inline private[this] final val COLON = 3
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#COLON.
 //                                      display_name COLON
-//                                      documentation ```scala\n@inline\nprivate[this] final val COLON: 3\n```
+//                                      signature_documentation scala @inline\nprivate[this] final val COLON: 3
   @inline private[this] final val ARREND = 4
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARREND.
 //                                       display_name ARREND
-//                                       documentation ```scala\n@inline\nprivate[this] final val ARREND: 4\n```
+//                                       signature_documentation scala @inline\nprivate[this] final val ARREND: 4
   @inline private[this] final val OBJEND = 5
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJEND.
 //                                       display_name OBJEND
-//                                       documentation ```scala\n@inline\nprivate[this] final val OBJEND: 5\n```
+//                                       signature_documentation scala @inline\nprivate[this] final val OBJEND: 5
 
   /**
     * Parse the JSON document into a single JSON value.
@@ -179,29 +179,29 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   final def parse(facade: Visitor[_, J]): J = {
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().
 //                display_name parse
-//                documentation ```scala\nfinal def parse(facade: Visitor[local0, J[): J\n```
+//                signature_documentation scala final def parse(facade: Visitor[local0, J[): J
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().(facade)
 //                       display_name facade
-//                       documentation ```scala\nfacade: Visitor[local0, J[ \n```
+//                       signature_documentation scala facade: Visitor[local0, J[ 
 //                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     val (value, i) = parseTopLevel(0, facade)
 //       ^^^^^ definition local 2
 //             display_name value
-//             documentation ```scala\nvalue: J \n```
+//             signature_documentation scala value: J 
 //              ^ definition local 3
 //                display_name i
-//                documentation ```scala\ni: Int \n```
+//                signature_documentation scala i: Int 
 //                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().(facade)
     var j = i
 //      ^ definition local 4
 //        display_name j
-//        documentation ```scala\nj: Int \n```
+//        signature_documentation scala j: Int 
 //          ^ reference local 3
     while (!atEof(j)) {
-//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`unary_!`().
+//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                ^ reference local 4
       (getCharSafe(j): @switch) match {
@@ -209,14 +209,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                 ^ reference local 4
         case '\n' | ' ' | '\t' | '\r' => j += 1
 //                                       ^ reference local 4
-//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         case _ => die(j, "expected whitespace or eof")
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                    ^ reference local 4
       }
     }
     if (!atEof(j)) die(j, "expected eof")
-//      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`unary_!`().
+//      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
 //       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //             ^ reference local 4
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
@@ -233,20 +233,20 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] def die(i: Int, msg: String): Nothing = {
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                        display_name die
-//                        documentation ```scala\ndef die(i: Int, msg: String): Nothing\n```
+//                        signature_documentation scala def die(i: Int, msg: String): Nothing
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(i)
 //                          display_name i
-//                          documentation ```scala\ni: Int \n```
-//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                          signature_documentation scala i: Int 
+//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(msg)
 //                                    display_name msg
-//                                    documentation ```scala\nmsg: String \n```
-//                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                    signature_documentation scala msg: String 
+//                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                              ^^^^^^^ reference semanticdb maven . . scala/Nothing#
     val out = new upickle.core.CharBuilder()
 //      ^^^ definition local 6
 //          display_name out
-//          documentation ```scala\nout: CharBuilder \n```
+//          signature_documentation scala out: CharBuilder 
 //                ^^^^^^^ reference semanticdb maven . . upickle/
 //                        ^^^^ reference semanticdb maven . . upickle/core/
 //                             ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -264,22 +264,22 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       out,
 //    ^^^ reference local 6
       new ArrayCharSequence(Array(elemOps.toInt(getCharSafe(i)).toChar)),
-//        ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrayCharSequence#
-//                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrayCharSequence#`<init>`().
-//                          ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array.
+//        ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrayCharSequence#
+//                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrayCharSequence#`<init>`().
+//                          ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array.
 //                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.toInt().
 //                                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(i)
-//                                                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#toChar().
+//                                                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#toChar().
       unicode = false
 //    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.escapeChar().(unicode)
     )
     val s = "%s got %s" format (msg, out.makeString())
 //      ^ definition local 7
 //        display_name s
-//        documentation ```scala\ns: String \n```
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/StringOps#format().
+//        signature_documentation scala s: String 
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/StringOps#format().
 //                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(msg)
 //                                   ^^^ reference local 6
 //                                       ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#makeString().
@@ -302,49 +302,49 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[_, J]): Int = {
 //                          ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().
 //                                   display_name parseNum
-//                                   documentation ```scala\nfinal def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[local8, J[): Int\n```
+//                                   signature_documentation scala final def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[local8, J[): Int
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
 //                                     display_name i
-//                                     documentation ```scala\ni: Int \n```
-//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                     signature_documentation scala i: Int 
+//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(ctxt)
 //                                                display_name ctxt
-//                                                documentation ```scala\nctxt: ObjArrVisitor[Any, J] \n```
+//                                                signature_documentation scala ctxt: ObjArrVisitor[Any, J] 
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                               ^^^ reference semanticdb maven . . scala/Any#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(facade)
 //                                                                               display_name facade
-//                                                                               documentation ```scala\nfacade: Visitor[local8, J[ \n```
+//                                                                               signature_documentation scala facade: Visitor[local8, J[ 
 //                                                                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var j = i
 //      ^ definition local 9
 //        display_name j
-//        documentation ```scala\nj: Int \n```
+//        signature_documentation scala j: Int 
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
     var c = getCharSafe(j)
 //      ^ definition local 10
 //        display_name c
-//        documentation ```scala\nc: Char \n```
+//        signature_documentation scala c: Char 
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                      ^ reference local 9
     var decIndex = -1
 //      ^^^^^^^^ definition local 11
 //               display_name decIndex
-//               documentation ```scala\ndecIndex: Int \n```
+//               signature_documentation scala decIndex: Int 
     var expIndex = -1
 //      ^^^^^^^^ definition local 12
 //               display_name expIndex
-//               documentation ```scala\nexpIndex: Int \n```
+//               signature_documentation scala expIndex: Int 
 
     if (c == '-') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -352,10 +352,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     }
     if (c == '0') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -364,7 +364,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val j0 = j
 //        ^^ definition local 13
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -372,7 +372,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 10
         j += 1;
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -380,7 +380,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j == j0) die(i, "expected digit")
 //        ^ reference local 9
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //             ^^ reference local 13
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
@@ -388,15 +388,15 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == '.') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       decIndex = j - i
 //    ^^^^^^^^ reference local 11
 //               ^ reference local 9
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -404,7 +404,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val j0 = j
 //        ^^ definition local 15
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -412,7 +412,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 10
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -420,7 +420,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 15
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //              ^ reference local 9
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
@@ -428,31 +428,31 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == 'e' || c == 'E') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                  ^ reference local 10
-//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       expIndex = j - i
 //    ^^^^^^^^ reference local 12
 //               ^ reference local 9
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                    ^ reference local 9
       if (c == '+' || c == '-') {
 //        ^ reference local 10
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                    ^ reference local 10
-//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -461,7 +461,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val j0 = j
 //        ^^ definition local 17
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -469,7 +469,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 10
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -477,7 +477,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j0 == j)  die(i, "expected digit")
 //        ^^ reference local 17
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //              ^ reference local 9
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
@@ -500,32 +500,32 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   def visitFloat64StringPartsWithWrapper(facade: Visitor[_, J],
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().
 //                                       display_name visitFloat64StringPartsWithWrapper
-//                                       documentation ```scala\ndef visitFloat64StringPartsWithWrapper(facade: Visitor[local19, J[, decIndex: Int, expIndex: Int, i: Int, j: Int): J\n```
+//                                       signature_documentation scala def visitFloat64StringPartsWithWrapper(facade: Visitor[local19, J[, decIndex: Int, expIndex: Int, i: Int, j: Int): J
 //                                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(facade)
 //                                              display_name facade
-//                                              documentation ```scala\nfacade: Visitor[local19, J[ \n```
+//                                              signature_documentation scala facade: Visitor[local19, J[ 
 //                                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
                                          decIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(decIndex)
 //                                                display_name decIndex
-//                                                documentation ```scala\ndecIndex: Int \n```
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                signature_documentation scala decIndex: Int 
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          expIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(expIndex)
 //                                                display_name expIndex
-//                                                documentation ```scala\nexpIndex: Int \n```
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                signature_documentation scala expIndex: Int 
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          i: Int,
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(i)
 //                                         display_name i
-//                                         documentation ```scala\ni: Int \n```
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                         signature_documentation scala i: Int 
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          j: Int) = {
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(j)
 //                                         display_name j
-//                                         documentation ```scala\nj: Int \n```
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                         signature_documentation scala j: Int 
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     facade.visitFloat64StringParts(
 //  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(facade)
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
@@ -533,7 +533,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(i)
 //                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(j)
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(i)
       decIndex,
 //    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(decIndex)
@@ -561,45 +561,45 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseNumTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().
 //                                           display_name parseNumTopLevel
-//                                           documentation ```scala\nfinal def parseNumTopLevel(i: Int, facade: Visitor[local20, J[): (J, Int)\n```
+//                                           signature_documentation scala final def parseNumTopLevel(i: Int, facade: Visitor[local20, J[): (J, Int)
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
 //                                             display_name i
-//                                             documentation ```scala\ni: Int \n```
-//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                             signature_documentation scala i: Int 
+//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(facade)
 //                                                          display_name facade
-//                                                          documentation ```scala\nfacade: Visitor[local20, J[ \n```
+//                                                          signature_documentation scala facade: Visitor[local20, J[ 
 //                                                           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var j = i
 //      ^ definition local 21
 //        display_name j
-//        documentation ```scala\nj: Int \n```
+//        signature_documentation scala j: Int 
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
     var c = getCharSafe(j)
 //      ^ definition local 22
 //        display_name c
-//        documentation ```scala\nc: Char \n```
+//        signature_documentation scala c: Char 
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                      ^ reference local 21
     var decIndex = -1
 //      ^^^^^^^^ definition local 23
 //               display_name decIndex
-//               documentation ```scala\ndecIndex: Int \n```
+//               signature_documentation scala decIndex: Int 
     var expIndex = -1
 //      ^^^^^^^^ definition local 24
 //               display_name expIndex
-//               documentation ```scala\nexpIndex: Int \n```
+//               signature_documentation scala expIndex: Int 
 
     if (c == '-') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       // any valid input will require at least one digit after -
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -607,10 +607,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     }
     if (c == '0') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       if (atEof(j)) {
 //        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //              ^ reference local 21
@@ -631,7 +631,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val j0 = j
 //        ^^ definition local 25
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -639,7 +639,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                ^ reference local 21
@@ -659,7 +659,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 25
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //              ^ reference local 21
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
@@ -667,16 +667,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == '.') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       // any valid input will require at least one digit after .
       decIndex = j - i
 //    ^^^^^^^^ reference local 23
 //               ^ reference local 21
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -684,7 +684,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val j0 = j
 //        ^^ definition local 27
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -692,7 +692,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                ^ reference local 21
@@ -712,7 +712,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if(j0 == j) die(i, "expected digit")
 //       ^^ reference local 27
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //             ^ reference local 21
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
@@ -720,32 +720,32 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == 'e' || c == 'E') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                  ^ reference local 22
-//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       // any valid input will require at least one digit after e, e+, etc
       expIndex = j - i
 //    ^^^^^^^^ reference local 24
 //               ^ reference local 21
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                    ^ reference local 21
       if (c == '+' || c == '-') {
 //        ^ reference local 22
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                    ^ reference local 22
-//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 22
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -754,7 +754,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val j0 = j
 //        ^^ definition local 29
 //           display_name j0
-//           documentation ```scala\nj0: Int \n```
+//           signature_documentation scala j0: Int 
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -762,7 +762,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                ^ reference local 21
@@ -782,7 +782,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 29
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //              ^ reference local 21
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
@@ -807,12 +807,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def descape(i: Int): Char = {
 //                          ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().
 //                                  display_name descape
-//                                  documentation ```scala\nfinal def descape(i: Int): Char\n```
+//                                  signature_documentation scala final def descape(i: Int): Char
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
 //                                    display_name i
-//                                    documentation ```scala\ni: Int \n```
-//                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
+//                                    signature_documentation scala i: Int 
+//                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
     import upickle.core.RenderUtils.hex
 //         ^^^^^^^ reference semanticdb maven . . upickle/
 //                 ^^^^ reference semanticdb maven . . upickle/core/
@@ -821,50 +821,50 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     var x = 0
 //      ^ definition local 31
 //        display_name x
-//        documentation ```scala\nx: Int \n```
+//        signature_documentation scala x: Int 
     x = (x << 4) | hex(getCharSafe(i+2).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#toInt().
     x = (x << 4) | hex(getCharSafe(i+3).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#toInt().
     x = (x << 4) | hex(getCharSafe(i+4).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#toInt().
     x = (x << 4) | hex(getCharSafe(i+5).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#toInt().
     x.toChar
 //  ^ reference local 31
-//    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#toChar().
+//    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#toChar().
   }
 
 
@@ -876,36 +876,36 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseTrue(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().
 //                                    display_name parseTrue
-//                                    documentation ```scala\nfinal def parseTrue(i: Int, facade: Visitor[local32, J[): J\n```
+//                                    signature_documentation scala final def parseTrue(i: Int, facade: Visitor[local32, J[): J
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
 //                                      display_name i
-//                                      documentation ```scala\ni: Int \n```
-//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                      signature_documentation scala i: Int 
+//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(facade)
 //                                                   display_name facade
-//                                                   documentation ```scala\nfacade: Visitor[local32, J[ \n```
+//                                                   signature_documentation scala facade: Visitor[local32, J[ 
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     requestUntilOrThrow(i + 3)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (getCharUnsafe(i + 1) == 'r' && getCharUnsafe(i + 2) == 'u' && getCharUnsafe(i + 3) == 'e') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       facade.visitTrue(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(facade)
 //           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
@@ -925,42 +925,42 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseFalse(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().
 //                                     display_name parseFalse
-//                                     documentation ```scala\nfinal def parseFalse(i: Int, facade: Visitor[local33, J[): J\n```
+//                                     signature_documentation scala final def parseFalse(i: Int, facade: Visitor[local33, J[): J
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
 //                                       display_name i
-//                                       documentation ```scala\ni: Int \n```
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                       signature_documentation scala i: Int 
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(facade)
 //                                                    display_name facade
-//                                                    documentation ```scala\nfacade: Visitor[local33, J[ \n```
+//                                                    signature_documentation scala facade: Visitor[local33, J[ 
 //                                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     requestUntilOrThrow(i + 4)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
     if (getCharUnsafe(i + 1) == 'a' && getCharUnsafe(i + 2) == 'l' && getCharUnsafe(i + 3) == 's' && getCharUnsafe(i + 4) == 'e') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                                                                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                                                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                                                                                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                                                                                                                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                                                                                        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                                                                                                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                                                                                        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       facade.visitFalse(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(facade)
 //           ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
@@ -980,36 +980,36 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseNull(i: Int, facade: Visitor[_, J]): J = {
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().
 //                                    display_name parseNull
-//                                    documentation ```scala\nfinal def parseNull(i: Int, facade: Visitor[local34, J[): J\n```
+//                                    signature_documentation scala final def parseNull(i: Int, facade: Visitor[local34, J[): J
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
 //                                      display_name i
-//                                      documentation ```scala\ni: Int \n```
-//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                      signature_documentation scala i: Int 
+//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(facade)
 //                                                   display_name facade
-//                                                   documentation ```scala\nfacade: Visitor[local34, J[ \n```
+//                                                   signature_documentation scala facade: Visitor[local34, J[ 
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     requestUntilOrThrow(i + 3)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (getCharUnsafe(i + 1) == 'u' && getCharUnsafe(i + 2) == 'l' && getCharUnsafe(i + 3) == 'l') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
       facade.visitNull(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(facade)
 //           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
@@ -1024,18 +1024,18 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().
 //                                        display_name parseTopLevel
-//                                        documentation ```scala\nfinal def parseTopLevel(i: Int, facade: Visitor[local35, J[): (J, Int)\n```
+//                                        signature_documentation scala final def parseTopLevel(i: Int, facade: Visitor[local35, J[): (J, Int)
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(i)
 //                                          display_name i
-//                                          documentation ```scala\ni: Int \n```
-//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                          signature_documentation scala i: Int 
+//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(facade)
 //                                                       display_name facade
-//                                                       documentation ```scala\nfacade: Visitor[local35, J[ \n```
+//                                                       signature_documentation scala facade: Visitor[local35, J[ 
 //                                                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     try parseTopLevel0(i, facade)
 //      ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(i)
@@ -1048,23 +1048,23 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    * Parse and return the next JSON value and the position beyond it.
    */
   @tailrec
-// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
+// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseTopLevel0(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                                         display_name parseTopLevel0
-//                                         documentation ```scala\n@tailrec\nfinal def parseTopLevel0(i: Int, facade: Visitor[local38, J[): (J, Int)\n```
+//                                         signature_documentation scala @tailrec\nfinal def parseTopLevel0(i: Int, facade: Visitor[local38, J[): (J, Int)
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
 //                                           display_name i
-//                                           documentation ```scala\ni: Int \n```
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           signature_documentation scala i: Int 
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                                        display_name facade
-//                                                        documentation ```scala\nfacade: Visitor[local38, J[ \n```
+//                                                        signature_documentation scala facade: Visitor[local38, J[ 
 //                                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     (getCharSafe(i): @switch) match {
 //   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
@@ -1072,12 +1072,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       case ' ' | '\t' | 'r' => parseTopLevel0(i + 1, facade)
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                   ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
       case '\n' => parseTopLevel0(i + 1, facade)
 //                 ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                       ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 
       // if we have a recursive top-level structure, we'll delegate the parsing
@@ -1086,20 +1086,20 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                           ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Nil.
+//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Nil.
       case '{' => parseNested(OBJBEG, i + 1, facade.visitObject(-1, i), Nil)
 //                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                           ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                                  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Nil.
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Nil.
 
       // we have a single top-level number
       case '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' => parseNumTopLevel(i, facade)
@@ -1119,19 +1119,19 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
 //                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       case 'f' => (parseFalse(i, facade), i + 5)
 //                 ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       case 'n' => (parseNull(i, facade), i + 4)
 //                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
 //                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
       // invalid
       case _ => die(i, "expected json value")
@@ -1143,21 +1143,21 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   def reject(j: Int): PartialFunction[Throwable, Nothing] = {
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().
 //           display_name reject
-//           documentation ```scala\ndef reject(j: Int): PartialFunction[Throwable, Nothing]\n```
+//           signature_documentation scala def reject(j: Int): PartialFunction[Throwable, Nothing]
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().(j)
 //             display_name j
-//             documentation ```scala\nj: Int \n```
-//              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/PartialFunction#
-//                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Throwable#
+//             signature_documentation scala j: Int 
+//              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/PartialFunction#
+//                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Throwable#
 //                                               ^^^^^^^ reference semanticdb maven . . scala/Nothing#
 //                                                          ^ definition local 39
 //                                                            display_name $anonfun
-//                                                            documentation ```scala\n@SerialVersionUID\nfinal class $anonfun\n```
+//                                                            signature_documentation scala @SerialVersionUID\nfinal class $anonfun
     case e: Abort =>
 //       ^ definition local 46
 //         display_name e
-//         documentation ```scala\ne: Abort \n```
+//         signature_documentation scala e: Abort 
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort#
       throw new AbortException(e.msg, j, -1, -1, e)
 //              ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException#
@@ -1185,36 +1185,36 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    * @param path the json path in the tree
    */
   @tailrec
-// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
+// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseNested(state: Int,
 //                          ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                      display_name parseNested
-//                                      documentation ```scala\n@tailrec\nfinal def parseNested(state: Int, i: Int, stackHead: ObjArrVisitor[local50, J[, stackTail: List[ObjArrVisitor[local51, J[]): (J, Int)\n```
+//                                      signature_documentation scala @tailrec\nfinal def parseNested(state: Int, i: Int, stackHead: ObjArrVisitor[local50, J[, stackTail: List[ObjArrVisitor[local51, J[]): (J, Int)
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(state)
 //                                            display_name state
-//                                            documentation ```scala\nstate: Int \n```
-//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                            signature_documentation scala state: Int 
+//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                         i: Int,
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
 //                                        display_name i
-//                                        documentation ```scala\ni: Int \n```
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                        signature_documentation scala i: Int 
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                         stackHead: ObjArrVisitor[_, J],
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                display_name stackHead
-//                                                documentation ```scala\nstackHead: ObjArrVisitor[local50, J[ \n```
+//                                                signature_documentation scala stackHead: ObjArrVisitor[local50, J[ 
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
                                         stackTail: List[ObjArrVisitor[_, J]]) : (J, Int) = {
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                                display_name stackTail
-//                                                documentation ```scala\nstackTail: List[ObjArrVisitor[local51, J[] \n```
-//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
+//                                                signature_documentation scala stackTail: List[ObjArrVisitor[local51, J[] 
+//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     (getCharSafe(i): @switch) match{
 //   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
@@ -1223,7 +1223,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(state)
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
@@ -1236,7 +1236,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
             val nextJ = try parseStringKey(i, stackHead) catch reject(i)
 //              ^^^^^ definition local 52
 //                    display_name nextJ
-//                    documentation ```scala\nnextJ: Int \n```
+//                    signature_documentation scala nextJ: Int 
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
 //                                            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
@@ -1255,7 +1255,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
             val nextJ = try parseStringValue(i, stackHead) catch reject(i)
 //              ^^^^^ definition local 55
 //                    display_name nextJ
-//                    documentation ```scala\nnextJ: Int \n```
+//                    signature_documentation scala nextJ: Int 
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().
 //                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
 //                                              ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
@@ -1284,7 +1284,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
           case _ => dieWithFailureMessage(i, state)
@@ -1301,7 +1301,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
         val ctx =
 //          ^^^ definition local 58
 //              display_name ctx
-//              documentation ```scala\nctx: ArrVisitor[local59, J[ \n```
+//              signature_documentation scala ctx: ArrVisitor[local59, J[ 
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitArray(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1317,10 +1317,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                 ^^^ reference local 58
 //                                      ^^^^^^^^^ reference local 62
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#`::`().
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#`::`().
 //                                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
       case '{' =>
@@ -1331,7 +1331,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
         val ctx =
 //          ^^^ definition local 63
 //              display_name ctx
-//              documentation ```scala\nctx: ObjVisitor[local64, J[ \n```
+//              signature_documentation scala ctx: ObjVisitor[local64, J[ 
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitObject(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1347,10 +1347,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                 ^^^ reference local 63
 //                                      ^^^^^^^^^ reference local 67
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#`::`().
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#`::`().
 //                                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
       case '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' =>
@@ -1361,7 +1361,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
         val ctx =
 //          ^^^ definition local 68
 //              display_name ctx
-//              documentation ```scala\nctx: Int \n```
+//              signature_documentation scala ctx: Int 
           try parseNum(i, stackHead.narrow, stackHead.subVisitor.asInstanceOf[Visitor[_, J]])
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
@@ -1411,7 +1411,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
@@ -1443,7 +1443,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
@@ -1475,7 +1475,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
@@ -1490,7 +1490,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                   ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
           case OBJEND => parseNested(KEY, i + 1, stackHead, stackTail)
@@ -1498,7 +1498,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                   ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#KEY.
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
           case _ => dieWithFailureMessage(i, state)
@@ -1519,28 +1519,28 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                        ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
               case Some(t) => t
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                      ^ definition local 77
 //                        display_name t
-//                        documentation ```scala\nt: (J, Int) \n```
+//                        signature_documentation scala t: (J, Int) 
 //                            ^ reference local 77
               case None =>
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 78
 //                                display_name stackTailHead
-//                                documentation ```scala\nstackTailHead: ObjArrVisitor[local51, J[ \n```
+//                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
-//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
+//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                           ^^^^^^^^^^^^^ reference local 78
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                                  ^^^^^^^^^^^^^ reference local 78
 //                                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
-//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#tail().
+//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#tail().
             }
           case _ => dieWithFailureMessage(i, state)
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().
@@ -1560,28 +1560,28 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                        ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
               case Some(t) => t
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                      ^ definition local 79
 //                        display_name t
-//                        documentation ```scala\nt: (J, Int) \n```
+//                        signature_documentation scala t: (J, Int) 
 //                            ^ reference local 79
               case None =>
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 80
 //                                display_name stackTailHead
-//                                documentation ```scala\nstackTailHead: ObjArrVisitor[local51, J[ \n```
+//                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
-//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
+//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                           ^^^^^^^^^^^^^ reference local 80
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                                  ^^^^^^^^^^^^^ reference local 80
 //                                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
-//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#tail().
+//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#tail().
             }
           case _ => dieWithFailureMessage(i, state)
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().
@@ -1600,19 +1600,19 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   def dieWithFailureMessage(i: Int, state: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().
 //                          display_name dieWithFailureMessage
-//                          documentation ```scala\ndef dieWithFailureMessage(i: Int, state: Int): Nothing\n```
+//                          signature_documentation scala def dieWithFailureMessage(i: Int, state: Int): Nothing
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(i)
 //                            display_name i
-//                            documentation ```scala\ni: Int \n```
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                            signature_documentation scala i: Int 
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(state)
 //                                        display_name state
-//                                        documentation ```scala\nstate: Int \n```
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                        signature_documentation scala state: Int 
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     val expected = state match{
 //      ^^^^^^^^ definition local 81
 //               display_name expected
-//               documentation ```scala\nexpected: String \n```
+//               signature_documentation scala expected: String 
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(state)
       case ARRBEG => "json value or ]"
 //         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
@@ -1632,22 +1632,22 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     die(i, s"expected $expected")
 //  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(i)
-//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
 //                     ^^^^^^^^ reference local 81
   }
 
   def failIfNotData(state: Int, i: Int) = (state: @switch) match{
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().
 //                  display_name failIfNotData
-//                  documentation ```scala\ndef failIfNotData(state: Int, i: Int): Unit\n```
+//                  signature_documentation scala def failIfNotData(state: Int, i: Int): Unit
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(state)
 //                        display_name state
-//                        documentation ```scala\nstate: Int \n```
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                        signature_documentation scala state: Int 
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(i)
 //                                display_name i
-//                                documentation ```scala\ni: Int \n```
-//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                signature_documentation scala i: Int 
+//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(state)
     case DATA | ARRBEG => // do nothing
 //       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
@@ -1661,41 +1661,41 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   def tryCloseCollection(stackHead: ObjArrVisitor[_, J], stackTail: List[ObjArrVisitor[_, J]], i: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().
 //                       display_name tryCloseCollection
-//                       documentation ```scala\ndef tryCloseCollection(stackHead: ObjArrVisitor[local82, J[, stackTail: List[ObjArrVisitor[local83, J[], i: Int): Option[(J, Int)]\n```
+//                       signature_documentation scala def tryCloseCollection(stackHead: ObjArrVisitor[local82, J[, stackTail: List[ObjArrVisitor[local83, J[], i: Int): Option[(J, Int)]
 //                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackHead)
 //                                 display_name stackHead
-//                                 documentation ```scala\nstackHead: ObjArrVisitor[local82, J[ \n```
+//                                 signature_documentation scala stackHead: ObjArrVisitor[local82, J[ 
 //                                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
 //                                                                 display_name stackTail
-//                                                                 documentation ```scala\nstackTail: List[ObjArrVisitor[local83, J[] \n```
-//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
+//                                                                 signature_documentation scala stackTail: List[ObjArrVisitor[local83, J[] 
+//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
 //                                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
 //                                                                                               display_name i
-//                                                                                               documentation ```scala\ni: Int \n```
-//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                               signature_documentation scala i: Int 
+//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if (stackTail.isEmpty) {
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
-//                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#isEmpty().
+//                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#isEmpty().
       Some(try stackHead.visitEnd(i) catch reject(i), i + 1)
-//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackHead)
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
 //                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
-//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     } else {
       val ctxt2 = stackTail.head.narrow
 //        ^^^^^ definition local 86
 //              display_name ctxt2
-//              documentation ```scala\nctxt2: ObjArrVisitor[Any, J] \n```
+//              signature_documentation scala ctxt2: ObjArrVisitor[Any, J] 
 //                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
-//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
+//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#narrow().
       try ctxt2.visitValue(stackHead.visitEnd(i), i) catch reject(i)
 //        ^^^^^ reference local 86
@@ -1707,17 +1707,17 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
       None
-//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
 
     }
   }
   def collectionEndFor(stackHead: ObjArrVisitor[_, _]) = {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                     display_name collectionEndFor
-//                     documentation ```scala\ndef collectionEndFor(stackHead: ObjArrVisitor[local89, local90[): Int\n```
+//                     signature_documentation scala def collectionEndFor(stackHead: ObjArrVisitor[local89, local90[): Int
 //                     ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().(stackHead)
 //                               display_name stackHead
-//                               documentation ```scala\nstackHead: ObjArrVisitor[local89, local90[ \n```
+//                               signature_documentation scala stackHead: ObjArrVisitor[local89, local90[ 
 //                                ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
     if (stackHead.isObj) OBJEND
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().(stackHead)
@@ -1737,46 +1737,46 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseStringSimple(i: Int): Int = {
 //                          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                                            display_name parseStringSimple
-//                                            documentation ```scala\nfinal def parseStringSimple(i: Int): Int\n```
+//                                            signature_documentation scala final def parseStringSimple(i: Int): Int
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().(i)
 //                                              display_name i
-//                                              documentation ```scala\ni: Int \n```
-//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                              signature_documentation scala i: Int 
+//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var j = i
 //      ^ definition local 91
 //        display_name j
-//        documentation ```scala\nj: Int \n```
+//        signature_documentation scala j: Int 
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().(i)
     var c = elemOps.toUnsignedInt(getCharSafe(j))
 //      ^ definition local 92
 //        display_name c
-//        documentation ```scala\nc: Int \n```
+//        signature_documentation scala c: Int 
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.toUnsignedInt().
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                            ^ reference local 91
     while (c != '"') {
 //         ^ reference local 92
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+2).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+2).
       if (c < ' ') die(j, s"control char (${c}) in string")
 //        ^ reference local 92
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+2).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+2).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference local 91
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
 //                                          ^ reference local 92
       if (c == '\\' || c > 127) return -1 - j
 //        ^ reference local 92
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+2).
-//                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+2).
+//                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                     ^ reference local 92
-//                       ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>`(+3).
-//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                       ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>`(+3).
+//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                          ^ reference local 91
       j += 1
 //    ^ reference local 91
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       c = elemOps.toUnsignedInt(getCharSafe(j))
 //    ^ reference local 92
 //        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -1786,7 +1786,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     }
     j + 1
 //  ^ reference local 91
-//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
   }
 
   /**
@@ -1795,91 +1795,91 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseStringComplex(i0: Int): Int = {
 //                          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().
 //                                             display_name parseStringComplex
-//                                             documentation ```scala\nfinal def parseStringComplex(i0: Int): Int\n```
+//                                             signature_documentation scala final def parseStringComplex(i0: Int): Int
 //                                             ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().(i0)
 //                                                display_name i0
-//                                                documentation ```scala\ni0: Int \n```
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                signature_documentation scala i0: Int 
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var i = i0
 //      ^ definition local 94
 //        display_name i
-//        documentation ```scala\ni: Int \n```
+//        signature_documentation scala i: Int 
 //          ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().(i0)
     var c = elemOps.toUnsignedInt(getCharSafe(i))
 //      ^ definition local 95
 //        display_name c
-//        documentation ```scala\nc: Int \n```
+//        signature_documentation scala c: Int 
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.toUnsignedInt().
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                            ^ reference local 94
     while (c != '"') {
 //         ^ reference local 95
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+2).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+2).
 
       if (c < ' ') die(i, s"control char (${c}) in string")
 //        ^ reference local 95
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+2).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+2).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference local 94
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
 //                                          ^ reference local 95
       else if (c == '\\') {
 //             ^ reference local 95
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+2).
         (getCharSafe(i + 1): @switch) match {
 //       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                   ^ reference local 94
-//                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 'b' => { outputBuilder.append('\b'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 'f' => { outputBuilder.append('\f'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 'n' => { outputBuilder.append('\n'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 'r' => { outputBuilder.append('\r'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case 't' => { outputBuilder.append('\t'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
           case '"' => { outputBuilder.append('"'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                 ^ reference local 94
-//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case '/' => { outputBuilder.append('/'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                 ^ reference local 94
-//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
           case '\\' => { outputBuilder.append('\\'); i += 2 }
 //                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                   ^ reference local 94
-//                                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
           // if there's a problem then descape will explode
           case 'u' =>
             val d = descape(i)
 //              ^ definition local 97
 //                display_name d
-//                documentation ```scala\nd: Char \n```
+//                signature_documentation scala d: Char 
 //                  ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().
 //                          ^ reference local 94
             outputBuilder.appendC(d)
@@ -1889,16 +1889,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
             i += 6
 //          ^ reference local 94
-//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 
           case c => die(i + 1, s"illegal escape sequence after \\")
 //             ^ definition local 98
 //               display_name c
-//               documentation ```scala\nc: Char \n```
+//               signature_documentation scala c: Char 
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                      ^ reference local 94
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
         }
       } else {
         // this case is for "normal" code points that are just one Char.
@@ -1912,7 +1912,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                           ^ reference local 95
         i += 1
 //      ^ reference local 94
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
       }
       c = elemOps.toUnsignedInt(getCharSafe(i))
 //    ^ reference local 95
@@ -1924,7 +1924,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     i + 1
 //  ^ reference local 94
-//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
   }
 
   /**
@@ -1938,38 +1938,38 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseStringValue(i: Int, stackHead: ObjArrVisitor[_, J]): Int = {
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().
 //                                           display_name parseStringValue
-//                                           documentation ```scala\nfinal def parseStringValue(i: Int, stackHead: ObjArrVisitor[local99, J[): Int\n```
+//                                           signature_documentation scala final def parseStringValue(i: Int, stackHead: ObjArrVisitor[local99, J[): Int
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
 //                                             display_name i
-//                                             documentation ```scala\ni: Int \n```
-//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                             signature_documentation scala i: Int 
+//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(stackHead)
 //                                                             display_name stackHead
-//                                                             documentation ```scala\nstackHead: ObjArrVisitor[local99, J[ \n```
+//                                                             signature_documentation scala stackHead: ObjArrVisitor[local99, J[ 
 //                                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 100
 //        display_name k
-//        documentation ```scala\nk: Int \n```
+//        signature_documentation scala k: Int 
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 100
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
       visitString(i, unsafeCharSeqForRange(i + 1, k - i - 2), stackHead)
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
 //                   ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
-//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                ^ reference local 100
-//                                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
-//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(stackHead)
       k
 //    ^ reference local 100
@@ -1977,7 +1977,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 101
 //           display_name k2
-//           documentation ```scala\nk2: Int \n```
+//           signature_documentation scala k2: Int 
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
 //                                           ^ reference local 100
@@ -1995,38 +1995,38 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseStringKey(i: Int, stackHead: ObjArrVisitor[_, J]): Int = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().
 //                                         display_name parseStringKey
-//                                         documentation ```scala\nfinal def parseStringKey(i: Int, stackHead: ObjArrVisitor[local102, J[): Int\n```
+//                                         signature_documentation scala final def parseStringKey(i: Int, stackHead: ObjArrVisitor[local102, J[): Int
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
 //                                           display_name i
-//                                           documentation ```scala\ni: Int \n```
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           signature_documentation scala i: Int 
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(stackHead)
 //                                                           display_name stackHead
-//                                                           documentation ```scala\nstackHead: ObjArrVisitor[local102, J[ \n```
+//                                                           signature_documentation scala stackHead: ObjArrVisitor[local102, J[ 
 //                                                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 103
 //        display_name k
-//        documentation ```scala\nk: Int \n```
+//        signature_documentation scala k: Int 
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 103
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
       visitStringKey(i, unsafeCharSeqForRange(i + 1, k - i - 2), stackHead)
 //    ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
 //                      ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
-//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                   ^ reference local 103
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
-//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(stackHead)
       k
 //    ^ reference local 103
@@ -2034,7 +2034,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 104
 //           display_name k2
-//           documentation ```scala\nk2: Int \n```
+//           signature_documentation scala k2: Int 
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
 //                                           ^ reference local 103
@@ -2053,15 +2053,15 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   def parseStringToOutputBuilder(i: Int, k: Int) = {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                               display_name parseStringToOutputBuilder
-//                               documentation ```scala\ndef parseStringToOutputBuilder(i: Int, k: Int): Int\n```
+//                               signature_documentation scala def parseStringToOutputBuilder(i: Int, k: Int): Int
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(i)
 //                                 display_name i
-//                                 documentation ```scala\ni: Int \n```
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                 signature_documentation scala i: Int 
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
 //                                         display_name k
-//                                         documentation ```scala\nk: Int \n```
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                         signature_documentation scala k: Int 
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     outputBuilder.reset()
 //  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#reset().
@@ -2069,20 +2069,20 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //  ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#appendCharsToBuilder().
 //                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(i)
-//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
-//                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
+//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
-//                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
-//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(i)
     val k2 = parseStringComplex(-k - 1)
 //      ^^ definition local 105
 //         display_name k2
-//         documentation ```scala\nk2: Int \n```
+//         signature_documentation scala k2: Int 
 //           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
-//                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
     k2
 //  ^^ reference local 105
   }
@@ -2090,24 +2090,24 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   def visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[_, J]) = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().
 //                display_name visitString
-//                documentation ```scala\ndef visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local106, J[): Unit\n```
+//                signature_documentation scala def visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local106, J[): Unit
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(i)
 //                  display_name i
-//                  documentation ```scala\ni: Int \n```
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                  signature_documentation scala i: Int 
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(s)
 //                          display_name s
-//                          documentation ```scala\ns: CharSequence \n```
+//                          signature_documentation scala s: CharSequence 
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                         ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(stackHead)
 //                                                   display_name stackHead
-//                                                   documentation ```scala\nstackHead: ObjArrVisitor[local106, J[ \n```
+//                                                   signature_documentation scala stackHead: ObjArrVisitor[local106, J[ 
 //                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     val v = stackHead.subVisitor.visitString(s, i)
 //      ^ definition local 107
 //        display_name v
-//        documentation ```scala\nv: Any \n```
+//        signature_documentation scala v: Any 
 //          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(stackHead)
 //                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
@@ -2123,24 +2123,24 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   def visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[_, J]) = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().
 //                   display_name visitStringKey
-//                   documentation ```scala\ndef visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local108, J[): Unit\n```
+//                   signature_documentation scala def visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local108, J[): Unit
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(i)
 //                     display_name i
-//                     documentation ```scala\ni: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala i: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(s)
 //                             display_name s
-//                             documentation ```scala\ns: CharSequence \n```
+//                             signature_documentation scala s: CharSequence 
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(stackHead)
 //                                                      display_name stackHead
-//                                                      documentation ```scala\nstackHead: ObjArrVisitor[local108, J[ \n```
+//                                                      signature_documentation scala stackHead: ObjArrVisitor[local108, J[ 
 //                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     val obj = stackHead.asInstanceOf[ObjVisitor[Any, _]]
 //      ^^^ definition local 109
 //          display_name obj
-//          documentation ```scala\nobj: ObjVisitor[Any, Any] \n```
+//          signature_documentation scala obj: ObjVisitor[Any, Any] 
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(stackHead)
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
 //                                   ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
@@ -2148,7 +2148,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     val keyVisitor = obj.visitKey(i)
 //      ^^^^^^^^^^ definition local 110
 //                 display_name keyVisitor
-//                 documentation ```scala\nkeyVisitor: Visitor[local111, Any[ \n```
+//                 signature_documentation scala keyVisitor: Visitor[local111, Any[ 
 //                   ^^^ reference local 109
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(i)
@@ -2165,42 +2165,42 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
   protected[this] final def parseStringTopLevel(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().
 //                                              display_name parseStringTopLevel
-//                                              documentation ```scala\nfinal def parseStringTopLevel(i: Int, facade: Visitor[local112, J[): (J, Int)\n```
+//                                              signature_documentation scala final def parseStringTopLevel(i: Int, facade: Visitor[local112, J[): (J, Int)
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
 //                                                display_name i
-//                                                documentation ```scala\ni: Int \n```
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                signature_documentation scala i: Int 
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                                                             display_name facade
-//                                                             documentation ```scala\nfacade: Visitor[local112, J[ \n```
+//                                                             signature_documentation scala facade: Visitor[local112, J[ 
 //                                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 113
 //        display_name k
-//        documentation ```scala\nk: Int \n```
+//        signature_documentation scala k: Int 
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 113
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
       val res = facade.visitString(unsafeCharSeqForRange(i + 1, k - i - 2), i)
 //        ^^^ definition local 114
 //            display_name res
-//            documentation ```scala\nres: J \n```
+//            signature_documentation scala res: J 
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
-//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                              ^ reference local 113
-//                                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
-//                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
       (res, k)
 //     ^^^ reference local 114
@@ -2209,14 +2209,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       val k2 = parseStringToOutputBuilder(i, k)
 //        ^^ definition local 115
 //           display_name k2
-//           documentation ```scala\nk2: Int \n```
+//           signature_documentation scala k2: Int 
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
 //                                           ^ reference local 113
       val res = facade.visitString(outputBuilder.makeString(), i)
 //        ^^^ definition local 116
 //            display_name res
-//            documentation ```scala\nres: J \n```
+//            signature_documentation scala res: J 
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
index c46b74f0a..c82b39c6c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
@@ -25,7 +25,7 @@
 public abstract class AsyncEpoxyController extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#
 //                                         display_name AsyncEpoxyController
-//                                         documentation ```java\npublic abstract class AsyncEpoxyController\n```
+//                                         signature_documentation java public abstract class AsyncEpoxyController
 //                                         documentation  A subclass of {@link EpoxyController} that makes it easy to do model building and diffing in\n the background.\n <p>\n See https://github.com/airbnb/epoxy/wiki/Epoxy-Controller#asynchronous-support\n
 //                                         relationship is_implementation semanticdb maven . . ModelCollector#
 //                                         relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -38,7 +38,7 @@ public abstract class AsyncEpoxyController extends EpoxyController {
   public AsyncEpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`().
 //                            display_name <init>
-//                            documentation ```java\npublic AsyncEpoxyController()\n```
+//                            signature_documentation java public AsyncEpoxyController()
 //                            documentation  A new instance that does model building and diffing asynchronously.\n
     this(true);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1).
@@ -51,11 +51,11 @@ public AsyncEpoxyController() {
   public AsyncEpoxyController(boolean enableAsync) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1).
 //                            display_name <init>
-//                            documentation ```java\npublic AsyncEpoxyController(boolean enableAsync)\n```
+//                            signature_documentation java public AsyncEpoxyController(boolean enableAsync)
 //                            documentation  @param enableAsync True to do model building and diffing asynchronously, false to do them\n                    both on the main thread.\n
 //                                    ^^^^^^^^^^^ definition local 0
 //                                                display_name enableAsync
-//                                                documentation ```java\nboolean enableAsync\n```
+//                                                signature_documentation java boolean enableAsync
     this(enableAsync, enableAsync);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
 //       ^^^^^^^^^^^ reference local 0
@@ -68,14 +68,14 @@ public AsyncEpoxyController(boolean enableAsync) {
   public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
 //                            display_name <init>
-//                            documentation ```java\npublic AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing)\n```
+//                            signature_documentation java public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing)
 //                            documentation  Individually control whether model building and diffing are done async or on the main thread.\n
 //                                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 1
 //                                                             display_name enableAsyncModelBuilding
-//                                                             documentation ```java\nboolean enableAsyncModelBuilding\n```
+//                                                             signature_documentation java boolean enableAsyncModelBuilding
 //                                                                      ^^^^^^^^^^^^^^^^^^ definition local 2
 //                                                                                         display_name enableAsyncDiffing
-//                                                                                         documentation ```java\nboolean enableAsyncDiffing\n```
+//                                                                                         signature_documentation java boolean enableAsyncDiffing
     super(getHandler(enableAsyncModelBuilding), getHandler(enableAsyncDiffing));
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#getHandler().
@@ -88,10 +88,10 @@ private static Handler getHandler(boolean enableAsync) {
 //               ^^^^^^^ reference semanticdb maven . . Handler#
 //                       ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#getHandler().
 //                                  display_name getHandler
-//                                  documentation ```java\nprivate static unresolved_type getHandler(boolean enableAsync)\n```
+//                                  signature_documentation java private static unresolved_type getHandler(boolean enableAsync)
 //                                          ^^^^^^^^^^^ definition local 3
 //                                                      display_name enableAsync
-//                                                      documentation ```java\nboolean enableAsync\n```
+//                                                      signature_documentation java boolean enableAsync
     return enableAsync ? getAsyncBackgroundHandler() : MAIN_THREAD_HANDLER;
 //         ^^^^^^^^^^^ reference local 3
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#getAsyncBackgroundHandler().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
index ffaa8d016..f6ba73a35 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
@@ -52,71 +52,71 @@
 class AsyncEpoxyDiffer {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#
 //                     display_name AsyncEpoxyDiffer
-//                     documentation ```java\nclass AsyncEpoxyDiffer\n```
+//                     signature_documentation java class AsyncEpoxyDiffer
 //                     documentation  An adaptation of Google's {@link androidx.recyclerview.widget.AsyncListDiffer}\n that adds support for payloads in changes.\n <p>\n Also adds support for canceling an in progress diff, and makes everything thread safe.\n
 
   interface ResultCallback {
 //          ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
 //                         display_name ResultCallback
-//                         documentation ```java\ninterface ResultCallback\n```
+//                         signature_documentation java interface ResultCallback
     void onResult(@NonNull DiffResult result);
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult().
 //                display_name onResult
-//                documentation ```java\npublic abstract void onResult(DiffResult result)\n```
+//                signature_documentation java public abstract void onResult(DiffResult result)
 //                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
 //                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                                    ^^^^^^ definition local 0
 //                                           display_name result
-//                                           documentation ```java\n@NonNull\nDiffResult result\n```
+//                                           signature_documentation java @NonNull\nDiffResult result
   }
 
   private final Executor executor;
 //              ^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/Executor#
 //                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
 //                                display_name executor
-//                                documentation ```java\nprivate final Executor executor\n```
+//                                signature_documentation java private final Executor executor
   private final ResultCallback resultCallback;
 //              ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#resultCallback.
 //                                            display_name resultCallback
-//                                            documentation ```java\nprivate final ResultCallback resultCallback\n```
+//                                            signature_documentation java private final ResultCallback resultCallback
   private final ItemCallback<EpoxyModel<?>> diffCallback;
 //              ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#diffCallback.
 //                                                       display_name diffCallback
-//                                                       documentation ```java\nprivate final unresolved_type diffCallback\n```
+//                                                       signature_documentation java private final unresolved_type diffCallback
   private final GenerationTracker generationTracker = new GenerationTracker();
 //              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
 //                                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
 //                                                  display_name generationTracker
-//                                                  documentation ```java\nprivate final GenerationTracker generationTracker\n```
+//                                                  signature_documentation java private final GenerationTracker generationTracker
 //                                                        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#`<init>`().
 
   AsyncEpoxyDiffer(
 //^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`().
 //                 display_name <init>
-//                 documentation ```java\nAsyncEpoxyDiffer(unresolved_type handler, ResultCallback resultCallback, unresolved_type diffCallback)\n```
+//                 signature_documentation java AsyncEpoxyDiffer(unresolved_type handler, ResultCallback resultCallback, unresolved_type diffCallback)
       @NonNull Handler handler,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^ reference semanticdb maven . . Handler#
 //                     ^^^^^^^ definition local 1
 //                             display_name handler
-//                             documentation ```java\n@NonNull\nunresolved_type handler\n```
+//                             signature_documentation java @NonNull\nunresolved_type handler
       @NonNull ResultCallback resultCallback,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
 //                            ^^^^^^^^^^^^^^ definition local 2
 //                                           display_name resultCallback
-//                                           documentation ```java\n@NonNull\nResultCallback resultCallback\n```
+//                                           signature_documentation java @NonNull\nResultCallback resultCallback
       @NonNull ItemCallback<EpoxyModel<?>> diffCallback
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^^^^^^^^ definition local 3
 //                                                      display_name diffCallback
-//                                                      documentation ```java\n@NonNull\nunresolved_type diffCallback\n```
+//                                                      signature_documentation java @NonNull\nunresolved_type diffCallback
   ) {
     this.executor = new HandlerExecutor(handler);
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
@@ -137,7 +137,7 @@ interface ResultCallback {
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#list.
 //                                                    display_name list
-//                                                    documentation ```java\n@Nullable\nprivate List<? extends EpoxyModel<?>> list\n```
+//                                                    signature_documentation java @Nullable\nprivate List<? extends EpoxyModel<?>> list
 
   /**
    * Non-null, unmodifiable version of list.
@@ -151,7 +151,7 @@ interface ResultCallback {
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#readOnlyList.
 //                                                            display_name readOnlyList
-//                                                            documentation ```java\n@NonNull\nprivate List<? extends EpoxyModel<?>> readOnlyList\n```
+//                                                            signature_documentation java @NonNull\nprivate List<? extends EpoxyModel<?>> readOnlyList
 //                                                            documentation  Non-null, unmodifiable version of list.\n <p>\n Collections.emptyList when list is null, wrapped by Collections.unmodifiableList otherwise\n
 //                                                              ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#emptyList().
@@ -176,7 +176,7 @@ public List<? extends EpoxyModel<?>> getCurrentList() {
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#getCurrentList().
 //                                                    display_name getCurrentList
-//                                                    documentation ```java\n@AnyThread\n@NonNull\npublic List<? extends EpoxyModel<?>> getCurrentList()\n```
+//                                                    signature_documentation java @AnyThread\n@NonNull\npublic List<? extends EpoxyModel<?>> getCurrentList()
 //                                                    documentation  Get the current List - any diffing to present this list has already been computed and\n dispatched via the ListUpdateCallback.\n <p>\n If a <code>null</code> List, or no List has been submitted, an empty list will be returned.\n <p>\n The returned list may not be mutated - mutations to content must be done through\n {@link #submitList(List)}.\n\n @return current List.\n
     return readOnlyList;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#readOnlyList.
@@ -193,7 +193,7 @@ public List<? extends EpoxyModel<?>> getCurrentList() {
   public boolean cancelDiff() {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff().
 //                          display_name cancelDiff
-//                          documentation ```java\n@SuppressWarnings("WeakerAccess")\n@AnyThread\npublic boolean cancelDiff()\n```
+//                          signature_documentation java @SuppressWarnings("WeakerAccess")\n@AnyThread\npublic boolean cancelDiff()
 //                          documentation  Prevents any ongoing diff from dispatching results. Returns true if there was an ongoing\n diff to cancel, false otherwise.\n
     return generationTracker.finishMaxGeneration();
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
@@ -210,7 +210,7 @@ public boolean cancelDiff() {
   public boolean isDiffInProgress() {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#isDiffInProgress().
 //                                display_name isDiffInProgress
-//                                documentation ```java\n@SuppressWarnings("WeakerAccess")\n@AnyThread\npublic boolean isDiffInProgress()\n```
+//                                signature_documentation java @SuppressWarnings("WeakerAccess")\n@AnyThread\npublic boolean isDiffInProgress()
 //                                documentation  @return True if a diff operation is in progress.\n
     return generationTracker.hasUnfinishedGeneration();
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
@@ -228,24 +228,24 @@ public boolean isDiffInProgress() {
   public synchronized boolean forceListOverride(@Nullable List<EpoxyModel<?>> newList) {
 //                            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                              display_name forceListOverride
-//                                              documentation ```java\n@AnyThread\npublic boolean forceListOverride(List<EpoxyModel<?>> newList)\n```
+//                                              signature_documentation java @AnyThread\npublic boolean forceListOverride(List<EpoxyModel<?>> newList)
 //                                              documentation  Set the current list without performing any diffing. Cancels any diff in progress.\n <p>\n This can be used if you notified a change to the adapter manually and need this list to be\n synced.\n
 //                                               ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                            ^^^^^^^ definition local 4
 //                                                                                    display_name newList
-//                                                                                    documentation ```java\n@Nullable\nList<EpoxyModel<?>> newList\n```
+//                                                                                    signature_documentation java @Nullable\nList<EpoxyModel<?>> newList
     // We need to make sure that generation changes and list updates are synchronized
     final boolean interruptedDiff = cancelDiff();
 //                ^^^^^^^^^^^^^^^ definition local 5
 //                                display_name interruptedDiff
-//                                documentation ```java\nfinal boolean interruptedDiff\n```
+//                                signature_documentation java final boolean interruptedDiff
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff().
     int generation = generationTracker.incrementAndGetNextScheduled();
 //      ^^^^^^^^^^ definition local 6
 //                 display_name generation
-//                 documentation ```java\nint generation\n```
+//                 signature_documentation java int generation
 //                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#incrementAndGetNextScheduled().
     tryLatchList(newList, generation);
@@ -273,25 +273,25 @@ public synchronized boolean forceListOverride(@Nullable List<EpoxyModel<?>> newL
   public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
 //                       display_name submitList
-//                       documentation ```java\n@AnyThread\n@SuppressWarnings("WeakerAccess")\npublic void submitList(List<? extends EpoxyModel<?>> newList)\n```
+//                       signature_documentation java @AnyThread\n@SuppressWarnings("WeakerAccess")\npublic void submitList(List<? extends EpoxyModel<?>> newList)
 //                       documentation  Set a new List representing your latest data.\n <p>\n A diff will be computed between this list and the last list set. If this has not previously\n been called then an empty list is used as the previous list.\n <p>\n The diff computation will be done on the thread given by the handler in the constructor.\n When the diff is done it will be applied (dispatched to the result callback),\n and the new List will be swapped in.\n
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                       ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^^^^^^^ definition local 7
 //                                                                             display_name newList
-//                                                                             documentation ```java\n@Nullable\nfinal List<? extends EpoxyModel<?>> newList\n```
+//                                                                             signature_documentation java @Nullable\nfinal List<? extends EpoxyModel<?>> newList
     final int runGeneration;
 //            ^^^^^^^^^^^^^ definition local 8
 //                          display_name runGeneration
-//                          documentation ```java\nfinal int runGeneration\n```
+//                          signature_documentation java final int runGeneration
     @Nullable final List<? extends EpoxyModel<?>> previousList;
 //   ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^^^^^^^^ definition local 9
 //                                                             display_name previousList
-//                                                             documentation ```java\n@Nullable\nfinal List<? extends EpoxyModel<?>> previousList\n```
+//                                                             signature_documentation java @Nullable\nfinal List<? extends EpoxyModel<?>> previousList
 
     synchronized (this) {
       // Incrementing generation means any currently-running diffs are discarded when they finish
@@ -328,7 +328,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //               ^^^^^^ definition local 10
 //                      display_name result
-//                      documentation ```java\nDiffResult result\n```
+//                      signature_documentation java DiffResult result
       if (previousList != null && !previousList.isEmpty()) {
 //        ^^^^^^^^^^^^ reference local 9
 //                                 ^^^^^^^^^^^^ reference local 9
@@ -365,7 +365,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //        ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
 //                     ^^^^^^^^^^^^^^^ definition local 11
 //                                     display_name wrappedCallback
-//                                     documentation ```java\nfinal DiffCallback wrappedCallback\n```
+//                                     signature_documentation java final DiffCallback wrappedCallback
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
 //                                                        ^^^^^^^^^^^^ reference local 9
 //                                                                      ^^^^^^^ reference local 7
@@ -380,14 +380,14 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
       public void run() {
 //                ^^^ definition local 13
 //                    display_name run
-//                    documentation ```java\n@Override\npublic void run()\n```
+//                    signature_documentation java @Override\npublic void run()
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         DiffUtil.DiffResult result = DiffUtil.calculateDiff(wrappedCallback);
 //      ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //               ^^^^^^^^^^ reference semanticdb maven . . DiffUtil/DiffResult#
 //                          ^^^^^^ definition local 14
 //                                 display_name result
-//                                 documentation ```java\nunresolved_type result\n```
+//                                 signature_documentation java unresolved_type result
 //                                   ^^^^^^^^ reference semanticdb maven . . DiffUtil#
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . DiffUtil#calculateDiff#
 //                                                          ^^^^^^^^^^^^^^^ reference local 11
@@ -407,24 +407,24 @@ public void run() {
   private void onRunCompleted(
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#onRunCompleted().
 //                            display_name onRunCompleted
-//                            documentation ```java\nprivate void onRunCompleted(int runGeneration, List<? extends EpoxyModel<?>> newList, DiffResult result)\n```
+//                            signature_documentation java private void onRunCompleted(int runGeneration, List<? extends EpoxyModel<?>> newList, DiffResult result)
       final int runGeneration,
 //              ^^^^^^^^^^^^^ definition local 15
 //                            display_name runGeneration
-//                            documentation ```java\nfinal int runGeneration\n```
+//                            signature_documentation java final int runGeneration
       @Nullable final List<? extends EpoxyModel<?>> newList,
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^ definition local 16
 //                                                          display_name newList
-//                                                          documentation ```java\n@Nullable\nfinal List<? extends EpoxyModel<?>> newList\n```
+//                                                          signature_documentation java @Nullable\nfinal List<? extends EpoxyModel<?>> newList
       @Nullable final DiffResult result
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                               ^^^^^^ definition local 17
 //                                      display_name result
-//                                      documentation ```java\n@Nullable\nfinal DiffResult result\n```
+//                                      signature_documentation java @Nullable\nfinal DiffResult result
   ) {
 
     // We use an asynchronous handler so that the Runnable can be posted directly back to the main
@@ -439,12 +439,12 @@ private void onRunCompleted(
       public void run() {
 //                ^^^ definition local 19
 //                    display_name run
-//                    documentation ```java\n@Override\npublic void run()\n```
+//                    signature_documentation java @Override\npublic void run()
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         final boolean dispatchResult = tryLatchList(newList, runGeneration);
 //                    ^^^^^^^^^^^^^^ definition local 20
 //                                   display_name dispatchResult
-//                                   documentation ```java\nfinal boolean dispatchResult\n```
+//                                   signature_documentation java final boolean dispatchResult
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
 //                                                  ^^^^^^^ reference local 16
 //                                                           ^^^^^^^^^^^^^ reference local 15
@@ -471,18 +471,18 @@ public void run() {
   private synchronized boolean tryLatchList(@Nullable List<? extends EpoxyModel<?>> newList,
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
 //                                          display_name tryLatchList
-//                                          documentation ```java\n@AnyThread\nprivate boolean tryLatchList(List<? extends EpoxyModel<?>> newList, int runGeneration)\n```
+//                                          signature_documentation java @AnyThread\nprivate boolean tryLatchList(List<? extends EpoxyModel<?>> newList, int runGeneration)
 //                                          documentation  Marks the generation as done, and updates the list if the generation is the most recent.\n\n @return True if the given generation is the most recent, in which case the given list was\n set. False if the generation is old and the list was ignored.\n
 //                                           ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                  ^^^^^^^ definition local 21
 //                                                                                          display_name newList
-//                                                                                          documentation ```java\n@Nullable\nList<? extends EpoxyModel<?>> newList\n```
+//                                                                                          signature_documentation java @Nullable\nList<? extends EpoxyModel<?>> newList
       int runGeneration) {
 //        ^^^^^^^^^^^^^ definition local 22
 //                      display_name runGeneration
-//                      documentation ```java\nint runGeneration\n```
+//                      signature_documentation java int runGeneration
     if (generationTracker.finishGeneration(runGeneration)) {
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
 //                        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishGeneration().
@@ -525,26 +525,26 @@ private synchronized boolean tryLatchList(@Nullable List<? extends EpoxyModel<?>
   private static class GenerationTracker {
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
 //                                       display_name GenerationTracker
-//                                       documentation ```java\nprivate static class GenerationTracker\n```
+//                                       signature_documentation java private static class GenerationTracker
 //                                       documentation  The concept of a "generation" is used to associate a diff result with a point in time when\n it was created. This allows us to handle list updates concurrently, and ignore outdated diffs.\n <p>\n We track the highest start generation, and the highest finished generation, and these must\n be kept in sync, so all access to this class is synchronized.\n <p>\n The general synchronization strategy for this class is that when a generation number\n is queried that action must be synchronized with accessing the current list, so that the\n generation number is synced with the list state at the time it was created.\n
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#`<init>`().
 //                                       display_name <init>
-//                                       documentation ```java\nprivate GenerationTracker()\n```
+//                                       signature_documentation java private GenerationTracker()
 
     // Max generation of currently scheduled runnable
     private volatile int maxScheduledGeneration;
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
 //                                              display_name maxScheduledGeneration
-//                                              documentation ```java\nprivate int maxScheduledGeneration\n```
+//                                              signature_documentation java private int maxScheduledGeneration
     private volatile int maxFinishedGeneration;
 //                       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxFinishedGeneration.
 //                                             display_name maxFinishedGeneration
-//                                             documentation ```java\nprivate int maxFinishedGeneration\n```
+//                                             signature_documentation java private int maxFinishedGeneration
 
     synchronized int incrementAndGetNextScheduled() {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#incrementAndGetNextScheduled().
 //                                                display_name incrementAndGetNextScheduled
-//                                                documentation ```java\nint incrementAndGetNextScheduled()\n```
+//                                                signature_documentation java int incrementAndGetNextScheduled()
       return ++maxScheduledGeneration;
 //             ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
     }
@@ -552,11 +552,11 @@ synchronized int incrementAndGetNextScheduled() {
     synchronized boolean finishMaxGeneration() {
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishMaxGeneration().
 //                                           display_name finishMaxGeneration
-//                                           documentation ```java\nboolean finishMaxGeneration()\n```
+//                                           signature_documentation java boolean finishMaxGeneration()
       boolean isInterrupting = hasUnfinishedGeneration();
 //            ^^^^^^^^^^^^^^ definition local 23
 //                           display_name isInterrupting
-//                           documentation ```java\nboolean isInterrupting\n```
+//                           signature_documentation java boolean isInterrupting
 //                             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#hasUnfinishedGeneration().
       maxFinishedGeneration = maxScheduledGeneration;
 //    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxFinishedGeneration.
@@ -568,7 +568,7 @@ synchronized boolean finishMaxGeneration() {
     synchronized boolean hasUnfinishedGeneration() {
 //                       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#hasUnfinishedGeneration().
 //                                               display_name hasUnfinishedGeneration
-//                                               documentation ```java\nboolean hasUnfinishedGeneration()\n```
+//                                               signature_documentation java boolean hasUnfinishedGeneration()
       return maxScheduledGeneration > maxFinishedGeneration;
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
 //                                    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxFinishedGeneration.
@@ -577,14 +577,14 @@ synchronized boolean hasUnfinishedGeneration() {
     synchronized boolean finishGeneration(int runGeneration) {
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishGeneration().
 //                                        display_name finishGeneration
-//                                        documentation ```java\nboolean finishGeneration(int runGeneration)\n```
+//                                        signature_documentation java boolean finishGeneration(int runGeneration)
 //                                            ^^^^^^^^^^^^^ definition local 24
 //                                                          display_name runGeneration
-//                                                          documentation ```java\nint runGeneration\n```
+//                                                          signature_documentation java int runGeneration
       boolean isLatestGeneration =
 //            ^^^^^^^^^^^^^^^^^^ definition local 25
 //                               display_name isLatestGeneration
-//                               documentation ```java\nboolean isLatestGeneration\n```
+//                               signature_documentation java boolean isLatestGeneration
           maxScheduledGeneration == runGeneration && runGeneration > maxFinishedGeneration;
 //        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
 //                                  ^^^^^^^^^^^^^ reference local 24
@@ -606,7 +606,7 @@ synchronized boolean finishGeneration(int runGeneration) {
   private static class DiffCallback extends DiffUtil.Callback {
 //                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
 //                                  display_name DiffCallback
-//                                  documentation ```java\nprivate static class DiffCallback\n```
+//                                  signature_documentation java private static class DiffCallback
 //                                  relationship is_implementation semanticdb maven . . DiffUtil/Callback#
 //                                          ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //                                                   ^^^^^^^^ reference semanticdb maven . . DiffUtil/Callback#
@@ -616,40 +616,40 @@ private static class DiffCallback extends DiffUtil.Callback {
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
 //                                              display_name oldList
-//                                              documentation ```java\nfinal List<? extends EpoxyModel<?>> oldList\n```
+//                                              signature_documentation java final List<? extends EpoxyModel<?>> oldList
     final List<? extends EpoxyModel<?>> newList;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList.
 //                                              display_name newList
-//                                              documentation ```java\nfinal List<? extends EpoxyModel<?>> newList\n```
+//                                              signature_documentation java final List<? extends EpoxyModel<?>> newList
     private final ItemCallback<EpoxyModel<?>> diffCallback;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
 //                                                         display_name diffCallback
-//                                                         documentation ```java\nprivate final unresolved_type diffCallback\n```
+//                                                         signature_documentation java private final unresolved_type diffCallback
 
     DiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList,
 //  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
 //               display_name <init>
-//               documentation ```java\nDiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList, unresolved_type diffCallback)\n```
+//               signature_documentation java DiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList, unresolved_type diffCallback)
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^ definition local 26
 //                                                     display_name oldList
-//                                                     documentation ```java\nList<? extends EpoxyModel<?>> oldList\n```
+//                                                     signature_documentation java List<? extends EpoxyModel<?>> oldList
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^^^ definition local 27
 //                                                                                            display_name newList
-//                                                                                            documentation ```java\nList<? extends EpoxyModel<?>> newList\n```
+//                                                                                            signature_documentation java List<? extends EpoxyModel<?>> newList
         ItemCallback<EpoxyModel<?>> diffCallback) {
 //      ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^^^^^^^ definition local 28
 //                                               display_name diffCallback
-//                                               documentation ```java\nunresolved_type diffCallback\n```
+//                                               signature_documentation java unresolved_type diffCallback
       this.oldList = oldList;
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
 //                   ^^^^^^^ reference local 26
@@ -666,7 +666,7 @@ private static class DiffCallback extends DiffUtil.Callback {
     public int getOldListSize() {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getOldListSize().
 //                            display_name getOldListSize
-//                            documentation ```java\n@Override\npublic int getOldListSize()\n```
+//                            signature_documentation java @Override\npublic int getOldListSize()
       return oldList.size();
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
 //                   ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -677,7 +677,7 @@ public int getOldListSize() {
     public int getNewListSize() {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getNewListSize().
 //                            display_name getNewListSize
-//                            documentation ```java\n@Override\npublic int getNewListSize()\n```
+//                            signature_documentation java @Override\npublic int getNewListSize()
       return newList.size();
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList.
 //                   ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -688,13 +688,13 @@ public int getNewListSize() {
     public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areItemsTheSame().
 //                                 display_name areItemsTheSame
-//                                 documentation ```java\n@Override\npublic boolean areItemsTheSame(int oldItemPosition, int newItemPosition)\n```
+//                                 signature_documentation java @Override\npublic boolean areItemsTheSame(int oldItemPosition, int newItemPosition)
 //                                     ^^^^^^^^^^^^^^^ definition local 29
 //                                                     display_name oldItemPosition
-//                                                     documentation ```java\nint oldItemPosition\n```
+//                                                     signature_documentation java int oldItemPosition
 //                                                          ^^^^^^^^^^^^^^^ definition local 30
 //                                                                          display_name newItemPosition
-//                                                                          documentation ```java\nint newItemPosition\n```
+//                                                                          signature_documentation java int newItemPosition
       return diffCallback.areItemsTheSame(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . `<any>`#areItemsTheSame#
@@ -714,13 +714,13 @@ public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
     public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
 //                 ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areContentsTheSame().
 //                                    display_name areContentsTheSame
-//                                    documentation ```java\n@Override\npublic boolean areContentsTheSame(int oldItemPosition, int newItemPosition)\n```
+//                                    signature_documentation java @Override\npublic boolean areContentsTheSame(int oldItemPosition, int newItemPosition)
 //                                        ^^^^^^^^^^^^^^^ definition local 31
 //                                                        display_name oldItemPosition
-//                                                        documentation ```java\nint oldItemPosition\n```
+//                                                        signature_documentation java int oldItemPosition
 //                                                             ^^^^^^^^^^^^^^^ definition local 32
 //                                                                             display_name newItemPosition
-//                                                                             documentation ```java\nint newItemPosition\n```
+//                                                                             signature_documentation java int newItemPosition
       return diffCallback.areContentsTheSame(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
 //                        ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . `<any>`#areContentsTheSame#
@@ -743,13 +743,13 @@ public Object getChangePayload(int oldItemPosition, int newItemPosition) {
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getChangePayload().
 //                                 display_name getChangePayload
-//                                 documentation ```java\n@Nullable\n@Override\npublic Object getChangePayload(int oldItemPosition, int newItemPosition)\n```
+//                                 signature_documentation java @Nullable\n@Override\npublic Object getChangePayload(int oldItemPosition, int newItemPosition)
 //                                     ^^^^^^^^^^^^^^^ definition local 33
 //                                                     display_name oldItemPosition
-//                                                     documentation ```java\nint oldItemPosition\n```
+//                                                     signature_documentation java int oldItemPosition
 //                                                          ^^^^^^^^^^^^^^^ definition local 34
 //                                                                          display_name newItemPosition
-//                                                                          documentation ```java\nint newItemPosition\n```
+//                                                                          signature_documentation java int newItemPosition
       return diffCallback.getChangePayload(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
 //                        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . `<any>`#getChangePayload#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
index c0dfdb39d..47fbf1cbf 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
@@ -62,7 +62,7 @@
 public abstract class BaseEpoxyAdapter
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                                     display_name BaseEpoxyAdapter
-//                                     documentation ```java\npublic abstract class BaseEpoxyAdapter\n```
+//                                     signature_documentation java public abstract class BaseEpoxyAdapter
 //                                     relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                     relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
     extends RecyclerView.Adapter<EpoxyViewHolder>
@@ -76,18 +76,18 @@ public abstract class BaseEpoxyAdapter
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#SAVED_STATE_ARG_VIEW_HOLDERS.
 //                                                         display_name SAVED_STATE_ARG_VIEW_HOLDERS
-//                                                         documentation ```java\nprivate static final String SAVED_STATE_ARG_VIEW_HOLDERS\n```
+//                                                         signature_documentation java private static final String SAVED_STATE_ARG_VIEW_HOLDERS
 
   private int spanCount = 1;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
 //                      display_name spanCount
-//                      documentation ```java\nprivate int spanCount\n```
+//                      signature_documentation java private int spanCount
 
   private final ViewTypeManager viewTypeManager = new ViewTypeManager();
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
 //                                              display_name viewTypeManager
-//                                              documentation ```java\nprivate final ViewTypeManager viewTypeManager\n```
+//                                              signature_documentation java private final ViewTypeManager viewTypeManager
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#`<init>`().
   /**
    * Keeps track of view holders that are currently bound so we can save their state in {@link
@@ -97,21 +97,21 @@ public abstract class BaseEpoxyAdapter
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders.
 //                                                display_name boundViewHolders
-//                                                documentation ```java\nprivate final BoundViewHolders boundViewHolders\n```
+//                                                signature_documentation java private final BoundViewHolders boundViewHolders
 //                                                documentation  Keeps track of view holders that are currently bound so we can save their state in {@link\n #onSaveInstanceState(Bundle)}.\n
 //                                                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#`<init>`().
   private ViewHolderState viewHolderState = new ViewHolderState();
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 //                        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
 //                                        display_name viewHolderState
-//                                        documentation ```java\nprivate ViewHolderState viewHolderState\n```
+//                                        signature_documentation java private ViewHolderState viewHolderState
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`().
 
   private final SpanSizeLookup spanSizeLookup = new SpanSizeLookup() {
 //              ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanSizeLookup.
 //                                            display_name spanSizeLookup
-//                                            documentation ```java\nprivate final unresolved_type spanSizeLookup\n```
+//                                            signature_documentation java private final unresolved_type spanSizeLookup
 //                                                  ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 
     @Override
@@ -136,7 +136,7 @@ public int getSpanSize(int position) {
   public BaseEpoxyAdapter() {
 //       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#`<init>`().
 //                        display_name <init>
-//                        documentation ```java\npublic BaseEpoxyAdapter()\n```
+//                        signature_documentation java public BaseEpoxyAdapter()
     // Defaults to stable ids since view models generate unique ids. Set this to false in the
     // subclass if you don't want to support it
     setHasStableIds(true);
@@ -153,13 +153,13 @@ public BaseEpoxyAdapter() {
   protected void onExceptionSwallowed(RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onExceptionSwallowed().
 //                                    display_name onExceptionSwallowed
-//                                    documentation ```java\nprotected void onExceptionSwallowed(RuntimeException exception)\n```
+//                                    signature_documentation java protected void onExceptionSwallowed(RuntimeException exception)
 //                                    documentation  This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy\n will recover, but you can override this to be aware of when they happen.\n
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed().
 //                                    ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                     ^^^^^^^^^ definition local 0
 //                                                               display_name exception
-//                                                               documentation ```java\nRuntimeException exception\n```
+//                                                               signature_documentation java RuntimeException exception
 
   }
 
@@ -168,7 +168,7 @@ protected void onExceptionSwallowed(RuntimeException exception) {
   public int getItemCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemCount().
 //                        display_name getItemCount
-//                        documentation ```java\n@Override\npublic int getItemCount()\n```
+//                        signature_documentation java @Override\npublic int getItemCount()
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
     return getCurrentModels().size();
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
@@ -181,7 +181,7 @@ public int getItemCount() {
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                                        display_name getCurrentModels
-//                                                        documentation ```java\nabstract List<? extends EpoxyModel<?>> getCurrentModels()\n```
+//                                                        signature_documentation java abstract List<? extends EpoxyModel<?>> getCurrentModels()
 //                                                        documentation Return the models currently being used by the adapter to populate the recyclerview. 
 //                                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getCurrentModels().
 //                                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
@@ -189,7 +189,7 @@ public int getItemCount() {
   public boolean isEmpty() {
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isEmpty().
 //                       display_name isEmpty
-//                       documentation ```java\npublic boolean isEmpty()\n```
+//                       signature_documentation java public boolean isEmpty()
     return getCurrentModels().isEmpty();
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                            ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -200,10 +200,10 @@ public boolean isEmpty() {
   public long getItemId(int position) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemId().
 //                      display_name getItemId
-//                      documentation ```java\n@Override\npublic long getItemId(int position)\n```
+//                      signature_documentation java @Override\npublic long getItemId(int position)
 //                          ^^^^^^^^ definition local 1
 //                                   display_name position
-//                                   documentation ```java\nint position\n```
+//                                   signature_documentation java int position
     // This does not call getModelForPosition so that we don't use the id of the empty model when
     // hidden,
     // so that the id stays constant when gone vs shown
@@ -219,10 +219,10 @@ public long getItemId(int position) {
   public int getItemViewType(int position) {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemViewType().
 //                           display_name getItemViewType
-//                           documentation ```java\n@Override\npublic int getItemViewType(int position)\n```
+//                           signature_documentation java @Override\npublic int getItemViewType(int position)
 //                               ^^^^^^^^ definition local 2
 //                                        display_name position
-//                                        documentation ```java\nint position\n```
+//                                        signature_documentation java int position
     return viewTypeManager.getViewTypeAndRememberModel(getModelForPosition(position));
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewTypeAndRememberModel().
@@ -236,19 +236,19 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
 //                                          display_name onCreateViewHolder
-//                                          documentation ```java\n@Override\npublic EpoxyViewHolder onCreateViewHolder(unresolved_type parent, int viewType)\n```
+//                                          signature_documentation java @Override\npublic EpoxyViewHolder onCreateViewHolder(unresolved_type parent, int viewType)
 //                                          ^^^^^^^^^ reference semanticdb maven . . ViewGroup#
 //                                                    ^^^^^^ definition local 3
 //                                                           display_name parent
-//                                                           documentation ```java\nunresolved_type parent\n```
+//                                                           signature_documentation java unresolved_type parent
 //                                                                ^^^^^^^^ definition local 4
 //                                                                         display_name viewType
-//                                                                         documentation ```java\nint viewType\n```
+//                                                                         signature_documentation java int viewType
     EpoxyModel<?> model = viewTypeManager.getModelForViewType(this, viewType);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 5
 //                      display_name model
-//                      documentation ```java\nEpoxyModel<?> model\n```
+//                      signature_documentation java EpoxyModel<?> model
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
 //                                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
 //                                                                  ^^^^^^^^ reference local 4
@@ -256,7 +256,7 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 //  ^^^^ reference semanticdb maven . . View#
 //       ^^^^ definition local 6
 //            display_name view
-//            documentation ```java\nunresolved_type view\n```
+//            signature_documentation java unresolved_type view
 //              ^^^^^ reference local 5
 //                    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
 //                              ^^^^^^ reference local 3
@@ -273,14 +273,14 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
   public void onBindViewHolder(EpoxyViewHolder holder, int position) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder().
 //                             display_name onBindViewHolder
-//                             documentation ```java\n@Override\npublic void onBindViewHolder(EpoxyViewHolder holder, int position)\n```
+//                             signature_documentation java @Override\npublic void onBindViewHolder(EpoxyViewHolder holder, int position)
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^ definition local 7
 //                                                    display_name holder
-//                                                    documentation ```java\nEpoxyViewHolder holder\n```
+//                                                    signature_documentation java EpoxyViewHolder holder
 //                                                         ^^^^^^^^ definition local 8
 //                                                                  display_name position
-//                                                                  documentation ```java\nint position\n```
+//                                                                  signature_documentation java int position
     onBindViewHolder(holder, position, Collections.emptyList());
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
 //                   ^^^^^^ reference local 7
@@ -294,24 +294,24 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position) {
   public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object> payloads) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
 //                             display_name onBindViewHolder
-//                             documentation ```java\n@Override\npublic void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object> payloads)\n```
+//                             signature_documentation java @Override\npublic void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object> payloads)
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^ definition local 9
 //                                                    display_name holder
-//                                                    documentation ```java\nEpoxyViewHolder holder\n```
+//                                                    signature_documentation java EpoxyViewHolder holder
 //                                                         ^^^^^^^^ definition local 10
 //                                                                  display_name position
-//                                                                  documentation ```java\nint position\n```
+//                                                                  signature_documentation java int position
 //                                                                   ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                ^^^^^^^^ definition local 11
 //                                                                                         display_name payloads
-//                                                                                         documentation ```java\nList<Object> payloads\n```
+//                                                                                         signature_documentation java List<Object> payloads
     EpoxyModel<?> modelToShow = getModelForPosition(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^^^^^^^ definition local 12
 //                            display_name modelToShow
-//                            documentation ```java\nEpoxyModel<?> modelToShow\n```
+//                            signature_documentation java EpoxyModel<?> modelToShow
 //                              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                                  ^^^^^^^^ reference local 10
 
@@ -319,7 +319,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^^^^^^^^^^^^^^^^ definition local 13
 //                                     display_name previouslyBoundModel
-//                                     documentation ```java\nEpoxyModel<?> previouslyBoundModel\n```
+//                                     signature_documentation java EpoxyModel<?> previouslyBoundModel
     if (diffPayloadsEnabled()) {
 //      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
       previouslyBoundModel = DiffPayload.getModelFromPayload(payloads, getItemId(position));
@@ -377,7 +377,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
   boolean diffPayloadsEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
 //                            display_name diffPayloadsEnabled
-//                            documentation ```java\nboolean diffPayloadsEnabled()\n```
+//                            signature_documentation java boolean diffPayloadsEnabled()
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#diffPayloadsEnabled().
     return false;
   }
@@ -389,26 +389,26 @@ boolean diffPayloadsEnabled() {
   protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position,
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound().
 //                            display_name onModelBound
-//                            documentation ```java\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, List<Object> payloads)\n```
+//                            signature_documentation java protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, List<Object> payloads)
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound.\n
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                            ^^^^^^ definition local 14
 //                                                   display_name holder
-//                                                   documentation ```java\nEpoxyViewHolder holder\n```
+//                                                   signature_documentation java EpoxyViewHolder holder
 //                                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^ definition local 15
 //                                                                        display_name model
-//                                                                        documentation ```java\nEpoxyModel<?> model\n```
+//                                                                        signature_documentation java EpoxyModel<?> model
 //                                                                             ^^^^^^^^ definition local 16
 //                                                                                      display_name position
-//                                                                                      documentation ```java\nint position\n```
+//                                                                                      signature_documentation java int position
       @Nullable List<Object> payloads) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                   ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                           ^^^^^^^^ definition local 17
 //                                    display_name payloads
-//                                    documentation ```java\n@Nullable\nList<Object> payloads\n```
+//                                    signature_documentation java @Nullable\nList<Object> payloads
     onModelBound(holder, model, position);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 //               ^^^^^^ reference local 14
@@ -419,25 +419,25 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int pos
   void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position,
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
 //                  display_name onModelBound
-//                  documentation ```java\nvoid onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, EpoxyModel<?> previouslyBoundModel)\n```
+//                  signature_documentation java void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, EpoxyModel<?> previouslyBoundModel)
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
 //                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                  ^^^^^^ definition local 18
 //                                         display_name holder
-//                                         documentation ```java\nEpoxyViewHolder holder\n```
+//                                         signature_documentation java EpoxyViewHolder holder
 //                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^ definition local 19
 //                                                              display_name model
-//                                                              documentation ```java\nEpoxyModel<?> model\n```
+//                                                              signature_documentation java EpoxyModel<?> model
 //                                                                   ^^^^^^^^ definition local 20
 //                                                                            display_name position
-//                                                                            documentation ```java\nint position\n```
+//                                                                            signature_documentation java int position
       @Nullable EpoxyModel<?> previouslyBoundModel) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 21
 //                                                 display_name previouslyBoundModel
-//                                                 documentation ```java\n@Nullable\nEpoxyModel<?> previouslyBoundModel\n```
+//                                                 signature_documentation java @Nullable\nEpoxyModel<?> previouslyBoundModel
     onModelBound(holder, model, position);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 //               ^^^^^^ reference local 18
@@ -452,19 +452,19 @@ void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position,
   protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position) {
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 //                            display_name onModelBound
-//                            documentation ```java\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position)\n```
+//                            signature_documentation java protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position)
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound.\n
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                            ^^^^^^ definition local 22
 //                                                   display_name holder
-//                                                   documentation ```java\nEpoxyViewHolder holder\n```
+//                                                   signature_documentation java EpoxyViewHolder holder
 //                                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^ definition local 23
 //                                                                        display_name model
-//                                                                        documentation ```java\nEpoxyModel<?> model\n```
+//                                                                        signature_documentation java EpoxyModel<?> model
 //                                                                             ^^^^^^^^ definition local 24
 //                                                                                      display_name position
-//                                                                                      documentation ```java\nint position\n```
+//                                                                                      signature_documentation java int position
 
   }
 
@@ -477,7 +477,7 @@ protected BoundViewHolders getBoundViewHolders() {
 //          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                           ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
 //                                               display_name getBoundViewHolders
-//                                               documentation ```java\nprotected BoundViewHolders getBoundViewHolders()\n```
+//                                               signature_documentation java protected BoundViewHolders getBoundViewHolders()
 //                                               documentation  Returns an object that manages the view holders currently bound to the RecyclerView. This\n object is mainly used by the base Epoxy adapter to save view states, but you may find it useful\n to help access views or models currently shown in the RecyclerView.\n
 //                                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getBoundViewHolders().
 //                                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getBoundViewHolders().
@@ -489,11 +489,11 @@ EpoxyModel<?> getModelForPosition(int position) {
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                  display_name getModelForPosition
-//                                  documentation ```java\nEpoxyModel<?> getModelForPosition(int position)\n```
+//                                  signature_documentation java EpoxyModel<?> getModelForPosition(int position)
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
 //                                      ^^^^^^^^ definition local 25
 //                                               display_name position
-//                                               documentation ```java\nint position\n```
+//                                               signature_documentation java int position
     return getCurrentModels().get(position);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                            ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -505,11 +505,11 @@ EpoxyModel<?> getModelForPosition(int position) {
   public void onViewRecycled(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewRecycled().
 //                           display_name onViewRecycled
-//                           documentation ```java\n@Override\npublic void onViewRecycled(EpoxyViewHolder holder)\n```
+//                           signature_documentation java @Override\npublic void onViewRecycled(EpoxyViewHolder holder)
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                           ^^^^^^ definition local 26
 //                                                  display_name holder
-//                                                  documentation ```java\nEpoxyViewHolder holder\n```
+//                                                  signature_documentation java EpoxyViewHolder holder
     viewHolderState.save(holder);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
 //                  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
@@ -523,7 +523,7 @@ public void onViewRecycled(EpoxyViewHolder holder) {
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 27
 //                      display_name model
-//                      documentation ```java\nEpoxyModel<?> model\n```
+//                      signature_documentation java EpoxyModel<?> model
 //                        ^^^^^^ reference local 26
 //                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     holder.unbind();
@@ -542,13 +542,13 @@ public void onViewRecycled(EpoxyViewHolder holder) {
   public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
 //                                       display_name onDetachedFromRecyclerView
-//                                       documentation ```java\n@CallSuper\n@Override\npublic void onDetachedFromRecyclerView(unresolved_type recyclerView)\n```
+//                                       signature_documentation java @CallSuper\n@Override\npublic void onDetachedFromRecyclerView(unresolved_type recyclerView)
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView().
 //                                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                             ^^^^^^^^^^^^ definition local 28
 //                                                                          display_name recyclerView
-//                                                                          documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
+//                                                                          signature_documentation java @NonNull\nunresolved_type recyclerView
     // The last model is saved for optimization, but holding onto it can leak anything saved inside
     // the model (like a click listener that references a Fragment). This is only needed during
     // the viewholder creation phase, so it is safe to clear now.
@@ -564,17 +564,17 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
   protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelUnbound().
 //                              display_name onModelUnbound
-//                              documentation ```java\nprotected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
+//                              signature_documentation java protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)
 //                              documentation  Called immediately after a model is unbound from a view holder. Subclasses can override this if\n they want alerts on when a model is unbound.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound().
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                              ^^^^^^ definition local 29
 //                                                     display_name holder
-//                                                     documentation ```java\nEpoxyViewHolder holder\n```
+//                                                     signature_documentation java EpoxyViewHolder holder
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                    ^^^^^ definition local 30
 //                                                                          display_name model
-//                                                                          documentation ```java\nEpoxyModel<?> model\n```
+//                                                                          signature_documentation java EpoxyModel<?> model
 
   }
 
@@ -585,11 +585,11 @@ protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model) {
   public boolean onFailedToRecycleView(EpoxyViewHolder holder) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onFailedToRecycleView().
 //                                     display_name onFailedToRecycleView
-//                                     documentation ```java\n@CallSuper\n@Override\npublic boolean onFailedToRecycleView(EpoxyViewHolder holder)\n```
+//                                     signature_documentation java @CallSuper\n@Override\npublic boolean onFailedToRecycleView(EpoxyViewHolder holder)
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 31
 //                                                            display_name holder
-//                                                            documentation ```java\nEpoxyViewHolder holder\n```
+//                                                            signature_documentation java EpoxyViewHolder holder
     //noinspection unchecked,rawtypes
     return ((EpoxyModel) holder.getModel()).onFailedToRecycleView(holder.objectToBind());
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -607,12 +607,12 @@ public boolean onFailedToRecycleView(EpoxyViewHolder holder) {
   public void onViewAttachedToWindow(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
-//                                   documentation ```java\n@CallSuper\n@Override\npublic void onViewAttachedToWindow(EpoxyViewHolder holder)\n```
+//                                   signature_documentation java @CallSuper\n@Override\npublic void onViewAttachedToWindow(EpoxyViewHolder holder)
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow().
 //                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                   ^^^^^^ definition local 32
 //                                                          display_name holder
-//                                                          documentation ```java\nEpoxyViewHolder holder\n```
+//                                                          signature_documentation java EpoxyViewHolder holder
     //noinspection unchecked,rawtypes
     ((EpoxyModel) holder.getModel()).onViewAttachedToWindow(holder.objectToBind());
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -630,12 +630,12 @@ public void onViewAttachedToWindow(EpoxyViewHolder holder) {
   public void onViewDetachedFromWindow(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
-//                                     documentation ```java\n@CallSuper\n@Override\npublic void onViewDetachedFromWindow(EpoxyViewHolder holder)\n```
+//                                     signature_documentation java @CallSuper\n@Override\npublic void onViewDetachedFromWindow(EpoxyViewHolder holder)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow().
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 33
 //                                                            display_name holder
-//                                                            documentation ```java\nEpoxyViewHolder holder\n```
+//                                                            signature_documentation java EpoxyViewHolder holder
     //noinspection unchecked,rawtypes
     ((EpoxyModel) holder.getModel()).onViewDetachedFromWindow(holder.objectToBind());
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -649,11 +649,11 @@ public void onViewDetachedFromWindow(EpoxyViewHolder holder) {
   public void onSaveInstanceState(Bundle outState) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState().
 //                                display_name onSaveInstanceState
-//                                documentation ```java\npublic void onSaveInstanceState(unresolved_type outState)\n```
+//                                signature_documentation java public void onSaveInstanceState(unresolved_type outState)
 //                                ^^^^^^ reference semanticdb maven . . Bundle#
 //                                       ^^^^^^^^ definition local 34
 //                                                display_name outState
-//                                                documentation ```java\nunresolved_type outState\n```
+//                                                signature_documentation java unresolved_type outState
     // Save the state of currently bound views first so they are included. Views that were
     // scrolled off and unbound will already have had
     // their state saved.
@@ -661,7 +661,7 @@ public void onSaveInstanceState(Bundle outState) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^ definition local 35
 //                              display_name holder
-//                              documentation ```java\nEpoxyViewHolder holder\n```
+//                              signature_documentation java EpoxyViewHolder holder
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders.
       viewHolderState.save(holder);
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
@@ -687,12 +687,12 @@ public void onSaveInstanceState(Bundle outState) {
   public void onRestoreInstanceState(@Nullable Bundle inState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onRestoreInstanceState().
 //                                   display_name onRestoreInstanceState
-//                                   documentation ```java\npublic void onRestoreInstanceState(unresolved_type inState)\n```
+//                                   signature_documentation java public void onRestoreInstanceState(unresolved_type inState)
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                    ^^^^^^^ definition local 36
 //                                                            display_name inState
-//                                                            documentation ```java\n@Nullable\nunresolved_type inState\n```
+//                                                            signature_documentation java @Nullable\nunresolved_type inState
     // To simplify things we enforce that state is restored before views are bound, otherwise it
     // is more difficult to update view state once they are bound
     if (boundViewHolders.size() > 0) {
@@ -730,24 +730,24 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
   protected int getModelPosition(EpoxyModel<?> model) {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               display_name getModelPosition
-//                               documentation ```java\nprotected int getModelPosition(EpoxyModel<?> model)\n```
+//                               signature_documentation java protected int getModelPosition(EpoxyModel<?> model)
 //                               documentation  Finds the position of the given model in the list. Doesn't use indexOf to avoid unnecessary\n equals() calls since we're looking for the same object instance.\n\n @return The position of the given model in the current models list, or -1 if the model can't be\n found.\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition().
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^ definition local 37
 //                                                   display_name model
-//                                                   documentation ```java\nEpoxyModel<?> model\n```
+//                                                   signature_documentation java EpoxyModel<?> model
     int size = getCurrentModels().size();
 //      ^^^^ definition local 38
 //           display_name size
-//           documentation ```java\nint size\n```
+//           signature_documentation java int size
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 39
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 39
 //                      ^^^^ reference local 38
 //                            ^ reference local 39
@@ -774,7 +774,7 @@ public SpanSizeLookup getSpanSizeLookup() {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getSpanSizeLookup().
 //                                        display_name getSpanSizeLookup
-//                                        documentation ```java\npublic unresolved_type getSpanSizeLookup()\n```
+//                                        signature_documentation java public unresolved_type getSpanSizeLookup()
 //                                        documentation  For use with a grid layout manager - use this to get the {@link SpanSizeLookup} for models in\n this adapter. This will delegate span look up calls to each model's {@link\n EpoxyModel#getSpanSize(int, int, int)}. Make sure to also call {@link #setSpanCount(int)} so\n the span count is correct.\n
     return spanSizeLookup;
 //         ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanSizeLookup.
@@ -790,11 +790,11 @@ public SpanSizeLookup getSpanSizeLookup() {
   public void setSpanCount(int spanCount) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount().
 //                         display_name setSpanCount
-//                         documentation ```java\npublic void setSpanCount(int spanCount)\n```
+//                         signature_documentation java public void setSpanCount(int spanCount)
 //                         documentation  If you are using a grid layout manager you must call this to set the span count of the grid.\n This span count will be passed on to the models so models can choose what span count to be.\n\n @see #getSpanSizeLookup()\n @see EpoxyModel#getSpanSize(int, int, int)\n
 //                             ^^^^^^^^^ definition local 40
 //                                       display_name spanCount
-//                                       documentation ```java\nint spanCount\n```
+//                                       signature_documentation java int spanCount
     this.spanCount = spanCount;
 //       ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
 //                   ^^^^^^^^^ reference local 40
@@ -803,7 +803,7 @@ public void setSpanCount(int spanCount) {
   public int getSpanCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getSpanCount().
 //                        display_name getSpanCount
-//                        documentation ```java\npublic int getSpanCount()\n```
+//                        signature_documentation java public int getSpanCount()
     return spanCount;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
   }
@@ -811,7 +811,7 @@ public int getSpanCount() {
   public boolean isMultiSpan() {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isMultiSpan().
 //                           display_name isMultiSpan
-//                           documentation ```java\npublic boolean isMultiSpan()\n```
+//                           signature_documentation java public boolean isMultiSpan()
     return spanCount > 1;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
   }
@@ -830,14 +830,14 @@ public boolean isMultiSpan() {
   public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView().
 //                                  display_name setupStickyHeaderView
-//                                  documentation ```java\n@Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)\n```
+//                                  signature_documentation java @Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)
 //                                  documentation  Optional callback to setup the sticky view,\n by default it doesn't do anything.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView().
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^^ definition local 41
 //                                                             display_name stickyHeader
-//                                                             documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
+//                                                             signature_documentation java @NotNull\nunresolved_type stickyHeader
     // no-op
   }
 
@@ -853,14 +853,14 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
   public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView().
 //                                     display_name teardownStickyHeaderView
-//                                     documentation ```java\n@Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)\n```
+//                                     signature_documentation java @Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)
 //                                     documentation  Optional callback to perform tear down operation on the\n sticky view, by default it doesn't do anything.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView().
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^^^^^ definition local 42
 //                                                                display_name stickyHeader
-//                                                                documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
+//                                                                signature_documentation java @NotNull\nunresolved_type stickyHeader
     // no-op
   }
 
@@ -876,12 +876,12 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
   public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader().
 //                              display_name isStickyHeader
-//                              documentation ```java\n@Override\npublic boolean isStickyHeader(int position)\n```
+//                              signature_documentation java @Override\npublic boolean isStickyHeader(int position)
 //                              documentation  Called to check if the item at the position is a sticky item,\n by default returns false.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader().
 //                                  ^^^^^^^^ definition local 43
 //                                           display_name position
-//                                           documentation ```java\nint position\n```
+//                                           signature_documentation java int position
     return false;
   }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
index a93cc4738..a07c4ae72 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
@@ -8,10 +8,12 @@
 interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                               display_name BaseEpoxyTouchCallback
-//                               documentation ```java\ninterface BaseEpoxyTouchCallback<T extends EpoxyModel>\n```
+//                               signature_documentation java interface BaseEpoxyTouchCallback<T extends EpoxyModel>
+//                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
+//                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                               ^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#[T]
 //                                 display_name T
-//                                 documentation ```java\nT extends EpoxyModel\n```
+//                                 signature_documentation java T extends EpoxyModel
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
   /**
@@ -27,17 +29,17 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
   int getMovementFlagsForModel(T model, int adapterPosition);
 //    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                             display_name getMovementFlagsForModel
-//                             documentation ```java\npublic abstract int getMovementFlagsForModel(T model, int adapterPosition)\n```
+//                             signature_documentation java public abstract int getMovementFlagsForModel(T model, int adapterPosition)
 //                             documentation  Should return a composite flag which defines the enabled move directions in each state\n (idle, swiping, dragging) for the given model.\n <p>\n Return 0 to disable movement for the model.\n\n @param model           The model being targeted for movement.\n @param adapterPosition The current adapter position of the targeted model\n @see androidx.recyclerview.widget.ItemTouchHelper.Callback#getMovementFlags\n
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel().
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#[T]
 //                               ^^^^^ definition local 0
 //                                     display_name model
-//                                     documentation ```java\nT model\n```
+//                                     signature_documentation java T model
 //                                          ^^^^^^^^^^^^^^^ definition local 1
 //                                                          display_name adapterPosition
-//                                                          documentation ```java\nint adapterPosition\n```
+//                                                          signature_documentation java int adapterPosition
 
   /**
    * Called when the user interaction with a view is over and the view has
@@ -52,7 +54,7 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
   void clearView(T model, View itemView);
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //               display_name clearView
-//               documentation ```java\npublic abstract void clearView(T model, unresolved_type itemView)\n```
+//               signature_documentation java public abstract void clearView(T model, unresolved_type itemView)
 //               documentation  Called when the user interaction with a view is over and the view has\n completed its animation. This is a good place to clear all changes on the view that were done\n in other previous touch callbacks (such as on touch start, change, release, etc).\n <p>\n This is the last callback in the lifecycle of a touch event.\n\n @param model    The model whose view is being cleared.\n @param itemView The view being cleared.\n
 //               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
@@ -61,9 +63,9 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //               ^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#[T]
 //                 ^^^^^ definition local 2
 //                       display_name model
-//                       documentation ```java\nT model\n```
+//                       signature_documentation java T model
 //                        ^^^^ reference semanticdb maven . . View#
 //                             ^^^^^^^^ definition local 3
 //                                      display_name itemView
-//                                      documentation ```java\nunresolved_type itemView\n```
+//                                      signature_documentation java unresolved_type itemView
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
index 51f956697..2c24e21e9 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
@@ -25,12 +25,12 @@
 public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                            display_name BoundViewHolders
-//                            documentation ```java\n@SuppressWarnings("WeakerAccess")\npublic class BoundViewHolders\n```
+//                            signature_documentation java @SuppressWarnings("WeakerAccess")\npublic class BoundViewHolders
 //                            documentation Helper class for keeping track of {@link EpoxyViewHolder}s that are currently bound. 
 //                            relationship is_implementation semanticdb maven jdk 11 java/lang/Iterable#
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#`<init>`().
 //                            display_name <init>
-//                            documentation ```java\npublic BoundViewHolders()\n```
+//                            signature_documentation java public BoundViewHolders()
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
   private final LongSparseArray<EpoxyViewHolder> holders = new LongSparseArray<>();
@@ -38,7 +38,7 @@ public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //                                                       display_name holders
-//                                                       documentation ```java\nprivate final LongSparseArray<EpoxyViewHolder> holders\n```
+//                                                       signature_documentation java private final LongSparseArray<EpoxyViewHolder> holders
 //                                                             ^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#`<init>`().
 
   @Nullable
@@ -47,11 +47,11 @@ public EpoxyViewHolder get(EpoxyViewHolder holder) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#get().
 //                           display_name get
-//                           documentation ```java\n@Nullable\npublic EpoxyViewHolder get(EpoxyViewHolder holder)\n```
+//                           signature_documentation java @Nullable\npublic EpoxyViewHolder get(EpoxyViewHolder holder)
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                           ^^^^^^ definition local 0
 //                                                  display_name holder
-//                                                  documentation ```java\nEpoxyViewHolder holder\n```
+//                                                  signature_documentation java EpoxyViewHolder holder
     return holders.get(holder.getItemId());
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //                 ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
@@ -62,11 +62,11 @@ public EpoxyViewHolder get(EpoxyViewHolder holder) {
   public void put(EpoxyViewHolder holder) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#put().
 //                display_name put
-//                documentation ```java\npublic void put(EpoxyViewHolder holder)\n```
+//                signature_documentation java public void put(EpoxyViewHolder holder)
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                ^^^^^^ definition local 1
 //                                       display_name holder
-//                                       documentation ```java\nEpoxyViewHolder holder\n```
+//                                       signature_documentation java EpoxyViewHolder holder
     holders.put(holder.getItemId(), holder);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //          ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#put().
@@ -78,11 +78,11 @@ public void put(EpoxyViewHolder holder) {
   public void remove(EpoxyViewHolder holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#remove().
 //                   display_name remove
-//                   documentation ```java\npublic void remove(EpoxyViewHolder holder)\n```
+//                   signature_documentation java public void remove(EpoxyViewHolder holder)
 //                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                   ^^^^^^ definition local 2
 //                                          display_name holder
-//                                          documentation ```java\nEpoxyViewHolder holder\n```
+//                                          signature_documentation java EpoxyViewHolder holder
     holders.remove(holder.getItemId());
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //          ^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#remove().
@@ -93,7 +93,7 @@ public void remove(EpoxyViewHolder holder) {
   public int size() {
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#size().
 //                display_name size
-//                documentation ```java\npublic int size()\n```
+//                signature_documentation java public int size()
     return holders.size();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //                 ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
@@ -106,7 +106,7 @@ public Iterator<EpoxyViewHolder> iterator() {
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#iterator().
 //                                          display_name iterator
-//                                          documentation ```java\n@Override\npublic Iterator<EpoxyViewHolder> iterator()\n```
+//                                          signature_documentation java @Override\npublic Iterator<EpoxyViewHolder> iterator()
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
     return new HolderIterator();
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#`<init>`().
@@ -118,11 +118,11 @@ public EpoxyViewHolder getHolderForModel(EpoxyModel<?> model) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#getHolderForModel().
 //                                         display_name getHolderForModel
-//                                         documentation ```java\n@Nullable\npublic EpoxyViewHolder getHolderForModel(EpoxyModel<?> model)\n```
+//                                         signature_documentation java @Nullable\npublic EpoxyViewHolder getHolderForModel(EpoxyModel<?> model)
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                       ^^^^^ definition local 3
 //                                                             display_name model
-//                                                             documentation ```java\nEpoxyModel<?> model\n```
+//                                                             signature_documentation java EpoxyModel<?> model
     return holders.get(model.id());
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //                 ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
@@ -133,24 +133,24 @@ public EpoxyViewHolder getHolderForModel(EpoxyModel<?> model) {
   private class HolderIterator implements Iterator<EpoxyViewHolder> {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#
 //                             display_name HolderIterator
-//                             documentation ```java\nprivate class HolderIterator\n```
+//                             signature_documentation java private class HolderIterator
 //                             relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#`<init>`().
 //                             display_name <init>
-//                             documentation ```java\nprivate HolderIterator()\n```
+//                             signature_documentation java private HolderIterator()
 //                                        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
     private int position = 0;
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#position.
 //                       display_name position
-//                       documentation ```java\nprivate int position\n```
+//                       signature_documentation java private int position
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public boolean hasNext() {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext().
 //                         display_name hasNext
-//                         documentation ```java\n@Override\npublic boolean hasNext()\n```
+//                         signature_documentation java @Override\npublic boolean hasNext()
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
       return position < holders.size();
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#position.
@@ -164,7 +164,7 @@ public EpoxyViewHolder next() {
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                         ^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#next().
 //                              display_name next
-//                              documentation ```java\n@Override\npublic EpoxyViewHolder next()\n```
+//                              signature_documentation java @Override\npublic EpoxyViewHolder next()
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
       if (!hasNext()) {
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext().
@@ -182,7 +182,7 @@ public EpoxyViewHolder next() {
     public void remove() {
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#remove().
 //                     display_name remove
-//                     documentation ```java\n@Override\npublic void remove()\n```
+//                     signature_documentation java @Override\npublic void remove()
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
       throw new UnsupportedOperationException();
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
index de9070e18..830a0fb1c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
@@ -112,20 +112,20 @@
 public class Carousel extends EpoxyRecyclerView {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#
 //                    display_name Carousel
-//                    documentation ```java\n@ModelView(saveViewState = true, autoLayout = Size.MATCH_WIDTH_WRAP_HEIGHT)\npublic class Carousel\n```
+//                    signature_documentation java @ModelView(saveViewState = true, autoLayout = Size.MATCH_WIDTH_WRAP_HEIGHT)\npublic class Carousel
 //                    documentation  <i>This feature is in Beta - please report bugs, feature requests, or other feedback at\n https://github.com/airbnb/epoxy by creating a new issue. Thanks!</i>\n\n <p>This is intended as a plug and play "Carousel" view - a Recyclerview with horizontal\n scrolling. It comes with common defaults and performance optimizations and can be either used as\n a top level RecyclerView, or nested within a vertical recyclerview.\n\n <p>This class provides:\n\n <p>1. Automatic integration with Epoxy. A {@link CarouselModel_} is generated from this class,\n which you can use in your EpoxyController. Just call {@link #setModels(List)} to provide the list\n of models to show in the carousel.\n\n <p>2. Default padding for carousel peeking, and an easy way to change this padding - {@link\n #setPaddingDp(int)}\n\n <p>3. Easily control how many items are shown on screen in the carousel at a time - {@link\n #setNumViewsToShowOnScreen(float)}\n\n <p>4. Easy snap support. By default a {@link LinearSnapHelper} is used, but you can set a global\n default for all Carousels with {@link #setDefaultGlobalSnapHelperFactory(SnapHelperFactory)}\n\n <p>5. All of the benefits of {@link EpoxyRecyclerView}\n\n <p>If you need further flexibility you can subclass this view to change its width, height,\n scrolling direction, etc. You can annotate a subclass with {@link ModelView} to generate a new\n EpoxyModel.\n
 //                    relationship is_implementation semanticdb maven . . EpoxyRecyclerView#
 //                            ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . EpoxyRecyclerView#
   public static final int NO_VALUE_SET = -1;
 //                        ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#NO_VALUE_SET.
 //                                     display_name NO_VALUE_SET
-//                                     documentation ```java\npublic static final int NO_VALUE_SET\n```
+//                                     signature_documentation java public static final int NO_VALUE_SET
 
   private static SnapHelperFactory defaultGlobalSnapHelperFactory =
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory.
 //                                                                display_name defaultGlobalSnapHelperFactory
-//                                                                documentation ```java\nprivate static SnapHelperFactory defaultGlobalSnapHelperFactory\n```
+//                                                                signature_documentation java private static SnapHelperFactory defaultGlobalSnapHelperFactory
       new SnapHelperFactory() {
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 
@@ -137,12 +137,12 @@ public SnapHelper buildSnapHelper(Context context) {
 //             ^^^^^^^^^^ reference semanticdb maven . . SnapHelper#
 //                        ^^^^^^^^^^^^^^^ definition local 1
 //                                        display_name buildSnapHelper
-//                                        documentation ```java\n@Override\n@NonNull\npublic unresolved_type buildSnapHelper(unresolved_type context)\n```
+//                                        signature_documentation java @Override\n@NonNull\npublic unresolved_type buildSnapHelper(unresolved_type context)
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
 //                                        ^^^^^^^ reference semanticdb maven . . Context#
 //                                                ^^^^^^^ definition local 2
 //                                                        display_name context
-//                                                        documentation ```java\nunresolved_type context\n```
+//                                                        signature_documentation java unresolved_type context
           return new LinearSnapHelper();
         }
       };
@@ -155,21 +155,21 @@ public SnapHelper buildSnapHelper(Context context) {
   private static int defaultSpacingBetweenItemsDp = 8;
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp.
 //                                                display_name defaultSpacingBetweenItemsDp
-//                                                documentation ```java\n@Dimension(unit = Dimension.DP)\nprivate static int defaultSpacingBetweenItemsDp\n```
+//                                                signature_documentation java @Dimension(unit = Dimension.DP)\nprivate static int defaultSpacingBetweenItemsDp
 
   private float numViewsToShowOnScreen;
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
 //                                     display_name numViewsToShowOnScreen
-//                                     documentation ```java\nprivate float numViewsToShowOnScreen\n```
+//                                     signature_documentation java private float numViewsToShowOnScreen
 
   public Carousel(Context context) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`().
 //                display_name <init>
-//                documentation ```java\npublic Carousel(unresolved_type context)\n```
+//                signature_documentation java public Carousel(unresolved_type context)
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 3
 //                                display_name context
-//                                documentation ```java\nunresolved_type context\n```
+//                                signature_documentation java unresolved_type context
     super(context);
 //        ^^^^^^^ reference local 3
   }
@@ -177,16 +177,16 @@ public Carousel(Context context) {
   public Carousel(Context context, @Nullable AttributeSet attrs) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+1).
 //                display_name <init>
-//                documentation ```java\npublic Carousel(unresolved_type context, unresolved_type attrs)\n```
+//                signature_documentation java public Carousel(unresolved_type context, unresolved_type attrs)
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 4
 //                                display_name context
-//                                documentation ```java\nunresolved_type context\n```
+//                                signature_documentation java unresolved_type context
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . AttributeSet#
 //                                                        ^^^^^ definition local 5
 //                                                              display_name attrs
-//                                                              documentation ```java\n@Nullable\nunresolved_type attrs\n```
+//                                                              signature_documentation java @Nullable\nunresolved_type attrs
     super(context, attrs);
 //        ^^^^^^^ reference local 4
 //                 ^^^^^ reference local 5
@@ -195,19 +195,19 @@ public Carousel(Context context, @Nullable AttributeSet attrs) {
   public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+2).
 //                display_name <init>
-//                documentation ```java\npublic Carousel(unresolved_type context, unresolved_type attrs, int defStyle)\n```
+//                signature_documentation java public Carousel(unresolved_type context, unresolved_type attrs, int defStyle)
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 6
 //                                display_name context
-//                                documentation ```java\nunresolved_type context\n```
+//                                signature_documentation java unresolved_type context
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . AttributeSet#
 //                                                        ^^^^^ definition local 7
 //                                                              display_name attrs
-//                                                              documentation ```java\n@Nullable\nunresolved_type attrs\n```
+//                                                              signature_documentation java @Nullable\nunresolved_type attrs
 //                                                                   ^^^^^^^^ definition local 8
 //                                                                            display_name defStyle
-//                                                                            documentation ```java\nint defStyle\n```
+//                                                                            signature_documentation java int defStyle
     super(context, attrs, defStyle);
 //        ^^^^^^^ reference local 6
 //                 ^^^^^ reference local 7
@@ -219,7 +219,7 @@ public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) {
   protected void init() {
 //               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#init().
 //                    display_name init
-//                    documentation ```java\n@Override\nprotected void init()\n```
+//                    signature_documentation java @Override\nprotected void init()
     super.init();
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^ reference semanticdb maven . . super#init#
@@ -227,7 +227,7 @@ protected void init() {
     int defaultSpacingDp = getDefaultSpacingBetweenItemsDp();
 //      ^^^^^^^^^^^^^^^^ definition local 9
 //                       display_name defaultSpacingDp
-//                       documentation ```java\nint defaultSpacingDp\n```
+//                       signature_documentation java int defaultSpacingDp
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp().
 
     if (defaultSpacingDp >= 0) {
@@ -255,7 +255,7 @@ && getPaddingBottom() == 0) {
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                    ^^^^^^^^^^^^^^^^^ definition local 10
 //                                      display_name snapHelperFactory
-//                                      documentation ```java\nSnapHelperFactory snapHelperFactory\n```
+//                                      signature_documentation java SnapHelperFactory snapHelperFactory
 //                                        ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSnapHelperFactory().
     if (snapHelperFactory != null) {
 //      ^^^^^^^^^^^^^^^^^ reference local 10
@@ -282,7 +282,7 @@ protected SnapHelperFactory getSnapHelperFactory() {
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getSnapHelperFactory().
 //                                                 display_name getSnapHelperFactory
-//                                                 documentation ```java\n@Nullable\nprotected SnapHelperFactory getSnapHelperFactory()\n```
+//                                                 signature_documentation java @Nullable\nprotected SnapHelperFactory getSnapHelperFactory()
 //                                                 documentation  Return a {@link SnapHelperFactory} instance to use with this Carousel. The {@link SnapHelper}\n created by the factory will be attached to this Carousel on view creation. Return null for no\n snap helper to be attached automatically.\n
     return defaultGlobalSnapHelperFactory;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory.
@@ -299,13 +299,13 @@ protected SnapHelperFactory getSnapHelperFactory() {
   public static void setDefaultGlobalSnapHelperFactory(@Nullable SnapHelperFactory factory) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setDefaultGlobalSnapHelperFactory().
 //                                                     display_name setDefaultGlobalSnapHelperFactory
-//                                                     documentation ```java\npublic static void setDefaultGlobalSnapHelperFactory(SnapHelperFactory factory)\n```
+//                                                     signature_documentation java public static void setDefaultGlobalSnapHelperFactory(SnapHelperFactory factory)
 //                                                     documentation  Set a {@link SnapHelperFactory} instance to use with all Carousels by default. The {@link\n SnapHelper} created by the factory will be attached to each Carousel on view creation. Set null\n for no snap helper to be attached automatically.\n\n <p>A Carousel subclass can implement {@link #getSnapHelperFactory()} to override the global\n default.\n
 //                                                      ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                                                                                 ^^^^^^^ definition local 11
 //                                                                                         display_name factory
-//                                                                                         documentation ```java\n@Nullable\nSnapHelperFactory factory\n```
+//                                                                                         signature_documentation java @Nullable\nSnapHelperFactory factory
     defaultGlobalSnapHelperFactory = factory;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory.
 //                                   ^^^^^^^ reference local 11
@@ -318,10 +318,10 @@ public static void setDefaultGlobalSnapHelperFactory(@Nullable SnapHelperFactory
   public void setHasFixedSize(boolean hasFixedSize) {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setHasFixedSize().
 //                            display_name setHasFixedSize
-//                            documentation ```java\n@ModelProp\n@Override\npublic void setHasFixedSize(boolean hasFixedSize)\n```
+//                            signature_documentation java @ModelProp\n@Override\npublic void setHasFixedSize(boolean hasFixedSize)
 //                                    ^^^^^^^^^^^^ definition local 12
 //                                                 display_name hasFixedSize
-//                                                 documentation ```java\nboolean hasFixedSize\n```
+//                                                 signature_documentation java boolean hasFixedSize
     super.setHasFixedSize(hasFixedSize);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . super#setHasFixedSize#
@@ -352,11 +352,11 @@ public void setHasFixedSize(boolean hasFixedSize) {
   public void setNumViewsToShowOnScreen(float viewCount) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setNumViewsToShowOnScreen().
 //                                      display_name setNumViewsToShowOnScreen
-//                                      documentation ```java\n@ModelProp(group = "prefetch")\npublic void setNumViewsToShowOnScreen(float viewCount)\n```
+//                                      signature_documentation java @ModelProp(group = "prefetch")\npublic void setNumViewsToShowOnScreen(float viewCount)
 //                                      documentation  Set the number of views to show on screen in this carousel at a time, partial numbers are\n allowed.\n\n <p>This is useful where you want to easily control for the number of items on screen,\n regardless of screen size. For example, you could set this to 1.2f so that one view is shown in\n full and 20% of the next view "peeks" from the edge to indicate that there is more content to\n scroll to.\n\n <p>Another pattern is setting a different view count depending on whether the device is phone\n or tablet.\n\n <p>Additionally, if a LinearLayoutManager is used this value will be forwarded to {@link\n LinearLayoutManager#setInitialPrefetchItemCount(int)} as a performance optimization.\n\n <p>If you want to only change the prefetch count without changing the view size you can simply\n use {@link #setInitialPrefetchItemCount(int)}\n
 //                                            ^^^^^^^^^ definition local 13
 //                                                      display_name viewCount
-//                                                      documentation ```java\nfloat viewCount\n```
+//                                                      signature_documentation java float viewCount
     numViewsToShowOnScreen = viewCount;
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
 //                           ^^^^^^^^^ reference local 13
@@ -373,7 +373,7 @@ public void setNumViewsToShowOnScreen(float viewCount) {
   public float getNumViewsToShowOnScreen() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getNumViewsToShowOnScreen().
 //                                       display_name getNumViewsToShowOnScreen
-//                                       documentation ```java\npublic float getNumViewsToShowOnScreen()\n```
+//                                       signature_documentation java public float getNumViewsToShowOnScreen()
 //                                       documentation  @return The number of views to show on screen in this carousel at a time.\n
       return numViewsToShowOnScreen;
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
@@ -392,11 +392,11 @@ public float getNumViewsToShowOnScreen() {
   public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount().
 //                                        display_name setInitialPrefetchItemCount
-//                                        documentation ```java\n@ModelProp(group = "prefetch")\npublic void setInitialPrefetchItemCount(int numItemsToPrefetch)\n```
+//                                        signature_documentation java @ModelProp(group = "prefetch")\npublic void setInitialPrefetchItemCount(int numItemsToPrefetch)
 //                                        documentation  If you are using a Linear or Grid layout manager you can use this to set the item prefetch\n count. Only use this if you are not using {@link #setNumViewsToShowOnScreen(float)}\n\n @see #setNumViewsToShowOnScreen(float)\n @see LinearLayoutManager#setInitialPrefetchItemCount(int)\n
 //                                            ^^^^^^^^^^^^^^^^^^ definition local 14
 //                                                               display_name numItemsToPrefetch
-//                                                               documentation ```java\nint numItemsToPrefetch\n```
+//                                                               signature_documentation java int numItemsToPrefetch
     if (numItemsToPrefetch < 0) {
 //      ^^^^^^^^^^^^^^^^^^ reference local 14
       throw new IllegalStateException("numItemsToPrefetch must be greater than 0");
@@ -407,7 +407,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
     int prefetchCount = numItemsToPrefetch == 0 ? 2 : numItemsToPrefetch;
 //      ^^^^^^^^^^^^^ definition local 15
 //                    display_name prefetchCount
-//                    documentation ```java\nint prefetchCount\n```
+//                    signature_documentation java int prefetchCount
 //                      ^^^^^^^^^^^^^^^^^^ reference local 14
 //                                                    ^^^^^^^^^^^^^^^^^^ reference local 14
 
@@ -415,7 +415,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#
 //                ^^^^^^^^^^^^^ definition local 16
 //                              display_name layoutManager
-//                              documentation ```java\nunresolved_type layoutManager\n```
+//                              signature_documentation java unresolved_type layoutManager
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#
     if (layoutManager instanceof LinearLayoutManager) {
 //      ^^^^^^^^^^^^^ reference local 16
@@ -433,11 +433,11 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
   public void onChildAttachedToWindow(View child) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
 //                                    display_name onChildAttachedToWindow
-//                                    documentation ```java\n@Override\npublic void onChildAttachedToWindow(unresolved_type child)\n```
+//                                    signature_documentation java @Override\npublic void onChildAttachedToWindow(unresolved_type child)
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^ definition local 17
 //                                               display_name child
-//                                               documentation ```java\nunresolved_type child\n```
+//                                               signature_documentation java unresolved_type child
     if (numViewsToShowOnScreen > 0) {
 //      ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
       ViewGroup.LayoutParams childLayoutParams = child.getLayoutParams();
@@ -445,7 +445,7 @@ public void onChildAttachedToWindow(View child) {
 //              ^^^^^^^^^^^^ reference semanticdb maven . . ViewGroup/LayoutParams#
 //                           ^^^^^^^^^^^^^^^^^ definition local 18
 //                                             display_name childLayoutParams
-//                                             documentation ```java\nunresolved_type childLayoutParams\n```
+//                                             signature_documentation java unresolved_type childLayoutParams
 //                                               ^^^^^ reference local 17
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . View#getLayoutParams#
       child.setTag(R.id.epoxy_recycler_view_child_initial_size_id, childLayoutParams.width);
@@ -460,13 +460,13 @@ public void onChildAttachedToWindow(View child) {
       int itemSpacingPx = getSpacingDecorator().getPxBetweenItems();
 //        ^^^^^^^^^^^^^ definition local 19
 //                      display_name itemSpacingPx
-//                      documentation ```java\nint itemSpacingPx\n```
+//                      signature_documentation java int itemSpacingPx
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpacingDecorator#
 //                                              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpacingDecorator#getPxBetweenItems#
       int spaceBetweenItems = 0;
 //        ^^^^^^^^^^^^^^^^^ definition local 20
 //                          display_name spaceBetweenItems
-//                          documentation ```java\nint spaceBetweenItems\n```
+//                          signature_documentation java int spaceBetweenItems
       if (itemSpacingPx > 0) {
 //        ^^^^^^^^^^^^^ reference local 19
         // The item decoration space is not counted in the width of the view
@@ -479,13 +479,13 @@ public void onChildAttachedToWindow(View child) {
       boolean isScrollingHorizontally = getLayoutManager().canScrollHorizontally();
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition local 21
 //                                    display_name isScrollingHorizontally
-//                                    documentation ```java\nboolean isScrollingHorizontally\n```
+//                                    signature_documentation java boolean isScrollingHorizontally
 //                                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#
 //                                                         ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#canScrollHorizontally#
       int itemSizeInScrollingDirection =
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 22
 //                                     display_name itemSizeInScrollingDirection
-//                                     documentation ```java\nint itemSizeInScrollingDirection\n```
+//                                     signature_documentation java int itemSizeInScrollingDirection
           (int)
               ((getSpaceForChildren(isScrollingHorizontally) - spaceBetweenItems)
 //              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpaceForChildren().
@@ -514,10 +514,10 @@ public void onChildAttachedToWindow(View child) {
   private int getSpaceForChildren(boolean horizontal) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getSpaceForChildren().
 //                                display_name getSpaceForChildren
-//                                documentation ```java\nprivate int getSpaceForChildren(boolean horizontal)\n```
+//                                signature_documentation java private int getSpaceForChildren(boolean horizontal)
 //                                        ^^^^^^^^^^ definition local 23
 //                                                   display_name horizontal
-//                                                   documentation ```java\nboolean horizontal\n```
+//                                                   signature_documentation java boolean horizontal
     if (horizontal) {
 //      ^^^^^^^^^^ reference local 23
       return getTotalWidthPx(this)
@@ -546,11 +546,11 @@ private int getSpaceForChildren(boolean horizontal) {
   private static int getTotalWidthPx(View view) {
 //                   ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalWidthPx().
 //                                   display_name getTotalWidthPx
-//                                   documentation ```java\n@Px\nprivate static int getTotalWidthPx(unresolved_type view)\n```
+//                                   signature_documentation java @Px\nprivate static int getTotalWidthPx(unresolved_type view)
 //                                   ^^^^ reference semanticdb maven . . View#
 //                                        ^^^^ definition local 24
 //                                             display_name view
-//                                             documentation ```java\nunresolved_type view\n```
+//                                             signature_documentation java unresolved_type view
     if (view.getWidth() > 0) {
 //      ^^^^ reference local 24
 //           ^^^^^^^^ reference semanticdb maven . . View#getWidth#
@@ -573,7 +573,7 @@ private static int getTotalWidthPx(View view) {
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . DisplayMetrics#
 //                 ^^^^^^^ definition local 25
 //                         display_name metrics
-//                         documentation ```java\nunresolved_type metrics\n```
+//                         signature_documentation java unresolved_type metrics
 //                           ^^^^ reference local 24
 //                                ^^^^^^^^^^ reference semanticdb maven . . View#getContext#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven . . View#getContext#getResources#
@@ -588,11 +588,11 @@ private static int getTotalWidthPx(View view) {
   private static int getTotalHeightPx(View view) {
 //                   ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalHeightPx().
 //                                    display_name getTotalHeightPx
-//                                    documentation ```java\n@Px\nprivate static int getTotalHeightPx(unresolved_type view)\n```
+//                                    signature_documentation java @Px\nprivate static int getTotalHeightPx(unresolved_type view)
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^ definition local 26
 //                                              display_name view
-//                                              documentation ```java\nunresolved_type view\n```
+//                                              signature_documentation java unresolved_type view
     if (view.getHeight() > 0) {
 //      ^^^^ reference local 26
 //           ^^^^^^^^^ reference semanticdb maven . . View#getHeight#
@@ -614,7 +614,7 @@ private static int getTotalHeightPx(View view) {
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . DisplayMetrics#
 //                 ^^^^^^^ definition local 27
 //                         display_name metrics
-//                         documentation ```java\nunresolved_type metrics\n```
+//                         signature_documentation java unresolved_type metrics
 //                           ^^^^ reference local 26
 //                                ^^^^^^^^^^ reference semanticdb maven . . View#getContext#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven . . View#getContext#getResources#
@@ -629,17 +629,17 @@ private static int getTotalHeightPx(View view) {
   public void onChildDetachedFromWindow(View child) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#onChildDetachedFromWindow().
 //                                      display_name onChildDetachedFromWindow
-//                                      documentation ```java\n@Override\npublic void onChildDetachedFromWindow(unresolved_type child)\n```
+//                                      signature_documentation java @Override\npublic void onChildDetachedFromWindow(unresolved_type child)
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^ definition local 28
 //                                                 display_name child
-//                                                 documentation ```java\nunresolved_type child\n```
+//                                                 signature_documentation java unresolved_type child
     // Restore the view width that existed before we modified it
     Object initialWidth = child.getTag(R.id.epoxy_recycler_view_child_initial_size_id);
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //         ^^^^^^^^^^^^ definition local 29
 //                      display_name initialWidth
-//                      documentation ```java\nObject initialWidth\n```
+//                      signature_documentation java Object initialWidth
 //                        ^^^^^ reference local 28
 //                              ^^^^^^ reference semanticdb maven . . View#getTag#
 //                                     ^ reference semanticdb maven . . R/
@@ -654,7 +654,7 @@ public void onChildDetachedFromWindow(View child) {
 //              ^^^^^^^^^^^^ reference semanticdb maven . . ViewGroup/LayoutParams#
 //                           ^^^^^^ definition local 30
 //                                  display_name params
-//                                  documentation ```java\nunresolved_type params\n```
+//                                  signature_documentation java unresolved_type params
 //                                    ^^^^^ reference local 28
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . View#getLayoutParams#
       params.width = (int) initialWidth;
@@ -678,7 +678,7 @@ public void onChildDetachedFromWindow(View child) {
   public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int dp) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setDefaultItemSpacingDp().
 //                                           display_name setDefaultItemSpacingDp
-//                                           documentation ```java\npublic static void setDefaultItemSpacingDp(int dp)\n```
+//                                           signature_documentation java public static void setDefaultItemSpacingDp(int dp)
 //                                           documentation  Set a global default to use as the item spacing for all Carousels. Set to 0 for no item\n spacing.\n
 //                                            ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                                      ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -686,7 +686,7 @@ public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int d
 //                                                                       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                                                               ^^ definition local 31
 //                                                                                  display_name dp
-//                                                                                  documentation ```java\n@Dimension(unit = Dimension.DP)\nint dp\n```
+//                                                                                  signature_documentation java @Dimension(unit = Dimension.DP)\nint dp
     defaultSpacingBetweenItemsDp = dp;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp.
 //                                 ^^ reference local 31
@@ -706,7 +706,7 @@ public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int d
   protected int getDefaultSpacingBetweenItemsDp() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp().
 //                                              display_name getDefaultSpacingBetweenItemsDp
-//                                              documentation ```java\n@Dimension(unit = Dimension.DP)\nprotected int getDefaultSpacingBetweenItemsDp()\n```
+//                                              signature_documentation java @Dimension(unit = Dimension.DP)\nprotected int getDefaultSpacingBetweenItemsDp()
 //                                              documentation  Return the item spacing to use in this carousel, or 0 for no spacing.\n\n <p>By default this uses the global default set in {@link #setDefaultItemSpacingDp(int)}, but\n subclasses can override this to specify their own value.\n
     return defaultSpacingBetweenItemsDp;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp.
@@ -722,16 +722,16 @@ protected int getDefaultSpacingBetweenItemsDp() {
   public void setPaddingRes(@DimenRes int paddingRes) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingRes().
 //                          display_name setPaddingRes
-//                          documentation ```java\n@ModelProp(group = "padding")\npublic void setPaddingRes(int paddingRes)\n```
+//                          signature_documentation java @ModelProp(group = "padding")\npublic void setPaddingRes(int paddingRes)
 //                          documentation  Set a dimension resource to specify the padding value to use on each side of the carousel and\n in between carousel items.\n
 //                           ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                        ^^^^^^^^^^ definition local 32
 //                                                   display_name paddingRes
-//                                                   documentation ```java\n@DimenRes\nint paddingRes\n```
+//                                                   signature_documentation java @DimenRes\nint paddingRes
     int px = resToPx(paddingRes);
 //      ^^ definition local 33
 //         display_name px
-//         documentation ```java\nint px\n```
+//         signature_documentation java int px
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#resToPx#
 //                   ^^^^^^^^^^ reference local 32
     setPadding(px, px, px, px);
@@ -758,7 +758,7 @@ public void setPaddingRes(@DimenRes int paddingRes) {
   public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingDp().
 //                         display_name setPaddingDp
-//                         documentation ```java\n@ModelProp(defaultValue = "NO_VALUE_SET", group = "padding")\npublic void setPaddingDp(int paddingDp)\n```
+//                         signature_documentation java @ModelProp(defaultValue = "NO_VALUE_SET", group = "padding")\npublic void setPaddingDp(int paddingDp)
 //                         documentation  Set a DP value to use as the padding on each side of the carousel and in between carousel\n items.\n\n <p>The default as the value returned by {@link #getDefaultSpacingBetweenItemsDp()}\n
 //                          ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                    ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -766,11 +766,11 @@ public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
 //                                                     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                                             ^^^^^^^^^ definition local 34
 //                                                                       display_name paddingDp
-//                                                                       documentation ```java\n@Dimension(unit = Dimension.DP)\nint paddingDp\n```
+//                                                                       signature_documentation java @Dimension(unit = Dimension.DP)\nint paddingDp
     int px = dpToPx(paddingDp != NO_VALUE_SET ? paddingDp : getDefaultSpacingBetweenItemsDp());
 //      ^^ definition local 35
 //         display_name px
-//         documentation ```java\nint px\n```
+//         signature_documentation java int px
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#dpToPx#
 //                  ^^^^^^^^^ reference local 34
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#NO_VALUE_SET.
@@ -799,13 +799,13 @@ public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
   public void setPadding(@Nullable Padding padding) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPadding().
 //                       display_name setPadding
-//                       documentation ```java\n@ModelProp(group = "padding")\npublic void setPadding(Padding padding)\n```
+//                       signature_documentation java @ModelProp(group = "padding")\npublic void setPadding(Padding padding)
 //                       documentation  Use the {@link Padding} class to specify individual padding values for each side of the\n carousel, as well as item spacing.\n\n <p>A value of null will set all padding and item spacing to 0.\n
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                 ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                                         ^^^^^^^ definition local 36
 //                                                 display_name padding
-//                                                 documentation ```java\n@Nullable\nPadding padding\n```
+//                                                 signature_documentation java @Nullable\nPadding padding
     if (padding == null) {
 //      ^^^^^^^ reference local 36
       setPaddingDp(0);
@@ -896,58 +896,58 @@ public void setPadding(@Nullable Padding padding) {
   public static class Padding {
 //                    ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                            display_name Padding
-//                            documentation ```java\npublic static class Padding\n```
+//                            signature_documentation java public static class Padding
 //                            documentation  Used to specify individual padding values programmatically.\n\n @see #setPadding(Padding)\n
     public final int left;
 //                   ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
 //                        display_name left
-//                        documentation ```java\npublic final int left\n```
+//                        signature_documentation java public final int left
     public final int top;
 //                   ^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#top.
 //                       display_name top
-//                       documentation ```java\npublic final int top\n```
+//                       signature_documentation java public final int top
     public final int right;
 //                   ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#right.
 //                         display_name right
-//                         documentation ```java\npublic final int right\n```
+//                         signature_documentation java public final int right
     public final int bottom;
 //                   ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#bottom.
 //                          display_name bottom
-//                          documentation ```java\npublic final int bottom\n```
+//                          signature_documentation java public final int bottom
     public final int itemSpacing;
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#itemSpacing.
 //                               display_name itemSpacing
-//                               documentation ```java\npublic final int itemSpacing\n```
+//                               signature_documentation java public final int itemSpacing
     public final PaddingType paddingType;
 //               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#paddingType.
 //                                       display_name paddingType
-//                                       documentation ```java\npublic final PaddingType paddingType\n```
+//                                       signature_documentation java public final PaddingType paddingType
 
     enum PaddingType {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
 //                   display_name PaddingType
-//                   documentation ```java\nenum PaddingType\n```
+//                   signature_documentation java enum PaddingType
 //                   relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                   relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //                   relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
 //                   display_name <init>
-//                   documentation ```java\nprivate PaddingType()\n```
+//                   signature_documentation java private PaddingType()
       PX,
 //    ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#PX.
 //       display_name PX
-//       documentation ```java\nPaddingType.PX /* ordinal 0 */\n```
+//       signature_documentation java PaddingType.PX /* ordinal 0 */
 //    ^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
       DP,
 //    ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#DP.
 //       display_name DP
-//       documentation ```java\nPaddingType.DP /* ordinal 1 */\n```
+//       signature_documentation java PaddingType.DP /* ordinal 1 */
 //    ^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
       RESOURCE
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#RESOURCE.
 //             display_name RESOURCE
-//             documentation ```java\nPaddingType.RESOURCE /* ordinal 2 */\n```
+//             signature_documentation java PaddingType.RESOURCE /* ordinal 2 */
 //    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
     }
 
@@ -960,16 +960,16 @@ public static Padding resource(@DimenRes int paddingRes, @DimenRes int itemSpaci
 //                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource().
 //                                 display_name resource
-//                                 documentation ```java\npublic static Padding resource(int paddingRes, int itemSpacingRes)\n```
+//                                 signature_documentation java public static Padding resource(int paddingRes, int itemSpacingRes)
 //                                 documentation  @param paddingRes Padding as dimension resource.\n @param itemSpacingRes Space as dimension resource to add between each carousel item. Will be\n     implemented via an item decoration.\n
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                               ^^^^^^^^^^ definition local 37
 //                                                          display_name paddingRes
-//                                                          documentation ```java\n@DimenRes\nint paddingRes\n```
+//                                                          signature_documentation java @DimenRes\nint paddingRes
 //                                                            ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                                                         ^^^^^^^^^^^^^^ definition local 38
 //                                                                                        display_name itemSpacingRes
-//                                                                                        documentation ```java\n@DimenRes\nint itemSpacingRes\n```
+//                                                                                        signature_documentation java @DimenRes\nint itemSpacingRes
       return new Padding(
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
           paddingRes, paddingRes, paddingRes, paddingRes, itemSpacingRes, PaddingType.RESOURCE);
@@ -994,33 +994,33 @@ public static Padding resource(
 //                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource(+1).
 //                                 display_name resource
-//                                 documentation ```java\npublic static Padding resource(int leftRes, int topRes, int rightRes, int bottomRes, int itemSpacingRes)\n```
+//                                 signature_documentation java public static Padding resource(int leftRes, int topRes, int rightRes, int bottomRes, int itemSpacingRes)
 //                                 documentation  @param leftRes Left padding as dimension resource.\n @param topRes Top padding as dimension resource.\n @param rightRes Right padding as dimension resource.\n @param bottomRes Bottom padding as dimension resource.\n @param itemSpacingRes Space as dimension resource to add between each carousel item. Will be\n     implemented via an item decoration.\n
         @DimenRes int leftRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^ definition local 39
 //                            display_name leftRes
-//                            documentation ```java\n@DimenRes\nint leftRes\n```
+//                            signature_documentation java @DimenRes\nint leftRes
         @DimenRes int topRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^ definition local 40
 //                           display_name topRes
-//                           documentation ```java\n@DimenRes\nint topRes\n```
+//                           signature_documentation java @DimenRes\nint topRes
         @DimenRes int rightRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^ definition local 41
 //                             display_name rightRes
-//                             documentation ```java\n@DimenRes\nint rightRes\n```
+//                             signature_documentation java @DimenRes\nint rightRes
         @DimenRes int bottomRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^^ definition local 42
 //                              display_name bottomRes
-//                              documentation ```java\n@DimenRes\nint bottomRes\n```
+//                              signature_documentation java @DimenRes\nint bottomRes
         @DimenRes int itemSpacingRes) {
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^^^^^^^ definition local 43
 //                                   display_name itemSpacingRes
-//                                   documentation ```java\n@DimenRes\nint itemSpacingRes\n```
+//                                   signature_documentation java @DimenRes\nint itemSpacingRes
       return new Padding(
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
           leftRes, topRes, rightRes, bottomRes, itemSpacingRes, PaddingType.RESOURCE);
@@ -1042,7 +1042,7 @@ public static Padding dp(
 //                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                        ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp().
 //                           display_name dp
-//                           documentation ```java\npublic static Padding dp(int paddingDp, int itemSpacingDp)\n```
+//                           signature_documentation java public static Padding dp(int paddingDp, int itemSpacingDp)
 //                           documentation  @param paddingDp Padding in dp.\n @param itemSpacingDp Space in dp to add between each carousel item. Will be implemented via\n     an item decoration.\n
         @Dimension(unit = Dimension.DP) int paddingDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -1051,7 +1051,7 @@ public static Padding dp(
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^^^ definition local 44
 //                                                    display_name paddingDp
-//                                                    documentation ```java\n@Dimension(unit = Dimension.DP)\nint paddingDp\n```
+//                                                    signature_documentation java @Dimension(unit = Dimension.DP)\nint paddingDp
         @Dimension(unit = Dimension.DP) int itemSpacingDp) {
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1059,7 +1059,7 @@ public static Padding dp(
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^^^^^^^ definition local 45
 //                                                        display_name itemSpacingDp
-//                                                        documentation ```java\n@Dimension(unit = Dimension.DP)\nint itemSpacingDp\n```
+//                                                        signature_documentation java @Dimension(unit = Dimension.DP)\nint itemSpacingDp
       return new Padding(paddingDp, paddingDp, paddingDp, paddingDp, itemSpacingDp, PaddingType.DP);
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                       ^^^^^^^^^ reference local 44
@@ -1083,7 +1083,7 @@ public static Padding dp(
 //                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                        ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp(+1).
 //                           display_name dp
-//                           documentation ```java\npublic static Padding dp(int leftDp, int topDp, int rightDp, int bottomDp, int itemSpacingDp)\n```
+//                           signature_documentation java public static Padding dp(int leftDp, int topDp, int rightDp, int bottomDp, int itemSpacingDp)
 //                           documentation  @param leftDp Left padding in dp.\n @param topDp Top padding in dp.\n @param rightDp Right padding in dp.\n @param bottomDp Bottom padding in dp.\n @param itemSpacingDp Space in dp to add between each carousel item. Will be implemented via\n     an item decoration.\n
         @Dimension(unit = Dimension.DP) int leftDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -1092,7 +1092,7 @@ public static Padding dp(
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^ definition local 46
 //                                                 display_name leftDp
-//                                                 documentation ```java\n@Dimension(unit = Dimension.DP)\nint leftDp\n```
+//                                                 signature_documentation java @Dimension(unit = Dimension.DP)\nint leftDp
         @Dimension(unit = Dimension.DP) int topDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1100,7 +1100,7 @@ public static Padding dp(
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^ definition local 47
 //                                                display_name topDp
-//                                                documentation ```java\n@Dimension(unit = Dimension.DP)\nint topDp\n```
+//                                                signature_documentation java @Dimension(unit = Dimension.DP)\nint topDp
         @Dimension(unit = Dimension.DP) int rightDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1108,7 +1108,7 @@ public static Padding dp(
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^ definition local 48
 //                                                  display_name rightDp
-//                                                  documentation ```java\n@Dimension(unit = Dimension.DP)\nint rightDp\n```
+//                                                  signature_documentation java @Dimension(unit = Dimension.DP)\nint rightDp
         @Dimension(unit = Dimension.DP) int bottomDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1116,7 +1116,7 @@ public static Padding dp(
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^^ definition local 49
 //                                                   display_name bottomDp
-//                                                   documentation ```java\n@Dimension(unit = Dimension.DP)\nint bottomDp\n```
+//                                                   signature_documentation java @Dimension(unit = Dimension.DP)\nint bottomDp
         @Dimension(unit = Dimension.DP) int itemSpacingDp) {
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1124,7 +1124,7 @@ public static Padding dp(
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#DP.
 //                                          ^^^^^^^^^^^^^ definition local 50
 //                                                        display_name itemSpacingDp
-//                                                        documentation ```java\n@Dimension(unit = Dimension.DP)\nint itemSpacingDp\n```
+//                                                        signature_documentation java @Dimension(unit = Dimension.DP)\nint itemSpacingDp
       return new Padding(leftDp, topDp, rightDp, bottomDp, itemSpacingDp, PaddingType.DP);
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                       ^^^^^^ reference local 46
@@ -1144,16 +1144,16 @@ public static Padding dp(
     public Padding(@Px int paddingPx, @Px int itemSpacingPx) {
 //         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`().
 //                 display_name <init>
-//                 documentation ```java\npublic Padding(int paddingPx, int itemSpacingPx)\n```
+//                 signature_documentation java public Padding(int paddingPx, int itemSpacingPx)
 //                 documentation  @param paddingPx Padding in pixels to add on all sides of the carousel\n @param itemSpacingPx Space in pixels to add between each carousel item. Will be implemented\n     via an item decoration.\n
 //                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                         ^^^^^^^^^ definition local 51
 //                                   display_name paddingPx
-//                                   documentation ```java\n@Px\nint paddingPx\n```
+//                                   signature_documentation java @Px\nint paddingPx
 //                                     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                            ^^^^^^^^^^^^^ definition local 52
 //                                                          display_name itemSpacingPx
-//                                                          documentation ```java\n@Px\nint itemSpacingPx\n```
+//                                                          signature_documentation java @Px\nint itemSpacingPx
       this(paddingPx, paddingPx, paddingPx, paddingPx, itemSpacingPx, PaddingType.PX);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //         ^^^^^^^^^ reference local 51
@@ -1176,29 +1176,29 @@ public Padding(@Px int paddingPx, @Px int itemSpacingPx) {
     public Padding(
 //         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+1).
 //                 display_name <init>
-//                 documentation ```java\npublic Padding(int leftPx, int topPx, int rightPx, int bottomPx, int itemSpacingPx)\n```
+//                 signature_documentation java public Padding(int leftPx, int topPx, int rightPx, int bottomPx, int itemSpacingPx)
 //                 documentation  @param leftPx Left padding in pixels.\n @param topPx Top padding in pixels.\n @param rightPx Right padding in pixels.\n @param bottomPx Bottom padding in pixels.\n @param itemSpacingPx Space in pixels to add between each carousel item. Will be implemented\n     via an item decoration.\n
         @Px int leftPx, @Px int topPx, @Px int rightPx, @Px int bottomPx, @Px int itemSpacingPx) {
 //       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //              ^^^^^^ definition local 53
 //                     display_name leftPx
-//                     documentation ```java\n@Px\nint leftPx\n```
+//                     signature_documentation java @Px\nint leftPx
 //                       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                              ^^^^^ definition local 54
 //                                    display_name topPx
-//                                    documentation ```java\n@Px\nint topPx\n```
+//                                    signature_documentation java @Px\nint topPx
 //                                      ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                             ^^^^^^^ definition local 55
 //                                                     display_name rightPx
-//                                                     documentation ```java\n@Px\nint rightPx\n```
+//                                                     signature_documentation java @Px\nint rightPx
 //                                                       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                                              ^^^^^^^^ definition local 56
 //                                                                       display_name bottomPx
-//                                                                       documentation ```java\n@Px\nint bottomPx\n```
+//                                                                       signature_documentation java @Px\nint bottomPx
 //                                                                         ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                                                                ^^^^^^^^^^^^^ definition local 57
 //                                                                                              display_name itemSpacingPx
-//                                                                                              documentation ```java\n@Px\nint itemSpacingPx\n```
+//                                                                                              signature_documentation java @Px\nint itemSpacingPx
       this(leftPx, topPx, rightPx, bottomPx, itemSpacingPx, PaddingType.PX);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //         ^^^^^^ reference local 53
@@ -1222,28 +1222,28 @@ public Padding(
     private Padding(
 //          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                  display_name <init>
-//                  documentation ```java\nprivate Padding(int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType)\n```
+//                  signature_documentation java private Padding(int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType)
 //                  documentation  @param left Left padding.\n @param top Top padding.\n @param right Right padding.\n @param bottom Bottom padding.\n @param itemSpacing Space to add between each carousel item. Will be implemented via an item\n     decoration.\n @param paddingType Unit / Type of the given paddings/ itemspacing.\n
         int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType) {
 //          ^^^^ definition local 58
 //               display_name left
-//               documentation ```java\nint left\n```
+//               signature_documentation java int left
 //                    ^^^ definition local 59
 //                        display_name top
-//                        documentation ```java\nint top\n```
+//                        signature_documentation java int top
 //                             ^^^^^ definition local 60
 //                                   display_name right
-//                                   documentation ```java\nint right\n```
+//                                   signature_documentation java int right
 //                                        ^^^^^^ definition local 61
 //                                               display_name bottom
-//                                               documentation ```java\nint bottom\n```
+//                                               signature_documentation java int bottom
 //                                                    ^^^^^^^^^^^ definition local 62
 //                                                                display_name itemSpacing
-//                                                                documentation ```java\nint itemSpacing\n```
+//                                                                signature_documentation java int itemSpacing
 //                                                                 ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
 //                                                                             ^^^^^^^^^^^ definition local 63
 //                                                                                         display_name paddingType
-//                                                                                         documentation ```java\nPaddingType paddingType\n```
+//                                                                                         signature_documentation java PaddingType paddingType
 
       this.left = left;
 //         ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
@@ -1270,12 +1270,12 @@ private Padding(
     public boolean equals(Object o) {
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#equals().
 //                        display_name equals
-//                        documentation ```java\n@Override\npublic boolean equals(Object o)\n```
+//                        signature_documentation java @Override\npublic boolean equals(Object o)
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                               ^ definition local 64
 //                                 display_name o
-//                                 documentation ```java\nObject o\n```
+//                                 signature_documentation java Object o
       if (this == o) {
 //                ^ reference local 64
         return true;
@@ -1292,7 +1292,7 @@ public boolean equals(Object o) {
 //    ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //            ^^^^^^^ definition local 65
 //                    display_name padding
-//                    documentation ```java\nPadding padding\n```
+//                    signature_documentation java Padding padding
 //                       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                                ^ reference local 64
 
@@ -1331,12 +1331,12 @@ public boolean equals(Object o) {
     public int hashCode() {
 //             ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#hashCode().
 //                      display_name hashCode
-//                      documentation ```java\n@Override\npublic int hashCode()\n```
+//                      signature_documentation java @Override\npublic int hashCode()
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
       int result = left;
 //        ^^^^^^ definition local 66
 //               display_name result
-//               documentation ```java\nint result\n```
+//               signature_documentation java int result
 //                 ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
       result = 31 * result + top;
 //    ^^^^^^ reference local 66
@@ -1364,13 +1364,13 @@ public int hashCode() {
   public void setModels(@NonNull List<? extends EpoxyModel<?>> models) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setModels().
 //                      display_name setModels
-//                      documentation ```java\n@ModelProp\npublic void setModels(List<? extends EpoxyModel<?>> models)\n```
+//                      signature_documentation java @ModelProp\npublic void setModels(List<? extends EpoxyModel<?>> models)
 //                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^^^^^^ definition local 67
 //                                                                    display_name models
-//                                                                    documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> models\n```
+//                                                                    signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> models
     super.setModels(models);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^ reference semanticdb maven . . super#setModels#
@@ -1382,7 +1382,7 @@ public void setModels(@NonNull List<? extends EpoxyModel<?>> models) {
   public void clear() {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#clear().
 //                  display_name clear
-//                  documentation ```java\n@OnViewRecycled\npublic void clear()\n```
+//                  signature_documentation java @OnViewRecycled\npublic void clear()
     super.clear();
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^ reference semanticdb maven . . super#clear#
@@ -1392,11 +1392,11 @@ public void clear() {
   public abstract static class SnapHelperFactory {
 //                             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                                               display_name SnapHelperFactory
-//                                               documentation ```java\npublic abstract static class SnapHelperFactory\n```
+//                                               signature_documentation java public abstract static class SnapHelperFactory
 //                                               documentation Provide a SnapHelper implementation you want to use with a Carousel. 
 //                             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#`<init>`().
 //                                               display_name <init>
-//                                               documentation ```java\npublic SnapHelperFactory()\n```
+//                                               signature_documentation java public SnapHelperFactory()
     /**
      * Create and return a new instance of a {@link androidx.recyclerview.widget.SnapHelper} for use
      * with a Carousel.
@@ -1407,11 +1407,11 @@ public abstract static class SnapHelperFactory {
 //                  ^^^^^^^^^^ reference semanticdb maven . . SnapHelper#
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
 //                                             display_name buildSnapHelper
-//                                             documentation ```java\n@NonNull\npublic abstract unresolved_type buildSnapHelper(unresolved_type context)\n```
+//                                             signature_documentation java @NonNull\npublic abstract unresolved_type buildSnapHelper(unresolved_type context)
 //                                             documentation  Create and return a new instance of a {@link androidx.recyclerview.widget.SnapHelper} for use\n with a Carousel.\n
 //                                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                                     ^^^^^^^ definition local 68
 //                                                             display_name context
-//                                                             documentation ```java\nunresolved_type context\n```
+//                                                             signature_documentation java unresolved_type context
   }
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
index ee5f1e8f8..264120b72 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
@@ -13,35 +13,35 @@
 public abstract class ControllerHelper<T extends EpoxyController> {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                                     display_name ControllerHelper
-//                                     documentation ```java\npublic abstract class ControllerHelper<T extends EpoxyController>\n```
+//                                     signature_documentation java public abstract class ControllerHelper<T extends EpoxyController>
 //                                     documentation  A helper class for {@link EpoxyController} to handle {@link\n com.airbnb.epoxy.AutoModel} models. This is only implemented by the generated classes created the\n annotation processor.\n
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#`<init>`().
 //                                     display_name <init>
-//                                     documentation ```java\npublic ControllerHelper()\n```
+//                                     signature_documentation java public ControllerHelper()
 //                                     ^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
 //                                       display_name T
-//                                       documentation ```java\nT extends EpoxyController\n```
+//                                       signature_documentation java T extends EpoxyController
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   public abstract void resetAutoModels();
 //                     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#resetAutoModels().
 //                                     display_name resetAutoModels
-//                                     documentation ```java\npublic abstract void resetAutoModels()\n```
+//                                     signature_documentation java public abstract void resetAutoModels()
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#resetAutoModels().
 
   protected void validateModelHashCodesHaveNotChanged(T controller) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
 //                                                    display_name validateModelHashCodesHaveNotChanged
-//                                                    documentation ```java\nprotected void validateModelHashCodesHaveNotChanged(T controller)\n```
+//                                                    signature_documentation java protected void validateModelHashCodesHaveNotChanged(T controller)
 //                                                    ^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
 //                                                      ^^^^^^^^^^ definition local 0
 //                                                                 display_name controller
-//                                                                 documentation ```java\nT controller\n```
+//                                                                 signature_documentation java T controller
     List<EpoxyModel<?>> currentModels = controller.getAdapter().getCopyOfModels();
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^^^ definition local 1
 //                                    display_name currentModels
-//                                    documentation ```java\nList<EpoxyModel<?>> currentModels\n```
+//                                    signature_documentation java List<EpoxyModel<?>> currentModels
 //                                      ^^^^^^^^^^ reference local 0
 //                                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#getAdapter().
 //                                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCopyOfModels().
@@ -49,7 +49,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
     for (int i = 0; i < currentModels.size(); i++) {
 //           ^ definition local 2
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 2
 //                      ^^^^^^^^^^^^^ reference local 1
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -58,7 +58,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //               ^^^^^ definition local 3
 //                     display_name model
-//                     documentation ```java\nEpoxyModel model\n```
+//                     signature_documentation java EpoxyModel model
 //                       ^^^^^^^^^^^^^ reference local 1
 //                                     ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                         ^ reference local 2
@@ -73,15 +73,15 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
   protected void setControllerToStageTo(EpoxyModel<?> model, T controller) {
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#setControllerToStageTo().
 //                                      display_name setControllerToStageTo
-//                                      documentation ```java\nprotected void setControllerToStageTo(EpoxyModel<?> model, T controller)\n```
+//                                      signature_documentation java protected void setControllerToStageTo(EpoxyModel<?> model, T controller)
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                    ^^^^^ definition local 4
 //                                                          display_name model
-//                                                          documentation ```java\nEpoxyModel<?> model\n```
+//                                                          signature_documentation java EpoxyModel<?> model
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
 //                                                             ^^^^^^^^^^ definition local 5
 //                                                                        display_name controller
-//                                                                        documentation ```java\nT controller\n```
+//                                                                        signature_documentation java T controller
     model.controllerToStageTo = controller;
 //  ^^^^^ reference local 4
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#controllerToStageTo.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
index 354e171b7..0765489b3 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
@@ -32,45 +32,45 @@
 class ControllerHelperLookup {
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#
 //                           display_name ControllerHelperLookup
-//                           documentation ```java\nclass ControllerHelperLookup\n```
+//                           signature_documentation java class ControllerHelperLookup
 //                           documentation  Looks up a generated {@link ControllerHelper} implementation for a given adapter.\n If the adapter has no {@link com.airbnb.epoxy.AutoModel} models then a No-Op implementation will\n be returned.\n
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#`<init>`().
 //                           display_name <init>
-//                           documentation ```java\nControllerHelperLookup()\n```
+//                           signature_documentation java ControllerHelperLookup()
   private static final String GENERATED_HELPER_CLASS_SUFFIX = "_EpoxyHelper";
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#GENERATED_HELPER_CLASS_SUFFIX.
 //                                                          display_name GENERATED_HELPER_CLASS_SUFFIX
-//                                                          documentation ```java\nprivate static final String GENERATED_HELPER_CLASS_SUFFIX\n```
+//                                                          signature_documentation java private static final String GENERATED_HELPER_CLASS_SUFFIX
   private static final Map<Class<?>, Constructor<?>> BINDINGS = new LinkedHashMap<>();
 //                     ^^^ reference semanticdb maven jdk 11 java/util/Map#
 //                         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                   ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                                                   ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#BINDINGS.
 //                                                            display_name BINDINGS
-//                                                            documentation ```java\nprivate static final Map<Class<?>, Constructor<?>> BINDINGS\n```
+//                                                            signature_documentation java private static final Map<Class<?>, Constructor<?>> BINDINGS
 //                                                                  ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/LinkedHashMap#`<init>`(+2).
   private static final NoOpControllerHelper NO_OP_CONTROLLER_HELPER = new NoOpControllerHelper();
 //                     ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#
 //                                          ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#NO_OP_CONTROLLER_HELPER.
 //                                                                  display_name NO_OP_CONTROLLER_HELPER
-//                                                                  documentation ```java\nprivate static final NoOpControllerHelper NO_OP_CONTROLLER_HELPER\n```
+//                                                                  signature_documentation java private static final NoOpControllerHelper NO_OP_CONTROLLER_HELPER
 //                                                                        ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#`<init>`().
 
   static ControllerHelper getHelperForController(EpoxyController controller) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
 //                                               display_name getHelperForController
-//                                               documentation ```java\nstatic ControllerHelper getHelperForController(EpoxyController controller)\n```
+//                                               signature_documentation java static ControllerHelper getHelperForController(EpoxyController controller)
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                               ^^^^^^^^^^ definition local 0
 //                                                                          display_name controller
-//                                                                          documentation ```java\nEpoxyController controller\n```
+//                                                                          signature_documentation java EpoxyController controller
     Constructor<?> constructor = findConstructorForClass(controller.getClass());
 //  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                 ^^^^^^^^^^^ definition local 1
 //                             display_name constructor
-//                             documentation ```java\nConstructor<?> constructor\n```
+//                             signature_documentation java Constructor<?> constructor
 //                               ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                                                       ^^^^^^^^^^ reference local 0
 //                                                                  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
@@ -90,7 +90,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IllegalAccessException#
 //                                  ^ definition local 2
 //                                    display_name e
-//                                    documentation ```java\nIllegalAccessException e\n```
+//                                    signature_documentation java IllegalAccessException e
       throw new RuntimeException("Unable to invoke " + constructor, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
 //                                                     ^^^^^^^^^^^ reference local 1
@@ -99,7 +99,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/InstantiationException#
 //                                  ^ definition local 3
 //                                    display_name e
-//                                    documentation ```java\nInstantiationException e\n```
+//                                    signature_documentation java InstantiationException e
       throw new RuntimeException("Unable to invoke " + constructor, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
 //                                                     ^^^^^^^^^^^ reference local 1
@@ -108,12 +108,12 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationTargetException#
 //                                     ^ definition local 4
 //                                       display_name e
-//                                       documentation ```java\nInvocationTargetException e\n```
+//                                       signature_documentation java InvocationTargetException e
       Throwable cause = e.getCause();
 //    ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Throwable#
 //              ^^^^^ definition local 5
 //                    display_name cause
-//                    documentation ```java\nThrowable cause\n```
+//                    signature_documentation java Throwable cause
 //                      ^ reference local 4
 //                        ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationTargetException#getCause().
       if (cause instanceof RuntimeException) {
@@ -142,16 +142,16 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //               ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                                                      display_name findConstructorForClass
-//                                                      documentation ```java\n@Nullable\nprivate static Constructor<?> findConstructorForClass(Class<?> controllerClass)\n```
+//                                                      signature_documentation java @Nullable\nprivate static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //                                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                               ^^^^^^^^^^^^^^^ definition local 6
 //                                                                               display_name controllerClass
-//                                                                               documentation ```java\nClass<?> controllerClass\n```
+//                                                                               signature_documentation java Class<?> controllerClass
     Constructor<?> helperCtor = BINDINGS.get(controllerClass);
 //  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                 ^^^^^^^^^^ definition local 7
 //                            display_name helperCtor
-//                            documentation ```java\nConstructor<?> helperCtor\n```
+//                            signature_documentation java Constructor<?> helperCtor
 //                              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#BINDINGS.
 //                                       ^^^ reference semanticdb maven jdk 11 java/util/Map#get().
 //                                           ^^^^^^^^^^^^^^^ reference local 6
@@ -168,7 +168,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^^^^^^^ definition local 8
 //                 display_name clsName
-//                 documentation ```java\nString clsName\n```
+//                 signature_documentation java String clsName
 //                   ^^^^^^^^^^^^^^^ reference local 6
 //                                   ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#getName().
     if (clsName.startsWith("android.") || clsName.startsWith("java.")) {
@@ -184,7 +184,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //    ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //             ^^^^^^^^^^^^ definition local 9
 //                          display_name bindingClass
-//                          documentation ```java\nClass<?> bindingClass\n```
+//                          signature_documentation java Class<?> bindingClass
 //                            ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                  ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#forName().
 //                                          ^^^^^^^ reference local 8
@@ -199,7 +199,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/ClassNotFoundException#
 //                                  ^ definition local 10
 //                                    display_name e
-//                                    documentation ```java\nClassNotFoundException e\n```
+//                                    signature_documentation java ClassNotFoundException e
       helperCtor = findConstructorForClass(controllerClass.getSuperclass());
 //    ^^^^^^^^^^ reference local 7
 //                 ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
@@ -209,7 +209,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //           ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/NoSuchMethodException#
 //                                 ^ definition local 11
 //                                   display_name e
-//                                   documentation ```java\nNoSuchMethodException e\n```
+//                                   signature_documentation java NoSuchMethodException e
       throw new RuntimeException("Unable to find Epoxy Helper constructor for " + clsName, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
 //                                                                                ^^^^^^^ reference local 8
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
index 06edad547..88f06e6ac 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
@@ -10,7 +10,7 @@
 class ControllerModelList extends ModelList {
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
 //                        display_name ControllerModelList
-//                        documentation ```java\nclass ControllerModelList\n```
+//                        signature_documentation java class ControllerModelList
 //                        documentation  This ArrayList subclass enforces that no changes are made to the list after {@link #freeze()} is\n called. This prevents model interceptors from storing the list and trying to change it later. We\n could copy the list before diffing, but that would waste memory to make the copy for every\n buildModels cycle, plus the interceptors could still try to modify the list and be confused about\n why it doesn't do anything.\n
 //                        relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#
 //                        relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
@@ -28,21 +28,21 @@ class ControllerModelList extends ModelList {
 //                     ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#OBSERVER.
 //                                                display_name OBSERVER
-//                                                documentation ```java\nprivate static final ModelListObserver OBSERVER\n```
+//                                                signature_documentation java private static final ModelListObserver OBSERVER
 //                                                      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onItemRangeInserted(int positionStart, int itemCount) {
 //              ^^^^^^^^^^^^^^^^^^^ definition local 1
 //                                  display_name onItemRangeInserted
-//                                  documentation ```java\n@Override\npublic void onItemRangeInserted(int positionStart, int itemCount)\n```
+//                                  signature_documentation java @Override\npublic void onItemRangeInserted(int positionStart, int itemCount)
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
 //                                      ^^^^^^^^^^^^^ definition local 2
 //                                                    display_name positionStart
-//                                                    documentation ```java\nint positionStart\n```
+//                                                    signature_documentation java int positionStart
 //                                                         ^^^^^^^^^ definition local 3
 //                                                                   display_name itemCount
-//                                                                   documentation ```java\nint itemCount\n```
+//                                                                   signature_documentation java int itemCount
       throw new IllegalStateException(
 //              ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IllegalStateException#`<init>`(+1).
           "Models cannot be changed once they are added to the controller");
@@ -53,14 +53,14 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
     public void onItemRangeRemoved(int positionStart, int itemCount) {
 //              ^^^^^^^^^^^^^^^^^^ definition local 4
 //                                 display_name onItemRangeRemoved
-//                                 documentation ```java\n@Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)\n```
+//                                 signature_documentation java @Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
 //                                     ^^^^^^^^^^^^^ definition local 5
 //                                                   display_name positionStart
-//                                                   documentation ```java\nint positionStart\n```
+//                                                   signature_documentation java int positionStart
 //                                                        ^^^^^^^^^ definition local 6
 //                                                                  display_name itemCount
-//                                                                  documentation ```java\nint itemCount\n```
+//                                                                  signature_documentation java int itemCount
       throw new IllegalStateException(
 //              ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IllegalStateException#`<init>`(+1).
           "Models cannot be changed once they are added to the controller");
@@ -70,10 +70,10 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
   ControllerModelList(int expectedModelCount) {
 //^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#`<init>`().
 //                    display_name <init>
-//                    documentation ```java\nControllerModelList(int expectedModelCount)\n```
+//                    signature_documentation java ControllerModelList(int expectedModelCount)
 //                        ^^^^^^^^^^^^^^^^^^ definition local 7
 //                                           display_name expectedModelCount
-//                                           documentation ```java\nint expectedModelCount\n```
+//                                           signature_documentation java int expectedModelCount
     super(expectedModelCount);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`().
 //        ^^^^^^^^^^^^^^^^^^ reference local 7
@@ -84,7 +84,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
   void freeze() {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#freeze().
 //            display_name freeze
-//            documentation ```java\nvoid freeze()\n```
+//            signature_documentation java void freeze()
     setObserver(OBSERVER);
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#setObserver().
 //              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerModelList#OBSERVER.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
index 7fd63fe8d..8536e845f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
@@ -8,7 +8,7 @@
 class DebugTimer implements Timer {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#
 //               display_name DebugTimer
-//               documentation ```java\nclass DebugTimer\n```
+//               signature_documentation java class DebugTimer
 //               relationship is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#
 //                          ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
 
@@ -16,25 +16,25 @@ class DebugTimer implements Timer {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#tag.
 //                         display_name tag
-//                         documentation ```java\nprivate final String tag\n```
+//                         signature_documentation java private final String tag
   private long startTime;
 //             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
 //                       display_name startTime
-//                       documentation ```java\nprivate long startTime\n```
+//                       signature_documentation java private long startTime
   private String sectionName;
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#sectionName.
 //                           display_name sectionName
-//                           documentation ```java\nprivate String sectionName\n```
+//                           signature_documentation java private String sectionName
 
   DebugTimer(String tag) {
 //^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#`<init>`().
 //           display_name <init>
-//           documentation ```java\nDebugTimer(String tag)\n```
+//           signature_documentation java DebugTimer(String tag)
 //           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                  ^^^ definition local 0
 //                      display_name tag
-//                      documentation ```java\nString tag\n```
+//                      signature_documentation java String tag
     this.tag = tag;
 //       ^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#tag.
 //             ^^^ reference local 0
@@ -45,7 +45,7 @@ class DebugTimer implements Timer {
   private void reset() {
 //             ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#reset().
 //                   display_name reset
-//                   documentation ```java\nprivate void reset()\n```
+//                   signature_documentation java private void reset()
     startTime = -1;
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
     sectionName = null;
@@ -57,12 +57,12 @@ private void reset() {
   public void start(String sectionName) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#start().
 //                  display_name start
-//                  documentation ```java\n@Override\npublic void start(String sectionName)\n```
+//                  signature_documentation java @Override\npublic void start(String sectionName)
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#start().
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                         ^^^^^^^^^^^ definition local 1
 //                                     display_name sectionName
-//                                     documentation ```java\nString sectionName\n```
+//                                     signature_documentation java String sectionName
     if (startTime != -1) {
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
       throw new IllegalStateException("Timer was already started");
@@ -83,7 +83,7 @@ public void start(String sectionName) {
   public void stop() {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#stop().
 //                 display_name stop
-//                 documentation ```java\n@Override\npublic void stop()\n```
+//                 signature_documentation java @Override\npublic void stop()
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#stop().
     if (startTime == -1) {
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
@@ -94,7 +94,7 @@ public void stop() {
     float durationMs = (System.nanoTime() - startTime) / 1000000f;
 //        ^^^^^^^^^^ definition local 2
 //                   display_name durationMs
-//                   documentation ```java\nfloat durationMs\n```
+//                   signature_documentation java float durationMs
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#nanoTime().
 //                                          ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
index bf0cffd9b..80f4bf7aa 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
@@ -38,14 +38,14 @@
 class DiffHelper {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#
 //               display_name DiffHelper
-//               documentation ```java\nclass DiffHelper\n```
+//               signature_documentation java class DiffHelper
 //               documentation  Helper to track changes in the models list.\n
   private ArrayList<ModelState> oldStateList = new ArrayList<>();
 //        ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                           display_name oldStateList
-//                                           documentation ```java\nprivate ArrayList<ModelState> oldStateList\n```
+//                                           signature_documentation java private ArrayList<ModelState> oldStateList
 //                                                 ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   // Using a HashMap instead of a LongSparseArray to
   // have faster look up times at the expense of memory
@@ -55,14 +55,14 @@ class DiffHelper {
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
 //                                          display_name oldStateMap
-//                                          documentation ```java\nprivate Map<Long, ModelState> oldStateMap\n```
+//                                          signature_documentation java private Map<Long, ModelState> oldStateMap
 //                                                ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   private ArrayList<ModelState> currentStateList = new ArrayList<>();
 //        ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
 //                                               display_name currentStateList
-//                                               documentation ```java\nprivate ArrayList<ModelState> currentStateList\n```
+//                                               signature_documentation java private ArrayList<ModelState> currentStateList
 //                                                     ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   private Map<Long, ModelState> currentStateMap = new HashMap<>();
 //        ^^^ reference semanticdb maven jdk 11 java/util/Map#
@@ -70,30 +70,30 @@ class DiffHelper {
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateMap.
 //                                              display_name currentStateMap
-//                                              documentation ```java\nprivate Map<Long, ModelState> currentStateMap\n```
+//                                              signature_documentation java private Map<Long, ModelState> currentStateMap
 //                                                    ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   private final BaseEpoxyAdapter adapter;
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                       display_name adapter
-//                                       documentation ```java\nprivate final BaseEpoxyAdapter adapter\n```
+//                                       signature_documentation java private final BaseEpoxyAdapter adapter
   private final boolean immutableModels;
 //                      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#immutableModels.
 //                                      display_name immutableModels
-//                                      documentation ```java\nprivate final boolean immutableModels\n```
+//                                      signature_documentation java private final boolean immutableModels
 
 
   DiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels) {
 //^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#`<init>`().
 //           display_name <init>
-//           documentation ```java\nDiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels)\n```
+//           signature_documentation java DiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels)
 //           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                            ^^^^^^^ definition local 0
 //                                    display_name adapter
-//                                    documentation ```java\nBaseEpoxyAdapter adapter\n```
+//                                    signature_documentation java BaseEpoxyAdapter adapter
 //                                             ^^^^^^^^^^^^^^^ definition local 1
 //                                                             display_name immutableModels
-//                                                             documentation ```java\nboolean immutableModels\n```
+//                                                             signature_documentation java boolean immutableModels
     this.adapter = adapter;
 //       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                 ^^^^^^^ reference local 0
@@ -111,7 +111,7 @@ class DiffHelper {
 //                           ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/AdapterDataObserver#
 //                                               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#observer.
 //                                                        display_name observer
-//                                                        documentation ```java\nprivate final unresolved_type observer\n```
+//                                                        signature_documentation java private final unresolved_type observer
 //                                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
 //                                                                           ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/AdapterDataObserver#
     @Override
@@ -213,13 +213,13 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
   void notifyModelChanges() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyModelChanges().
 //                        display_name notifyModelChanges
-//                        documentation ```java\nvoid notifyModelChanges()\n```
+//                        signature_documentation java void notifyModelChanges()
 //                        documentation  Set the current list of models. The diff callbacks will be notified of the changes between the\n current list and the last list that was set.\n
     UpdateOpHelper updateOpHelper = new UpdateOpHelper();
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                 ^^^^^^^^^^^^^^ definition local 2
 //                                display_name updateOpHelper
-//                                documentation ```java\nUpdateOpHelper updateOpHelper\n```
+//                                signature_documentation java UpdateOpHelper updateOpHelper
 //                                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#`<init>`().
 
     buildDiff(updateOpHelper);
@@ -244,16 +244,16 @@ void notifyModelChanges() {
   private void notifyChanges(UpdateOpHelper opHelper) {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyChanges().
 //                           display_name notifyChanges
-//                           documentation ```java\nprivate void notifyChanges(UpdateOpHelper opHelper)\n```
+//                           signature_documentation java private void notifyChanges(UpdateOpHelper opHelper)
 //                           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                          ^^^^^^^^ definition local 3
 //                                                   display_name opHelper
-//                                                   documentation ```java\nUpdateOpHelper opHelper\n```
+//                                                   signature_documentation java UpdateOpHelper opHelper
     for (UpdateOp op : opHelper.opList) {
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                ^^ definition local 4
 //                   display_name op
-//                   documentation ```java\nUpdateOp op\n```
+//                   signature_documentation java UpdateOp op
 //                     ^^^^^^^^ reference local 3
 //                              ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
       switch (op.type) {
@@ -337,12 +337,12 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
 //        ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#buildDiff().
 //                                 display_name buildDiff
-//                                 documentation ```java\nprivate UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper)\n```
+//                                 signature_documentation java private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper)
 //                                 documentation  Create a list of operations that define the difference between {@link #oldStateList} and {@link\n #currentStateList}.\n
 //                                 ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                                ^^^^^^^^^^^^^^ definition local 5
 //                                                               display_name updateOpHelper
-//                                                               documentation ```java\nUpdateOpHelper updateOpHelper\n```
+//                                                               signature_documentation java UpdateOpHelper updateOpHelper
     prepareStateForDiff();
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 
@@ -359,7 +359,7 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
     boolean hasInsertions =
 //          ^^^^^^^^^^^^^ definition local 6
 //                        display_name hasInsertions
-//                        documentation ```java\nboolean hasInsertions\n```
+//                        signature_documentation java boolean hasInsertions
         oldStateList.size() - updateOpHelper.getNumRemovals() != currentStateList.size();
 //      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                   ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
@@ -391,7 +391,7 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
   private void resetOldState() {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#resetOldState().
 //                           display_name resetOldState
-//                           documentation ```java\nprivate void resetOldState()\n```
+//                           signature_documentation java private void resetOldState()
     oldStateList.clear();
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //               ^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#clear().
@@ -403,7 +403,7 @@ private void resetOldState() {
   private void prepareStateForDiff() {
 //             ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 //                                 display_name prepareStateForDiff
-//                                 documentation ```java\nprivate void prepareStateForDiff()\n```
+//                                 signature_documentation java private void prepareStateForDiff()
     // We use a list of the models as well as a map by their id,
     // so we can easily find them by both position and id
 
@@ -420,7 +420,7 @@ private void prepareStateForDiff() {
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                        ^^^^^^^^ definition local 7
 //                                 display_name tempList
-//                                 documentation ```java\nArrayList<ModelState> tempList\n```
+//                                 signature_documentation java ArrayList<ModelState> tempList
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
     oldStateList = currentStateList;
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
@@ -435,7 +435,7 @@ private void prepareStateForDiff() {
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                        ^^^^^^^ definition local 8
 //                                display_name tempMap
-//                                documentation ```java\nMap<Long, ModelState> tempMap\n```
+//                                signature_documentation java Map<Long, ModelState> tempMap
 //                                  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
     oldStateMap = currentStateMap;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
@@ -450,7 +450,7 @@ private void prepareStateForDiff() {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^^^^ definition local 9
 //                             display_name modelState
-//                             documentation ```java\nModelState modelState\n```
+//                             signature_documentation java ModelState modelState
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
       modelState.pair = null;
 //    ^^^^^^^^^^ reference local 9
@@ -460,7 +460,7 @@ private void prepareStateForDiff() {
     int modelCount = adapter.getCurrentModels().size();
 //      ^^^^^^^^^^ definition local 10
 //                 display_name modelCount
-//                 documentation ```java\nint modelCount\n```
+//                 signature_documentation java int modelCount
 //                   ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                              ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -472,7 +472,7 @@ private void prepareStateForDiff() {
     for (int i = 0; i < modelCount; i++) {
 //           ^ definition local 11
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 11
 //                      ^^^^^^^^^^ reference local 10
 //                                  ^ reference local 11
@@ -488,15 +488,15 @@ private ModelState createStateForPosition(int position) {
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                   ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
 //                                          display_name createStateForPosition
-//                                          documentation ```java\nprivate ModelState createStateForPosition(int position)\n```
+//                                          signature_documentation java private ModelState createStateForPosition(int position)
 //                                              ^^^^^^^^ definition local 12
 //                                                       display_name position
-//                                                       documentation ```java\nint position\n```
+//                                                       signature_documentation java int position
     EpoxyModel<?> model = adapter.getCurrentModels().get(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 13
 //                      display_name model
-//                      documentation ```java\nEpoxyModel<?> model\n```
+//                      signature_documentation java EpoxyModel<?> model
 //                        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                                   ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -508,7 +508,7 @@ private ModelState createStateForPosition(int position) {
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^ definition local 14
 //                   display_name state
-//                   documentation ```java\nModelState state\n```
+//                   signature_documentation java ModelState state
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#build().
 //                                      ^^^^^ reference local 13
@@ -519,7 +519,7 @@ private ModelState createStateForPosition(int position) {
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^^^^^^^^^ definition local 15
 //                           display_name previousValue
-//                           documentation ```java\nModelState previousValue\n```
+//                           signature_documentation java ModelState previousValue
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateMap.
 //                                             ^^^ reference semanticdb maven jdk 11 java/util/Map#put().
 //                                                 ^^^^^ reference local 14
@@ -530,14 +530,14 @@ private ModelState createStateForPosition(int position) {
       int previousPosition = previousValue.position;
 //        ^^^^^^^^^^^^^^^^ definition local 16
 //                         display_name previousPosition
-//                         documentation ```java\nint previousPosition\n```
+//                         signature_documentation java int previousPosition
 //                           ^^^^^^^^^^^^^ reference local 15
 //                                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
       EpoxyModel<?> previousModel = adapter.getCurrentModels().get(previousPosition);
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^^^^^^^^^ definition local 17
 //                                display_name previousModel
-//                                documentation ```java\nEpoxyModel<?> previousModel\n```
+//                                signature_documentation java EpoxyModel<?> previousModel
 //                                  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                                             ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -564,17 +564,17 @@ private ModelState createStateForPosition(int position) {
   private void collectRemovals(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectRemovals().
 //                             display_name collectRemovals
-//                             documentation ```java\nprivate void collectRemovals(UpdateOpHelper helper)\n```
+//                             signature_documentation java private void collectRemovals(UpdateOpHelper helper)
 //                             documentation  Find all removal operations and add them to the result list. The general strategy here is to\n walk through the {@link #oldStateList} and check for items that don't exist in the new list.\n Walking through it in order makes it easy to batch adjacent removals.\n
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                            ^^^^^^ definition local 18
 //                                                   display_name helper
-//                                                   documentation ```java\nUpdateOpHelper helper\n```
+//                                                   signature_documentation java UpdateOpHelper helper
     for (ModelState state : oldStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^ definition local 19
 //                        display_name state
-//                        documentation ```java\nModelState state\n```
+//                        signature_documentation java ModelState state
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
       // Update the position of the item to take into account previous removals,
       // so that future operations will reference the correct position
@@ -621,18 +621,18 @@ private void collectRemovals(UpdateOpHelper helper) {
   private void collectInsertions(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
 //                               display_name collectInsertions
-//                               documentation ```java\nprivate void collectInsertions(UpdateOpHelper helper)\n```
+//                               signature_documentation java private void collectInsertions(UpdateOpHelper helper)
 //                               documentation  Find all insertion operations and add them to the result list. The general strategy here is to\n walk through the {@link #currentStateList} and check for items that don't exist in the old\n list. Walking through it in order makes it easy to batch adjacent insertions.\n
 //                               ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                              ^^^^^^ definition local 20
 //                                                     display_name helper
-//                                                     documentation ```java\nUpdateOpHelper helper\n```
+//                                                     signature_documentation java UpdateOpHelper helper
     Iterator<ModelState> oldItemIterator = oldStateList.iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                       ^^^^^^^^^^^^^^^ definition local 21
 //                                       display_name oldItemIterator
-//                                       documentation ```java\nIterator<ModelState> oldItemIterator\n```
+//                                       signature_documentation java Iterator<ModelState> oldItemIterator
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
 
@@ -640,7 +640,7 @@ private void collectInsertions(UpdateOpHelper helper) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^^^^^^ definition local 22
 //                               display_name itemToInsert
-//                               documentation ```java\nModelState itemToInsert\n```
+//                               signature_documentation java ModelState itemToInsert
 //                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       if (itemToInsert.pair != null) {
 //        ^^^^^^^^^^^^ reference local 22
@@ -650,7 +650,7 @@ private void collectInsertions(UpdateOpHelper helper) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                 ^^^^^^^^^^^ definition local 23
 //                             display_name nextOldItem
-//                             documentation ```java\nModelState nextOldItem\n```
+//                             signature_documentation java ModelState nextOldItem
 //                               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
 //                                                   ^^^^^^^^^^^^^^^ reference local 21
         if (nextOldItem != null) {
@@ -678,23 +678,23 @@ private void collectInsertions(UpdateOpHelper helper) {
   private void collectChanges(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
 //                            display_name collectChanges
-//                            documentation ```java\nprivate void collectChanges(UpdateOpHelper helper)\n```
+//                            signature_documentation java private void collectChanges(UpdateOpHelper helper)
 //                            documentation  Check if any items have had their values changed, batching if possible.\n
 //                            ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                           ^^^^^^ definition local 24
 //                                                  display_name helper
-//                                                  documentation ```java\nUpdateOpHelper helper\n```
+//                                                  signature_documentation java UpdateOpHelper helper
     for (ModelState newItem : currentStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^ definition local 25
 //                          display_name newItem
-//                          documentation ```java\nModelState newItem\n```
+//                          signature_documentation java ModelState newItem
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       ModelState previousItem = newItem.pair;
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //               ^^^^^^^^^^^^ definition local 26
 //                            display_name previousItem
-//                            documentation ```java\nModelState previousItem\n```
+//                            signature_documentation java ModelState previousItem
 //                              ^^^^^^^ reference local 25
 //                                      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
       if (previousItem == null) {
@@ -707,7 +707,7 @@ private void collectChanges(UpdateOpHelper helper) {
       boolean modelChanged;
 //            ^^^^^^^^^^^^ definition local 27
 //                         display_name modelChanged
-//                         documentation ```java\nboolean modelChanged\n```
+//                         signature_documentation java boolean modelChanged
       if (immutableModels) {
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#immutableModels.
         // Make sure that the old model hasn't changed, otherwise comparing it with the new one
@@ -761,32 +761,32 @@ private void collectChanges(UpdateOpHelper helper) {
   private void collectMoves(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
 //                          display_name collectMoves
-//                          documentation ```java\nprivate void collectMoves(UpdateOpHelper helper)\n```
+//                          signature_documentation java private void collectMoves(UpdateOpHelper helper)
 //                          documentation  Check which items have had a position changed. Recyclerview does not support batching these.\n
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                         ^^^^^^ definition local 28
 //                                                display_name helper
-//                                                documentation ```java\nUpdateOpHelper helper\n```
+//                                                signature_documentation java UpdateOpHelper helper
     // This walks through both the new and old list simultaneous and checks for position changes.
     Iterator<ModelState> oldItemIterator = oldStateList.iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                       ^^^^^^^^^^^^^^^ definition local 29
 //                                       display_name oldItemIterator
-//                                       documentation ```java\nIterator<ModelState> oldItemIterator\n```
+//                                       signature_documentation java Iterator<ModelState> oldItemIterator
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
     ModelState nextOldItem = null;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^^^^^^^ definition local 30
 //                         display_name nextOldItem
-//                         documentation ```java\nModelState nextOldItem\n```
+//                         signature_documentation java ModelState nextOldItem
 
     for (ModelState newItem : currentStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^ definition local 31
 //                          display_name newItem
-//                          documentation ```java\nModelState newItem\n```
+//                          signature_documentation java ModelState newItem
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       if (newItem.pair == null) {
 //        ^^^^^^^ reference local 31
@@ -876,7 +876,7 @@ private void collectMoves(UpdateOpHelper helper) {
         int newItemDistance = newItem.pair.position - newItem.position;
 //          ^^^^^^^^^^^^^^^ definition local 32
 //                          display_name newItemDistance
-//                          documentation ```java\nint newItemDistance\n```
+//                          signature_documentation java int newItemDistance
 //                            ^^^^^^^ reference local 31
 //                                    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
 //                                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
@@ -885,7 +885,7 @@ private void collectMoves(UpdateOpHelper helper) {
         int oldItemDistance = nextOldItem.pair.position - nextOldItem.position;
 //          ^^^^^^^^^^^^^^^ definition local 33
 //                          display_name oldItemDistance
-//                          documentation ```java\nint oldItemDistance\n```
+//                          signature_documentation java int oldItemDistance
 //                            ^^^^^^^^^^^ reference local 30
 //                                        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
 //                                             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
@@ -965,28 +965,28 @@ private void collectMoves(UpdateOpHelper helper) {
   private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //             ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
 //                                display_name updateItemPosition
-//                                documentation ```java\nprivate void updateItemPosition(ModelState item, List<UpdateOp> moveOps)\n```
+//                                signature_documentation java private void updateItemPosition(ModelState item, List<UpdateOp> moveOps)
 //                                documentation  Apply the movement operations to the given item to update its position. Only applies the\n operations that have not been applied yet, and stores how many operations have been applied so\n we know which ones to apply next time.\n
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                           ^^^^ definition local 34
 //                                                display_name item
-//                                                documentation ```java\nModelState item\n```
+//                                                signature_documentation java ModelState item
 //                                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                                                                ^^^^^^^ definition local 35
 //                                                                        display_name moveOps
-//                                                                        documentation ```java\nList<UpdateOp> moveOps\n```
+//                                                                        signature_documentation java List<UpdateOp> moveOps
     int size = moveOps.size();
 //      ^^^^ definition local 36
 //           display_name size
-//           documentation ```java\nint size\n```
+//           signature_documentation java int size
 //             ^^^^^^^ reference local 35
 //                     ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
     for (int i = item.lastMoveOp; i < size; i++) {
 //           ^ definition local 37
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //               ^^^^ reference local 34
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#lastMoveOp.
 //                                ^ reference local 37
@@ -996,20 +996,20 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //             ^^^^^^ definition local 38
 //                    display_name moveOp
-//                    documentation ```java\nUpdateOp moveOp\n```
+//                    signature_documentation java UpdateOp moveOp
 //                      ^^^^^^^ reference local 35
 //                              ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                  ^ reference local 37
       int fromPosition = moveOp.positionStart;
 //        ^^^^^^^^^^^^ definition local 39
 //                     display_name fromPosition
-//                     documentation ```java\nint fromPosition\n```
+//                     signature_documentation java int fromPosition
 //                       ^^^^^^ reference local 38
 //                              ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
       int toPosition = moveOp.itemCount;
 //        ^^^^^^^^^^ definition local 40
 //                   display_name toPosition
-//                   documentation ```java\nint toPosition\n```
+//                   signature_documentation java int toPosition
 //                     ^^^^^^ reference local 38
 //                            ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
 
@@ -1051,18 +1051,18 @@ private ModelState getNextItemWithPair(Iterator<ModelState> iterator) {
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                   ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
 //                                       display_name getNextItemWithPair
-//                                       documentation ```java\n@Nullable\nprivate ModelState getNextItemWithPair(Iterator<ModelState> iterator)\n```
+//                                       signature_documentation java @Nullable\nprivate ModelState getNextItemWithPair(Iterator<ModelState> iterator)
 //                                       documentation  Gets the next item in the list that has a pair, meaning it wasn't inserted or removed.\n
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                                            ^^^^^^^^ definition local 41
 //                                                                     display_name iterator
-//                                                                     documentation ```java\nIterator<ModelState> iterator\n```
+//                                                                     signature_documentation java Iterator<ModelState> iterator
     ModelState nextItem = null;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^^^^ definition local 42
 //                      display_name nextItem
-//                      documentation ```java\nModelState nextItem\n```
+//                      signature_documentation java ModelState nextItem
     while (nextItem == null && iterator.hasNext()) {
 //         ^^^^^^^^ reference local 42
 //                             ^^^^^^^^ reference local 41
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
index a1739f359..7515cf360 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
@@ -31,29 +31,29 @@
 public class DiffPayload {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                       display_name DiffPayload
-//                       documentation ```java\npublic class DiffPayload\n```
+//                       signature_documentation java public class DiffPayload
 //                       documentation  A helper class for tracking changed models found by the {@link com.airbnb.epoxy.DiffHelper} to\n be included as a payload in the\n {@link androidx.recyclerview.widget.RecyclerView.Adapter#notifyItemChanged(int, Object)}\n call.\n
   private final EpoxyModel<?> singleModel;
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#singleModel.
 //                                        display_name singleModel
-//                                        documentation ```java\nprivate final EpoxyModel<?> singleModel\n```
+//                                        signature_documentation java private final EpoxyModel<?> singleModel
   private final LongSparseArray<EpoxyModel<?>> modelsById;
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                                        display_name modelsById
-//                                                        documentation ```java\nprivate final LongSparseArray<EpoxyModel<?>> modelsById\n```
+//                                                        signature_documentation java private final LongSparseArray<EpoxyModel<?>> modelsById
 
   DiffPayload(List<? extends EpoxyModel<?>> models) {
 //^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
 //            display_name <init>
-//            documentation ```java\nDiffPayload(List<? extends EpoxyModel<?>> models)\n```
+//            signature_documentation java DiffPayload(List<? extends EpoxyModel<?>> models)
 //            ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^ definition local 0
 //                                                 display_name models
-//                                                 documentation ```java\nList<? extends EpoxyModel<?>> models\n```
+//                                                 signature_documentation java List<? extends EpoxyModel<?>> models
     if (models.isEmpty()) {
 //      ^^^^^^ reference local 0
 //             ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -64,7 +64,7 @@ public class DiffPayload {
     int modelCount = models.size();
 //      ^^^^^^^^^^ definition local 1
 //                 display_name modelCount
-//                 documentation ```java\nint modelCount\n```
+//                 signature_documentation java int modelCount
 //                   ^^^^^^ reference local 0
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -88,7 +88,7 @@ public class DiffPayload {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^^^ definition local 2
 //                             display_name model
-//                             documentation ```java\nEpoxyModel<?> model\n```
+//                             signature_documentation java EpoxyModel<?> model
 //                               ^^^^^^ reference local 0
         modelsById.put(model.id(), model);
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
@@ -103,11 +103,11 @@ public class DiffPayload {
   public DiffPayload(EpoxyModel<?> changedItem) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`(+1).
 //                   display_name <init>
-//                   documentation ```java\npublic DiffPayload(EpoxyModel<?> changedItem)\n```
+//                   signature_documentation java public DiffPayload(EpoxyModel<?> changedItem)
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                 ^^^^^^^^^^^ definition local 3
 //                                             display_name changedItem
-//                                             documentation ```java\nEpoxyModel<?> changedItem\n```
+//                                             signature_documentation java EpoxyModel<?> changedItem
     this(Collections.singletonList(changedItem));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
 //       ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
@@ -126,16 +126,16 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
 //                                                display_name getModelFromPayload
-//                                                documentation ```java\n@Nullable\npublic static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long modelId)\n```
+//                                                signature_documentation java @Nullable\npublic static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long modelId)
 //                                                documentation  Looks through the payloads list and returns the first model found with the given model id. This\n assumes that the payloads list will only contain objects of type {@link DiffPayload}, and will\n throw if an unexpected type is found.\n
 //                                                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                             ^^^^^^^^ definition local 4
 //                                                                      display_name payloads
-//                                                                      documentation ```java\nList<Object> payloads\n```
+//                                                                      signature_documentation java List<Object> payloads
 //                                                                            ^^^^^^^ definition local 5
 //                                                                                    display_name modelId
-//                                                                                    documentation ```java\nlong modelId\n```
+//                                                                                    signature_documentation java long modelId
     if (payloads.isEmpty()) {
 //      ^^^^^^^^ reference local 4
 //               ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -146,13 +146,13 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //              ^^^^^^^ definition local 6
 //                      display_name payload
-//                      documentation ```java\nObject payload\n```
+//                      signature_documentation java Object payload
 //                        ^^^^^^^^ reference local 4
       DiffPayload diffPayload = (DiffPayload) payload;
 //    ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                ^^^^^^^^^^^ definition local 7
 //                            display_name diffPayload
-//                            documentation ```java\nDiffPayload diffPayload\n```
+//                            signature_documentation java DiffPayload diffPayload
 //                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                                            ^^^^^^^ reference local 6
 
@@ -173,7 +173,7 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^ definition local 8
 //                               display_name modelForId
-//                               documentation ```java\nEpoxyModel<?> modelForId\n```
+//                               signature_documentation java EpoxyModel<?> modelForId
 //                                 ^^^^^^^^^^^ reference local 7
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                                        ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
@@ -194,11 +194,11 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
   boolean equalsForTesting(DiffPayload that) {
 //        ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                         display_name equalsForTesting
-//                         documentation ```java\n@VisibleForTesting\nboolean equalsForTesting(DiffPayload that)\n```
+//                         signature_documentation java @VisibleForTesting\nboolean equalsForTesting(DiffPayload that)
 //                         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                                     ^^^^ definition local 9
 //                                          display_name that
-//                                          documentation ```java\nDiffPayload that\n```
+//                                          signature_documentation java DiffPayload that
     if (singleModel != null) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#singleModel.
       return that.singleModel == singleModel;
@@ -210,13 +210,13 @@ boolean equalsForTesting(DiffPayload that) {
     int thisSize = modelsById.size();
 //      ^^^^^^^^ definition local 10
 //               display_name thisSize
-//               documentation ```java\nint thisSize\n```
+//               signature_documentation java int thisSize
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                            ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
     int thatSize = that.modelsById.size();
 //      ^^^^^^^^ definition local 11
 //               display_name thatSize
-//               documentation ```java\nint thatSize\n```
+//               signature_documentation java int thatSize
 //                 ^^^^ reference local 9
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                 ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
@@ -230,21 +230,21 @@ boolean equalsForTesting(DiffPayload that) {
     for (int i = 0; i < thisSize; i++) {
 //           ^ definition local 12
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 12
 //                      ^^^^^^^^ reference local 10
 //                                ^ reference local 12
       long thisKey = modelsById.keyAt(i);
 //         ^^^^^^^ definition local 13
 //                 display_name thisKey
-//                 documentation ```java\nlong thisKey\n```
+//                 signature_documentation java long thisKey
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                              ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#keyAt().
 //                                    ^ reference local 12
       long thatKey = that.modelsById.keyAt(i);
 //         ^^^^^^^ definition local 14
 //                 display_name thatKey
-//                 documentation ```java\nlong thatKey\n```
+//                 signature_documentation java long thatKey
 //                   ^^^^ reference local 9
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                   ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#keyAt().
@@ -260,7 +260,7 @@ boolean equalsForTesting(DiffPayload that) {
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^^^^^ definition local 15
 //                            display_name thisModel
-//                            documentation ```java\nEpoxyModel<?> thisModel\n```
+//                            signature_documentation java EpoxyModel<?> thisModel
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#valueAt().
 //                                                 ^ reference local 12
@@ -268,7 +268,7 @@ boolean equalsForTesting(DiffPayload that) {
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^^^^^ definition local 16
 //                            display_name thatModel
-//                            documentation ```java\nEpoxyModel<?> thatModel\n```
+//                            signature_documentation java EpoxyModel<?> thatModel
 //                              ^^^^ reference local 9
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                              ^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#valueAt().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
index 533adfa8e..e01bf5866 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
@@ -45,7 +45,7 @@
 public class DiffResult {
 //           ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                      display_name DiffResult
-//                      documentation ```java\npublic class DiffResult\n```
+//                      signature_documentation java public class DiffResult
 //                      documentation  Wraps the result of {@link AsyncEpoxyDiffer#submitList(List)}.\n
   @NonNull final List<? extends EpoxyModel<?>> previousModels;
 // ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -53,14 +53,14 @@ public class DiffResult {
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#previousModels.
 //                                                            display_name previousModels
-//                                                            documentation ```java\n@NonNull\nfinal List<? extends EpoxyModel<?>> previousModels\n```
+//                                                            signature_documentation java @NonNull\nfinal List<? extends EpoxyModel<?>> previousModels
   @NonNull final List<? extends EpoxyModel<?>> newModels;
 // ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#newModels.
 //                                                       display_name newModels
-//                                                       documentation ```java\n@NonNull\nfinal List<? extends EpoxyModel<?>> newModels\n```
+//                                                       signature_documentation java @NonNull\nfinal List<? extends EpoxyModel<?>> newModels
 
   /**
    * If this is non null it means the full differ ran and the result is contained
@@ -73,7 +73,7 @@ public class DiffResult {
 //                         ^^^^^^^^^^ reference semanticdb maven . . DiffUtil/DiffResult#
 //                                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#differResult.
 //                                                 display_name differResult
-//                                                 documentation ```java\n@Nullable\nfinal unresolved_type differResult\n```
+//                                                 signature_documentation java @Nullable\nfinal unresolved_type differResult
 //                                                 documentation  If this is non null it means the full differ ran and the result is contained\n in this object. If it is null, it means that either the old list or the new list was empty, so\n we can simply add all or clear all items and skipped running the full diffing.\n
 
   /** No changes were made to the models. */
@@ -81,14 +81,14 @@ static DiffResult noOp(@Nullable List<? extends EpoxyModel<?>> models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                  ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#noOp().
 //                       display_name noOp
-//                       documentation ```java\nstatic DiffResult noOp(List<? extends EpoxyModel<?>> models)\n```
+//                       signature_documentation java static DiffResult noOp(List<? extends EpoxyModel<?>> models)
 //                       documentation No changes were made to the models. 
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^^^^^^ definition local 0
 //                                                                      display_name models
-//                                                                      documentation ```java\n@Nullable\nList<? extends EpoxyModel<?>> models\n```
+//                                                                      signature_documentation java @Nullable\nList<? extends EpoxyModel<?>> models
     if (models == null) {
 //      ^^^^^^ reference local 0
       models = Collections.emptyList();
@@ -107,14 +107,14 @@ static DiffResult inserted(@NonNull List<? extends EpoxyModel<?>> newModels) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#inserted().
 //                           display_name inserted
-//                           documentation ```java\nstatic DiffResult inserted(List<? extends EpoxyModel<?>> newModels)\n```
+//                           signature_documentation java static DiffResult inserted(List<? extends EpoxyModel<?>> newModels)
 //                           documentation The previous list was empty and the given non empty list was inserted. 
 //                            ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^^^^^ definition local 1
 //                                                                            display_name newModels
-//                                                                            documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> newModels\n```
+//                                                                            signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> newModels
     //noinspection unchecked
     return new DiffResult(Collections.EMPTY_LIST, newModels, null);
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
@@ -128,14 +128,14 @@ static DiffResult clear(@NonNull List<? extends EpoxyModel<?>> previousModels) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                  ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#clear().
 //                        display_name clear
-//                        documentation ```java\nstatic DiffResult clear(List<? extends EpoxyModel<?>> previousModels)\n```
+//                        signature_documentation java static DiffResult clear(List<? extends EpoxyModel<?>> previousModels)
 //                        documentation The previous list was non empty and the new list is empty. 
 //                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^^^^^^^^^^^^^^ definition local 2
 //                                                                              display_name previousModels
-//                                                                              documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> previousModels\n```
+//                                                                              signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> previousModels
     //noinspection unchecked
     return new DiffResult(previousModels, Collections.EMPTY_LIST, null);
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
@@ -152,7 +152,7 @@ static DiffResult diff(
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                  ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#diff().
 //                       display_name diff
-//                       documentation ```java\nstatic DiffResult diff(List<? extends EpoxyModel<?>> previousModels, List<? extends EpoxyModel<?>> newModels, unresolved_type differResult)\n```
+//                       signature_documentation java static DiffResult diff(List<? extends EpoxyModel<?>> previousModels, List<? extends EpoxyModel<?>> newModels, unresolved_type differResult)
 //                       documentation  The previous and new models are both non empty and a full differ pass was run on them.\n There may be no changes, however.\n
       @NonNull List<? extends EpoxyModel<?>> previousModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -160,21 +160,21 @@ static DiffResult diff(
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^^^^^^ definition local 3
 //                                                          display_name previousModels
-//                                                          documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> previousModels\n```
+//                                                          signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> previousModels
       @NonNull List<? extends EpoxyModel<?>> newModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^ definition local 4
 //                                                     display_name newModels
-//                                                     documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> newModels\n```
+//                                                     signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> newModels
       @NonNull DiffUtil.DiffResult differResult
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //                      ^^^^^^^^^^ reference semanticdb maven . . DiffUtil/DiffResult#
 //                                 ^^^^^^^^^^^^ definition local 5
 //                                              display_name differResult
-//                                              documentation ```java\n@NonNull\nunresolved_type differResult\n```
+//                                              signature_documentation java @NonNull\nunresolved_type differResult
   ) {
     return new DiffResult(previousModels, newModels, differResult);
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
@@ -186,28 +186,28 @@ static DiffResult diff(
   private DiffResult(
 //        ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
 //                   display_name <init>
-//                   documentation ```java\nprivate DiffResult(List<? extends EpoxyModel<?>> previousModels, List<? extends EpoxyModel<?>> newModels, unresolved_type differResult)\n```
+//                   signature_documentation java private DiffResult(List<? extends EpoxyModel<?>> previousModels, List<? extends EpoxyModel<?>> newModels, unresolved_type differResult)
       @NonNull List<? extends EpoxyModel<?>> previousModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^^^^^^ definition local 6
 //                                                          display_name previousModels
-//                                                          documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> previousModels\n```
+//                                                          signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> previousModels
       @NonNull List<? extends EpoxyModel<?>> newModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^ definition local 7
 //                                                     display_name newModels
-//                                                     documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> newModels\n```
+//                                                     signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> newModels
       @Nullable DiffUtil.DiffResult differResult
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //                       ^^^^^^^^^^ reference semanticdb maven . . DiffUtil/DiffResult#
 //                                  ^^^^^^^^^^^^ definition local 8
 //                                               display_name differResult
-//                                               documentation ```java\n@Nullable\nunresolved_type differResult\n```
+//                                               signature_documentation java @Nullable\nunresolved_type differResult
   ) {
     this.previousModels = previousModels;
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#previousModels.
@@ -223,11 +223,11 @@ private DiffResult(
   public void dispatchTo(Adapter adapter) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo().
 //                       display_name dispatchTo
-//                       documentation ```java\npublic void dispatchTo(unresolved_type adapter)\n```
+//                       signature_documentation java public void dispatchTo(unresolved_type adapter)
 //                       ^^^^^^^ reference semanticdb maven . . Adapter#
 //                               ^^^^^^^ definition local 9
 //                                       display_name adapter
-//                                       documentation ```java\nunresolved_type adapter\n```
+//                                       signature_documentation java unresolved_type adapter
     dispatchTo(new AdapterListUpdateCallback(adapter));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo().
 //                                           ^^^^^^^ reference local 9
@@ -236,11 +236,11 @@ public void dispatchTo(Adapter adapter) {
   public void dispatchTo(ListUpdateCallback callback) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo(+1).
 //                       display_name dispatchTo
-//                       documentation ```java\npublic void dispatchTo(unresolved_type callback)\n```
+//                       signature_documentation java public void dispatchTo(unresolved_type callback)
 //                       ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . ListUpdateCallback#
 //                                          ^^^^^^^^ definition local 10
 //                                                   display_name callback
-//                                                   documentation ```java\nunresolved_type callback\n```
+//                                                   signature_documentation java unresolved_type callback
     if (differResult != null) {
 //      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#differResult.
       differResult.dispatchUpdatesTo(callback);
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
index 9d1be6aec..4b50dadef 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
@@ -37,20 +37,20 @@
 public abstract class EpoxyAdapter extends BaseEpoxyAdapter {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#
 //                                 display_name EpoxyAdapter
-//                                 documentation ```java\n@SuppressWarnings("WeakerAccess")\npublic abstract class EpoxyAdapter\n```
+//                                 signature_documentation java @SuppressWarnings("WeakerAccess")\npublic abstract class EpoxyAdapter
 //                                 documentation  Allows you to easily combine different view types in the same adapter, and handles view holder\n creation, binding, and ids for you. Subclasses just need to add their desired {@link EpoxyModel}\n objects and the rest is done automatically.\n <p/>\n {@link androidx.recyclerview.widget.RecyclerView.Adapter#setHasStableIds(boolean)} is set to true\n by default, since {@link EpoxyModel} makes it easy to support unique ids. If you don't want to\n support this then disable it in your base class (not recommended).\n
 //                                 relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                 relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                 relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#`<init>`().
 //                                 display_name <init>
-//                                 documentation ```java\npublic EpoxyAdapter()\n```
+//                                 signature_documentation java public EpoxyAdapter()
 //                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
   private final HiddenEpoxyModel hiddenModel = new HiddenEpoxyModel();
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#
 //                               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hiddenModel.
 //                                           display_name hiddenModel
-//                                           documentation ```java\nprivate final HiddenEpoxyModel hiddenModel\n```
+//                                           signature_documentation java private final HiddenEpoxyModel hiddenModel
 //                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
 
   /**
@@ -62,14 +62,14 @@ public abstract class EpoxyAdapter extends BaseEpoxyAdapter {
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                           display_name models
-//                                           documentation ```java\nprotected final List<EpoxyModel<?>> models\n```
+//                                           signature_documentation java protected final List<EpoxyModel<?>> models
 //                                           documentation  Subclasses should modify this list as necessary with the models they want to show. Subclasses\n are responsible for notifying data changes whenever this list is changed.\n
 //                                                 ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`(+1).
   private DiffHelper diffHelper;
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#
 //                   ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#diffHelper.
 //                              display_name diffHelper
-//                              documentation ```java\nprivate DiffHelper diffHelper\n```
+//                              signature_documentation java private DiffHelper diffHelper
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -78,7 +78,7 @@ List<EpoxyModel<?>> getCurrentModels() {
 //     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getCurrentModels().
 //                                     display_name getCurrentModels
-//                                     documentation ```java\n@Override\nList<EpoxyModel<?>> getCurrentModels()\n```
+//                                     signature_documentation java @Override\nList<EpoxyModel<?>> getCurrentModels()
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
     return models;
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
@@ -93,7 +93,7 @@ List<EpoxyModel<?>> getCurrentModels() {
   protected void enableDiffing() {
 //               ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#enableDiffing().
 //                             display_name enableDiffing
-//                             documentation ```java\nprotected void enableDiffing()\n```
+//                             signature_documentation java protected void enableDiffing()
 //                             documentation  Enables support for automatically notifying model changes via {@link #notifyModelsChanged()}.\n If used, this should be called in the constructor, before any models are changed.\n\n @see #notifyModelsChanged()\n
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#enableDiffing().
     if (diffHelper != null) {
@@ -126,16 +126,16 @@ EpoxyModel<?> getModelForPosition(int position) {
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
 //                                  display_name getModelForPosition
-//                                  documentation ```java\n@Override\nEpoxyModel<?> getModelForPosition(int position)\n```
+//                                  signature_documentation java @Override\nEpoxyModel<?> getModelForPosition(int position)
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                      ^^^^^^^^ definition local 0
 //                                               display_name position
-//                                               documentation ```java\nint position\n```
+//                                               signature_documentation java int position
     EpoxyModel<?> model = models.get(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 1
 //                      display_name model
-//                      documentation ```java\nEpoxyModel<?> model\n```
+//                      signature_documentation java EpoxyModel<?> model
 //                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                               ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                   ^^^^^^^^ reference local 0
@@ -162,7 +162,7 @@ EpoxyModel<?> getModelForPosition(int position) {
   protected void notifyModelsChanged() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelsChanged().
 //                                   display_name notifyModelsChanged
-//                                   documentation ```java\nprotected void notifyModelsChanged()\n```
+//                                   signature_documentation java protected void notifyModelsChanged()
 //                                   documentation  Intelligently notify item changes by comparing the current {@link #models} list against the\n previous so you don't have to micromanage notification calls yourself. This may be\n prohibitively slow for large model lists (in the hundreds), in which case consider doing\n notification calls yourself. If you use this, all your view models must implement {@link\n EpoxyModel#hashCode()} and {@link EpoxyModel#equals(Object)} to completely identify their\n state, so that changes to a model's content can be detected. Before using this you must enable\n it with {@link #enableDiffing()}, since keeping track of the model state adds extra computation\n time to all other data change notifications.\n\n @see #enableDiffing()\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelsChanged().
     if (diffHelper == null) {
@@ -183,13 +183,13 @@ protected void notifyModelsChanged() {
   protected void notifyModelChanged(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
 //                                  display_name notifyModelChanged
-//                                  documentation ```java\nprotected void notifyModelChanged(EpoxyModel<?> model)\n```
+//                                  signature_documentation java protected void notifyModelChanged(EpoxyModel<?> model)
 //                                  documentation  Notify that the given model has had its data changed. It should only be called if the model\n retained the same position.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged().
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^ definition local 2
 //                                                      display_name model
-//                                                      documentation ```java\nEpoxyModel<?> model\n```
+//                                                      signature_documentation java EpoxyModel<?> model
     notifyModelChanged(model, null);
 //  ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
 //                     ^^^^^ reference local 2
@@ -202,21 +202,21 @@ protected void notifyModelChanged(EpoxyModel<?> model) {
   protected void notifyModelChanged(EpoxyModel<?> model, @Nullable Object payload) {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
 //                                  display_name notifyModelChanged
-//                                  documentation ```java\nprotected void notifyModelChanged(EpoxyModel<?> model, Object payload)\n```
+//                                  signature_documentation java protected void notifyModelChanged(EpoxyModel<?> model, Object payload)
 //                                  documentation  Notify that the given model has had its data changed. It should only be called if the model\n retained the same position.\n
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^ definition local 3
 //                                                      display_name model
-//                                                      documentation ```java\nEpoxyModel<?> model\n```
+//                                                      signature_documentation java EpoxyModel<?> model
 //                                                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                        ^^^^^^^ definition local 4
 //                                                                                display_name payload
-//                                                                                documentation ```java\n@Nullable\nObject payload\n```
+//                                                                                signature_documentation java @Nullable\nObject payload
     int index = getModelPosition(model);
 //      ^^^^^ definition local 5
 //            display_name index
-//            documentation ```java\nint index\n```
+//            signature_documentation java int index
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 3
     if (index != -1) {
@@ -234,16 +234,16 @@ protected void notifyModelChanged(EpoxyModel<?> model, @Nullable Object payload)
   protected void addModel(EpoxyModel<?> modelToAdd) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModel().
 //                        display_name addModel
-//                        documentation ```java\nprotected void addModel(EpoxyModel<?> modelToAdd)\n```
+//                        signature_documentation java protected void addModel(EpoxyModel<?> modelToAdd)
 //                        documentation  Adds the model to the end of the {@link #models} list and notifies that the item was inserted.\n
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^ definition local 6
 //                                                 display_name modelToAdd
-//                                                 documentation ```java\nEpoxyModel<?> modelToAdd\n```
+//                                                 signature_documentation java EpoxyModel<?> modelToAdd
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 7
 //                  display_name initialSize
-//                  documentation ```java\nint initialSize\n```
+//                  signature_documentation java int initialSize
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -268,23 +268,23 @@ protected void addModel(EpoxyModel<?> modelToAdd) {
   protected void addModels(EpoxyModel<?>... modelsToAdd) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
 //                         display_name addModels
-//                         documentation ```java\nprotected void addModels(EpoxyModel<?>[] modelsToAdd)\n```
+//                         signature_documentation java protected void addModels(EpoxyModel<?>[] modelsToAdd)
 //                         documentation  Adds the models to the end of the {@link #models} list and notifies that the items were\n inserted.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^^^^^^ definition local 8
 //                                                      display_name modelsToAdd
-//                                                      documentation ```java\nEpoxyModel<?>[] modelsToAdd\n```
+//                                                      signature_documentation java EpoxyModel<?>[] modelsToAdd
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 9
 //                  display_name initialSize
-//                  documentation ```java\nint initialSize\n```
+//                  signature_documentation java int initialSize
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     int numModelsToAdd = modelsToAdd.length;
 //      ^^^^^^^^^^^^^^ definition local 10
 //                     display_name numModelsToAdd
-//                     documentation ```java\nint numModelsToAdd\n```
+//                     signature_documentation java int numModelsToAdd
 //                       ^^^^^^^^^^^ reference local 8
 //                                   ^^^^^^ reference semanticdb maven . . Array#length.
 
@@ -318,18 +318,18 @@ protected void addModels(EpoxyModel<?>... modelsToAdd) {
   protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
 //                         display_name addModels
-//                         documentation ```java\nprotected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd)\n```
+//                         signature_documentation java protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd)
 //                         documentation  Adds the models to the end of the {@link #models} list and notifies that the items were\n inserted.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1).
 //                         ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^^^^^^^^^^^ definition local 11
 //                                                                         display_name modelsToAdd
-//                                                                         documentation ```java\nCollection<? extends EpoxyModel<?>> modelsToAdd\n```
+//                                                                         signature_documentation java Collection<? extends EpoxyModel<?>> modelsToAdd
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 12
 //                  display_name initialSize
-//                  documentation ```java\nint initialSize\n```
+//                  signature_documentation java int initialSize
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -356,21 +356,21 @@ protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
   protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
 //                                 display_name insertModelBefore
-//                                 documentation ```java\nprotected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore)\n```
+//                                 signature_documentation java protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore)
 //                                 documentation  Inserts the given model before the other in the {@link #models} list, and notifies that the\n item was inserted.\n
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore().
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^^^ definition local 13
 //                                                             display_name modelToInsert
-//                                                             documentation ```java\nEpoxyModel<?> modelToInsert\n```
+//                                                             signature_documentation java EpoxyModel<?> modelToInsert
 //                                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                            ^^^^^^^^^^^^^^^^^^^ definition local 14
 //                                                                                                display_name modelToInsertBefore
-//                                                                                                documentation ```java\nEpoxyModel<?> modelToInsertBefore\n```
+//                                                                                                signature_documentation java EpoxyModel<?> modelToInsertBefore
     int targetIndex = getModelPosition(modelToInsertBefore);
 //      ^^^^^^^^^^^ definition local 15
 //                  display_name targetIndex
-//                  documentation ```java\nint targetIndex\n```
+//                  signature_documentation java int targetIndex
 //                    ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                                     ^^^^^^^^^^^^^^^^^^^ reference local 14
     if (targetIndex == -1) {
@@ -402,21 +402,21 @@ protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> mode
   protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter) {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
 //                                display_name insertModelAfter
-//                                documentation ```java\nprotected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter)\n```
+//                                signature_documentation java protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter)
 //                                documentation  Inserts the given model after the other in the {@link #models} list, and notifies that the item\n was inserted.\n
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter().
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^^^^^^^^ definition local 16
 //                                                            display_name modelToInsert
-//                                                            documentation ```java\nEpoxyModel<?> modelToInsert\n```
+//                                                            signature_documentation java EpoxyModel<?> modelToInsert
 //                                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                           ^^^^^^^^^^^^^^^^^^ definition local 17
 //                                                                                              display_name modelToInsertAfter
-//                                                                                              documentation ```java\nEpoxyModel<?> modelToInsertAfter\n```
+//                                                                                              signature_documentation java EpoxyModel<?> modelToInsertAfter
     int modelIndex = getModelPosition(modelToInsertAfter);
 //      ^^^^^^^^^^ definition local 18
 //                 display_name modelIndex
-//                 documentation ```java\nint modelIndex\n```
+//                 signature_documentation java int modelIndex
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                                    ^^^^^^^^^^^^^^^^^^ reference local 17
     if (modelIndex == -1) {
@@ -429,7 +429,7 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
     int targetIndex = modelIndex + 1;
 //      ^^^^^^^^^^^ definition local 19
 //                  display_name targetIndex
-//                  documentation ```java\nint targetIndex\n```
+//                  signature_documentation java int targetIndex
 //                    ^^^^^^^^^^ reference local 18
     pauseModelListNotifications();
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#pauseModelListNotifications().
@@ -453,17 +453,17 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
   protected void removeModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
 //                           display_name removeModel
-//                           documentation ```java\nprotected void removeModel(EpoxyModel<?> model)\n```
+//                           signature_documentation java protected void removeModel(EpoxyModel<?> model)
 //                           documentation  If the given model exists it is removed and an item removal is notified. Otherwise this does\n nothing.\n
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel().
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^ definition local 20
 //                                               display_name model
-//                                               documentation ```java\nEpoxyModel<?> model\n```
+//                                               signature_documentation java EpoxyModel<?> model
     int index = getModelPosition(model);
 //      ^^^^^ definition local 21
 //            display_name index
-//            documentation ```java\nint index\n```
+//            signature_documentation java int index
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 20
     if (index != -1) {
@@ -489,13 +489,13 @@ protected void removeModel(EpoxyModel<?> model) {
   protected void removeAllModels() {
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllModels().
 //                               display_name removeAllModels
-//                               documentation ```java\nprotected void removeAllModels()\n```
+//                               signature_documentation java protected void removeAllModels()
 //                               documentation  Removes all models\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllModels().
     int numModelsRemoved = models.size();
 //      ^^^^^^^^^^^^^^^^ definition local 22
 //                       display_name numModelsRemoved
-//                       documentation ```java\nint numModelsRemoved\n```
+//                       signature_documentation java int numModelsRemoved
 //                         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -520,31 +520,31 @@ protected void removeAllModels() {
   protected void removeAllAfterModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
 //                                   display_name removeAllAfterModel
-//                                   documentation ```java\nprotected void removeAllAfterModel(EpoxyModel<?> model)\n```
+//                                   signature_documentation java protected void removeAllAfterModel(EpoxyModel<?> model)
 //                                   documentation  Removes all models after the given model, which must have already been added. An example use\n case is you want to keep a header but clear everything else, like in the case of refreshing\n data.\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel().
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^ definition local 23
 //                                                       display_name model
-//                                                       documentation ```java\nEpoxyModel<?> model\n```
+//                                                       signature_documentation java EpoxyModel<?> model
     List<EpoxyModel<?>> modelsToRemove = getAllModelsAfter(model);
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^^^^ definition local 24
 //                                     display_name modelsToRemove
-//                                     documentation ```java\nList<EpoxyModel<?>> modelsToRemove\n```
+//                                     signature_documentation java List<EpoxyModel<?>> modelsToRemove
 //                                       ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                                         ^^^^^ reference local 23
     int numModelsRemoved = modelsToRemove.size();
 //      ^^^^^^^^^^^^^^^^ definition local 25
 //                       display_name numModelsRemoved
-//                       documentation ```java\nint numModelsRemoved\n```
+//                       signature_documentation java int numModelsRemoved
 //                         ^^^^^^^^^^^^^^ reference local 24
 //                                        ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     int initialModelCount = models.size();
 //      ^^^^^^^^^^^^^^^^^ definition local 26
 //                        display_name initialModelCount
-//                        documentation ```java\nint initialModelCount\n```
+//                        signature_documentation java int initialModelCount
 //                          ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -574,16 +574,16 @@ protected void removeAllAfterModel(EpoxyModel<?> model) {
   protected void showModel(EpoxyModel<?> model, boolean show) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //                         display_name showModel
-//                         documentation ```java\nprotected void showModel(EpoxyModel<?> model, boolean show)\n```
+//                         signature_documentation java protected void showModel(EpoxyModel<?> model, boolean show)
 //                         documentation  Sets the visibility of the given model, and notifies that the item changed if the new\n visibility is different from the previous.\n\n @param model The model to show. It should already be added to the {@link #models} list.\n @param show  True to show the model, false to hide it.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^ definition local 27
 //                                             display_name model
-//                                             documentation ```java\nEpoxyModel<?> model\n```
+//                                             signature_documentation java EpoxyModel<?> model
 //                                                      ^^^^ definition local 28
 //                                                           display_name show
-//                                                           documentation ```java\nboolean show\n```
+//                                                           signature_documentation java boolean show
     if (model.isShown() == show) {
 //      ^^^^^ reference local 27
 //            ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isShown().
@@ -608,13 +608,13 @@ protected void showModel(EpoxyModel<?> model, boolean show) {
   protected void showModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
 //                         display_name showModel
-//                         documentation ```java\nprotected void showModel(EpoxyModel<?> model)\n```
+//                         signature_documentation java protected void showModel(EpoxyModel<?> model)
 //                         documentation  Shows the given model, and notifies that the item changed if the item wasn't already shown.\n\n @param model The model to show. It should already be added to the {@link #models} list.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1).
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^ definition local 29
 //                                             display_name model
-//                                             documentation ```java\nEpoxyModel<?> model\n```
+//                                             signature_documentation java EpoxyModel<?> model
     showModel(model, true);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //            ^^^^^ reference local 29
@@ -628,13 +628,13 @@ protected void showModel(EpoxyModel<?> model) {
   protected void showModels(EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
 //                          display_name showModels
-//                          documentation ```java\nprotected void showModels(EpoxyModel<?>[] models)\n```
+//                          signature_documentation java protected void showModels(EpoxyModel<?>[] models)
 //                          documentation  Shows the given models, and notifies that each item changed if the item wasn't already shown.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels().
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^ definition local 30
 //                                                  display_name models
-//                                                  documentation ```java\nEpoxyModel<?>[] models\n```
+//                                                  signature_documentation java EpoxyModel<?>[] models
     showModels(Arrays.asList(models));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
 //             ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
@@ -652,16 +652,16 @@ protected void showModels(EpoxyModel<?>... models) {
   protected void showModels(boolean show, EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
 //                          display_name showModels
-//                          documentation ```java\nprotected void showModels(boolean show, EpoxyModel<?>[] models)\n```
+//                          signature_documentation java protected void showModels(boolean show, EpoxyModel<?>[] models)
 //                          documentation  Sets the visibility of the given models, and notifies that the items changed if the new\n visibility is different from the previous.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n @param show   True to show the models, false to hide them.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1).
 //                                  ^^^^ definition local 31
 //                                       display_name show
-//                                       documentation ```java\nboolean show\n```
+//                                       signature_documentation java boolean show
 //                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                         ^^^^^^ definition local 32
 //                                                                display_name models
-//                                                                documentation ```java\nEpoxyModel<?>[] models\n```
+//                                                                signature_documentation java EpoxyModel<?>[] models
     showModels(Arrays.asList(models), show);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //             ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
@@ -678,14 +678,14 @@ protected void showModels(boolean show, EpoxyModel<?>... models) {
   protected void showModels(Iterable<EpoxyModel<?>> models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
 //                          display_name showModels
-//                          documentation ```java\nprotected void showModels(Iterable<EpoxyModel<?>> models)\n```
+//                          signature_documentation java protected void showModels(Iterable<EpoxyModel<?>> models)
 //                          documentation  Shows the given models, and notifies that each item changed if the item wasn't already shown.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2).
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^ definition local 33
 //                                                         display_name models
-//                                                         documentation ```java\nIterable<EpoxyModel<?>> models\n```
+//                                                         signature_documentation java Iterable<EpoxyModel<?>> models
     showModels(models, true);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //             ^^^^^^ reference local 33
@@ -701,22 +701,22 @@ protected void showModels(Iterable<EpoxyModel<?>> models) {
   protected void showModels(Iterable<EpoxyModel<?>> models, boolean show) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //                          display_name showModels
-//                          documentation ```java\nprotected void showModels(Iterable<EpoxyModel<?>> models, boolean show)\n```
+//                          signature_documentation java protected void showModels(Iterable<EpoxyModel<?>> models, boolean show)
 //                          documentation  Sets the visibility of the given models, and notifies that the items changed if the new\n visibility is different from the previous.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n @param show   True to show the models, false to hide them.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3).
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^ definition local 34
 //                                                         display_name models
-//                                                         documentation ```java\nIterable<EpoxyModel<?>> models\n```
+//                                                         signature_documentation java Iterable<EpoxyModel<?>> models
 //                                                                  ^^^^ definition local 35
 //                                                                       display_name show
-//                                                                       documentation ```java\nboolean show\n```
+//                                                                       signature_documentation java boolean show
     for (EpoxyModel<?> model : models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 36
 //                           display_name model
-//                           documentation ```java\nEpoxyModel<?> model\n```
+//                           signature_documentation java EpoxyModel<?> model
 //                             ^^^^^^ reference local 34
       showModel(model, show);
 //    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
@@ -733,13 +733,13 @@ protected void showModels(Iterable<EpoxyModel<?>> models, boolean show) {
   protected void hideModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
 //                         display_name hideModel
-//                         documentation ```java\nprotected void hideModel(EpoxyModel<?> model)\n```
+//                         signature_documentation java protected void hideModel(EpoxyModel<?> model)
 //                         documentation  Hides the given model, and notifies that the item changed if the item wasn't already hidden.\n\n @param model The model to hide. This should already be added to the {@link #models} list.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^ definition local 37
 //                                             display_name model
-//                                             documentation ```java\nEpoxyModel<?> model\n```
+//                                             signature_documentation java EpoxyModel<?> model
     showModel(model, false);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //            ^^^^^ reference local 37
@@ -753,14 +753,14 @@ protected void hideModel(EpoxyModel<?> model) {
   protected void hideModels(Iterable<EpoxyModel<?>> models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //                          display_name hideModels
-//                          documentation ```java\nprotected void hideModels(Iterable<EpoxyModel<?>> models)\n```
+//                          signature_documentation java protected void hideModels(Iterable<EpoxyModel<?>> models)
 //                          documentation  Hides the given models, and notifies that each item changed if the item wasn't already hidden.\n\n @param models The models to hide. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels().
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^ definition local 38
 //                                                         display_name models
-//                                                         documentation ```java\nIterable<EpoxyModel<?>> models\n```
+//                                                         signature_documentation java Iterable<EpoxyModel<?>> models
     showModels(models, false);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //             ^^^^^^ reference local 38
@@ -774,13 +774,13 @@ protected void hideModels(Iterable<EpoxyModel<?>> models) {
   protected void hideModels(EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
 //                          display_name hideModels
-//                          documentation ```java\nprotected void hideModels(EpoxyModel<?>[] models)\n```
+//                          signature_documentation java protected void hideModels(EpoxyModel<?>[] models)
 //                          documentation  Hides the given models, and notifies that each item changed if the item wasn't already hidden.\n\n @param models The models to hide. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1).
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^ definition local 39
 //                                                  display_name models
-//                                                  documentation ```java\nEpoxyModel<?>[] models\n```
+//                                                  signature_documentation java EpoxyModel<?>[] models
     hideModels(Arrays.asList(models));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //             ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
@@ -796,13 +796,13 @@ protected void hideModels(EpoxyModel<?>... models) {
   protected void hideAllAfterModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
 //                                 display_name hideAllAfterModel
-//                                 documentation ```java\nprotected void hideAllAfterModel(EpoxyModel<?> model)\n```
+//                                 signature_documentation java protected void hideAllAfterModel(EpoxyModel<?> model)
 //                                 documentation  Hides all models currently located after the given model in the {@link #models} list.\n\n @param model The model after which to hide. It must exist in the {@link #models} list.\n
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel().
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^ definition local 40
 //                                                     display_name model
-//                                                     documentation ```java\nEpoxyModel<?> model\n```
+//                                                     signature_documentation java EpoxyModel<?> model
     hideModels(getAllModelsAfter(model));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //             ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
@@ -821,17 +821,17 @@ protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                                display_name getAllModelsAfter
-//                                                documentation ```java\nprotected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model)\n```
+//                                                signature_documentation java protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model)
 //                                                documentation  Returns a sub list of all items in {@link #models} that occur after the given model. This list\n is backed by the original models list, any changes to the returned list will be reflected in\n the original {@link #models} list.\n\n @param model Must exist in {@link #models}.\n
 //                                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter().
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                              ^^^^^ definition local 41
 //                                                                    display_name model
-//                                                                    documentation ```java\nEpoxyModel<?> model\n```
+//                                                                    signature_documentation java EpoxyModel<?> model
     int index = getModelPosition(model);
 //      ^^^^^ definition local 42
 //            display_name index
-//            documentation ```java\nint index\n```
+//            signature_documentation java int index
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 41
     if (index == -1) {
@@ -856,7 +856,7 @@ protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
   private void pauseModelListNotifications() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#pauseModelListNotifications().
 //                                         display_name pauseModelListNotifications
-//                                         documentation ```java\nprivate void pauseModelListNotifications()\n```
+//                                         signature_documentation java private void pauseModelListNotifications()
 //                                         documentation  We pause the list's notifications when we modify models internally, since we already do the\n proper adapter notifications for those modifications. By pausing these list notifications we\n prevent the differ having to do work to track them.\n
     ((ModelList) models).pauseNotifications();
 //    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
@@ -867,7 +867,7 @@ private void pauseModelListNotifications() {
   private void resumeModelListNotifications() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#resumeModelListNotifications().
 //                                          display_name resumeModelListNotifications
-//                                          documentation ```java\nprivate void resumeModelListNotifications()\n```
+//                                          signature_documentation java private void resumeModelListNotifications()
     ((ModelList) models).resumeNotifications();
 //    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
index 5fd5931af..202f1af87 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
@@ -37,12 +37,12 @@
 public final class EpoxyAsyncUtil {
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#
 //                                display_name EpoxyAsyncUtil
-//                                documentation ```java\npublic final class EpoxyAsyncUtil\n```
+//                                signature_documentation java public final class EpoxyAsyncUtil
 //                                documentation  Various helpers for running Epoxy operations off the main thread.\n
   private EpoxyAsyncUtil() {
 //        ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\nprivate EpoxyAsyncUtil()\n```
+//                       signature_documentation java private EpoxyAsyncUtil()
   }
 
   /**
@@ -52,7 +52,7 @@ private EpoxyAsyncUtil() {
 //                    ^^^^^^^ reference semanticdb maven . . Handler#
 //                            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#MAIN_THREAD_HANDLER.
 //                                                display_name MAIN_THREAD_HANDLER
-//                                                documentation ```java\npublic static final unresolved_type MAIN_THREAD_HANDLER\n```
+//                                                signature_documentation java public static final unresolved_type MAIN_THREAD_HANDLER
 //                                                documentation  A Handler class that uses the main thread's Looper.\n
       createHandler(Looper.getMainLooper(), false);
 //    ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
@@ -68,7 +68,7 @@ private EpoxyAsyncUtil() {
 //                    ^^^^^^^ reference semanticdb maven . . Handler#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#AYSNC_MAIN_THREAD_HANDLER.
 //                                                      display_name AYSNC_MAIN_THREAD_HANDLER
-//                                                      documentation ```java\npublic static final unresolved_type AYSNC_MAIN_THREAD_HANDLER\n```
+//                                                      signature_documentation java public static final unresolved_type AYSNC_MAIN_THREAD_HANDLER
 //                                                      documentation  A Handler class that uses the main thread's Looper. Additionally, this handler calls\n {@link Message#setAsynchronous(boolean)} for\n each {@link Message} that is sent to it or {@link Runnable} that is posted to it\n
       createHandler(Looper.getMainLooper(), true);
 //    ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
@@ -79,7 +79,7 @@ private EpoxyAsyncUtil() {
 //               ^^^^^^^ reference semanticdb maven . . Handler#
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#asyncBackgroundHandler.
 //                                              display_name asyncBackgroundHandler
-//                                              documentation ```java\nprivate static unresolved_type asyncBackgroundHandler\n```
+//                                              signature_documentation java private static unresolved_type asyncBackgroundHandler
 
   /**
    * A Handler class that uses a separate background thread dedicated to Epoxy. Additionally,
@@ -92,7 +92,7 @@ public static Handler getAsyncBackgroundHandler() {
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#getAsyncBackgroundHandler().
 //                                                display_name getAsyncBackgroundHandler
-//                                                documentation ```java\n@MainThread\npublic static unresolved_type getAsyncBackgroundHandler()\n```
+//                                                signature_documentation java @MainThread\npublic static unresolved_type getAsyncBackgroundHandler()
 //                                                documentation  A Handler class that uses a separate background thread dedicated to Epoxy. Additionally,\n this handler calls {@link Message#setAsynchronous(boolean)} for\n each {@link Message} that is sent to it or {@link Runnable} that is posted to it\n
     // This is initialized lazily so we don't create the thread unless it will be used.
     // It isn't synchronized so it should only be accessed on the main thread.
@@ -118,15 +118,15 @@ public static Handler createHandler(Looper looper, boolean async) {
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
 //                                    display_name createHandler
-//                                    documentation ```java\npublic static unresolved_type createHandler(unresolved_type looper, boolean async)\n```
+//                                    signature_documentation java public static unresolved_type createHandler(unresolved_type looper, boolean async)
 //                                    documentation  Create a Handler with the given Looper\n\n @param async If true the Handler will calls {@link Message#setAsynchronous(boolean)} for\n              each {@link Message} that is sent to it or {@link Runnable} that is posted to it.\n
 //                                    ^^^^^^ reference semanticdb maven . . Looper#
 //                                           ^^^^^^ definition local 0
 //                                                  display_name looper
-//                                                  documentation ```java\nunresolved_type looper\n```
+//                                                  signature_documentation java unresolved_type looper
 //                                                           ^^^^^ definition local 1
 //                                                                 display_name async
-//                                                                 documentation ```java\nboolean async\n```
+//                                                                 signature_documentation java boolean async
     if (!async) {
 //       ^^^^^ reference local 1
       return new Handler(looper);
@@ -167,7 +167,7 @@ public static Handler createHandler(Looper looper, boolean async) {
 //             ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Throwable#
 //                       ^^^^^^^ definition local 2
 //                               display_name ignored
-//                               documentation ```java\nThrowable ignored\n```
+//                               signature_documentation java Throwable ignored
       }
     }
 
@@ -182,17 +182,17 @@ public static Looper buildBackgroundLooper(String threadName) {
 //              ^^^^^^ reference semanticdb maven . . Looper#
 //                     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#buildBackgroundLooper().
 //                                           display_name buildBackgroundLooper
-//                                           documentation ```java\npublic static unresolved_type buildBackgroundLooper(String threadName)\n```
+//                                           signature_documentation java public static unresolved_type buildBackgroundLooper(String threadName)
 //                                           documentation  Create a new looper that runs on a new background thread.\n
 //                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                                  ^^^^^^^^^^ definition local 3
 //                                                             display_name threadName
-//                                                             documentation ```java\nString threadName\n```
+//                                                             signature_documentation java String threadName
     HandlerThread handlerThread = new HandlerThread(threadName);
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . HandlerThread#
 //                ^^^^^^^^^^^^^ definition local 4
 //                              display_name handlerThread
-//                              documentation ```java\nunresolved_type handlerThread\n```
+//                              signature_documentation java unresolved_type handlerThread
 //                                                  ^^^^^^^^^^ reference local 3
     handlerThread.start();
 //  ^^^^^^^^^^^^^ reference local 4
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
index 6b254ae7a..f1f7c983f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
@@ -114,7 +114,7 @@
 public abstract class EpoxyController implements ModelCollector, StickyHeaderCallbacks {
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                    display_name EpoxyController
-//                                    documentation ```java\npublic abstract class EpoxyController\n```
+//                                    signature_documentation java public abstract class EpoxyController
 //                                    documentation  A controller for easily combining {@link EpoxyModel} instances in a {@link RecyclerView.Adapter}.\n Simply implement {@link #buildModels()} to declare which models should be used, and in which\n order. Call {@link #requestModelBuild()} whenever your data changes, and the controller will call\n {@link #buildModels()}, update the adapter with the new models, and notify any changes between\n the new and old models.\n <p>\n The controller maintains a {@link androidx.recyclerview.widget.RecyclerView.Adapter} with the\n latest models, which you can get via {@link #getAdapter()} to set on your RecyclerView.\n <p>\n All data change notifications are applied automatically via Epoxy's diffing algorithm. All of\n your models must have a unique id set on them for diffing to work. You may choose to use {@link\n AutoModel} annotations to have the controller create models with unique ids for you\n automatically.\n <p>\n Once a model is created and added to the controller in {@link #buildModels()} it should be\n treated as immutable and never modified again. This is necessary for adapter updates to be\n accurate.\n
 //                                    relationship is_implementation semanticdb maven . . ModelCollector#
 //                                    relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -131,20 +131,20 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
   private static final int DELAY_TO_CHECK_ADAPTER_COUNT_MS = 3000;
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#DELAY_TO_CHECK_ADAPTER_COUNT_MS.
 //                                                         display_name DELAY_TO_CHECK_ADAPTER_COUNT_MS
-//                                                         documentation ```java\nprivate static final int DELAY_TO_CHECK_ADAPTER_COUNT_MS\n```
+//                                                         signature_documentation java private static final int DELAY_TO_CHECK_ADAPTER_COUNT_MS
 //                                                         documentation  We check that the adapter is not connected to multiple recyclerviews, but when a fragment has\n its view quickly destroyed and recreated it may temporarily attach the same adapter to the\n previous view and the new view (eg because of fragment transitions) if the controller is reused\n across views. We want to allow this case since it is a brief transient state. This should be\n enough time for screen transitions to happen.\n
   private static final Timer NO_OP_TIMER = new NoOpTimer();
 //                     ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#NO_OP_TIMER.
 //                                       display_name NO_OP_TIMER
-//                                       documentation ```java\nprivate static final Timer NO_OP_TIMER\n```
+//                                       signature_documentation java private static final Timer NO_OP_TIMER
 //                                             ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpTimer#`<init>`().
 
   public static Handler defaultModelBuildingHandler = MainThreadExecutor.INSTANCE.handler;
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#defaultModelBuildingHandler.
 //                                                  display_name defaultModelBuildingHandler
-//                                                  documentation ```java\npublic static unresolved_type defaultModelBuildingHandler\n```
+//                                                  signature_documentation java public static unresolved_type defaultModelBuildingHandler
 //                                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                                                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
 //                                                                                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
@@ -152,38 +152,38 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#defaultDiffingHandler.
 //                                            display_name defaultDiffingHandler
-//                                            documentation ```java\npublic static unresolved_type defaultDiffingHandler\n```
+//                                            signature_documentation java public static unresolved_type defaultDiffingHandler
 //                                              ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                                                 ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
 //                                                                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
   private static boolean filterDuplicatesDefault = false;
 //                       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesDefault.
 //                                               display_name filterDuplicatesDefault
-//                                               documentation ```java\nprivate static boolean filterDuplicatesDefault\n```
+//                                               signature_documentation java private static boolean filterDuplicatesDefault
   private static boolean globalDebugLoggingEnabled = false;
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalDebugLoggingEnabled.
 //                                                 display_name globalDebugLoggingEnabled
-//                                                 documentation ```java\nprivate static boolean globalDebugLoggingEnabled\n```
+//                                                 signature_documentation java private static boolean globalDebugLoggingEnabled
 
   private final EpoxyControllerAdapter adapter;
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#
 //                                     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                                             display_name adapter
-//                                             documentation ```java\nprivate final EpoxyControllerAdapter adapter\n```
+//                                             signature_documentation java private final EpoxyControllerAdapter adapter
   private EpoxyDiffLogger debugObserver;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#
 //                        ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#debugObserver.
 //                                      display_name debugObserver
-//                                      documentation ```java\nprivate EpoxyDiffLogger debugObserver\n```
+//                                      signature_documentation java private EpoxyDiffLogger debugObserver
   private int recyclerViewAttachCount = 0;
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
 //                                    display_name recyclerViewAttachCount
-//                                    documentation ```java\nprivate int recyclerViewAttachCount\n```
+//                                    signature_documentation java private int recyclerViewAttachCount
   private final Handler modelBuildHandler;
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelBuildHandler.
 //                                        display_name modelBuildHandler
-//                                        documentation ```java\nprivate final unresolved_type modelBuildHandler\n```
+//                                        signature_documentation java private final unresolved_type modelBuildHandler
 
   /**
    * This is iterated over in the build models thread, but items can be inserted or removed from
@@ -194,7 +194,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                   ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
 //                                             display_name interceptors
-//                                             documentation ```java\nprivate final List<Interceptor> interceptors\n```
+//                                             signature_documentation java private final List<Interceptor> interceptors
 //                                             documentation  This is iterated over in the build models thread, but items can be inserted or removed from\n other threads at any time.\n
 //                                                   ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/CopyOnWriteArrayList#`<init>`().
 
@@ -202,7 +202,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
   private volatile boolean filterDuplicates = filterDuplicatesDefault;
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
 //                                          display_name filterDuplicates
-//                                          documentation ```java\nprivate boolean filterDuplicates\n```
+//                                          signature_documentation java private boolean filterDuplicates
 //                                            ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesDefault.
   /**
    * This is used to track whether we are currently building models. If it is non null it means
@@ -215,7 +215,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/Thread#
 //                        ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#threadBuildingModels.
 //                                             display_name threadBuildingModels
-//                                             documentation ```java\nprivate Thread threadBuildingModels\n```
+//                                             signature_documentation java private Thread threadBuildingModels
 //                                             documentation  This is used to track whether we are currently building models. If it is non null it means\n a thread is in the building models method. We store the thread so we can know which one\n is building models.\n <p>\n Volatile because -> write only on handler, read from any thread\n
   /**
    * Used to know that we should build models synchronously the first time.
@@ -225,7 +225,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
   private volatile boolean hasBuiltModelsEver;
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#hasBuiltModelsEver.
 //                                            display_name hasBuiltModelsEver
-//                                            documentation ```java\nprivate boolean hasBuiltModelsEver\n```
+//                                            signature_documentation java private boolean hasBuiltModelsEver
 //                                            documentation  Used to know that we should build models synchronously the first time.\n <p>\n Volatile because -> written from the build models thread, read from the main thread.\n
 
   //////////////////////////////////////////////////////////////////////////////////////////
@@ -240,38 +240,38 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //        ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
 //                    display_name timer
-//                    documentation ```java\nprivate Timer timer\n```
+//                    signature_documentation java private Timer timer
 //                    documentation Used to time operations and log their duration when in debug mode. 
 //                      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#NO_OP_TIMER.
   private final ControllerHelper helper = getHelperForController(this);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#helper.
 //                                      display_name helper
-//                                      documentation ```java\nprivate final ControllerHelper helper\n```
+//                                      signature_documentation java private final ControllerHelper helper
 //                                        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
   private ControllerModelList modelsBeingBuilt;
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
 //                            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                                             display_name modelsBeingBuilt
-//                                             documentation ```java\nprivate ControllerModelList modelsBeingBuilt\n```
+//                                             signature_documentation java private ControllerModelList modelsBeingBuilt
   private List<ModelInterceptorCallback> modelInterceptorCallbacks;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
 //                                                                 display_name modelInterceptorCallbacks
-//                                                                 documentation ```java\nprivate List<ModelInterceptorCallback> modelInterceptorCallbacks\n```
+//                                                                 signature_documentation java private List<ModelInterceptorCallback> modelInterceptorCallbacks
   private EpoxyModel<?> stagedModel;
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
 //                                  display_name stagedModel
-//                                  documentation ```java\nprivate EpoxyModel<?> stagedModel\n```
+//                                  signature_documentation java private EpoxyModel<?> stagedModel
 
   //////////////////////////////////////////////////////////////////////////////////////////
 
   public EpoxyController() {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\npublic EpoxyController()\n```
+//                       signature_documentation java public EpoxyController()
     this(defaultModelBuildingHandler, defaultDiffingHandler);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#defaultModelBuildingHandler.
@@ -281,15 +281,15 @@ public EpoxyController() {
   public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //                       display_name <init>
-//                       documentation ```java\npublic EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
+//                       signature_documentation java public EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
 //                       ^^^^^^^ reference semanticdb maven . . Handler#
 //                               ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                    display_name modelBuildingHandler
-//                                                    documentation ```java\nunresolved_type modelBuildingHandler\n```
+//                                                    signature_documentation java unresolved_type modelBuildingHandler
 //                                                     ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                             ^^^^^^^^^^^^^^ definition local 1
 //                                                                            display_name diffingHandler
-//                                                                            documentation ```java\nunresolved_type diffingHandler\n```
+//                                                                            signature_documentation java unresolved_type diffingHandler
     adapter = new EpoxyControllerAdapter(this, diffingHandler);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
@@ -313,7 +313,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 // ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
 //                                              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestedModelBuildType.
 //                                                                      display_name requestedModelBuildType
-//                                                                      documentation ```java\n@RequestedModelBuildType\nprivate int requestedModelBuildType\n```
+//                                                                      signature_documentation java @RequestedModelBuildType\nprivate int requestedModelBuildType
 //                                                                      documentation  Posting and canceling runnables is a bit expensive - it is synchronizes and iterates the\n list of runnables. We want clients to be able to request model builds as often as they want and\n have it act as a no-op if one is already requested, without being a performance hit. To do that\n we track whether we have a call to build models posted already so we can avoid canceling a\n current call and posting it again.\n
       RequestedModelBuildType.NONE;
 //    ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
@@ -327,8 +327,8 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 // ^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/IntDef#
 //         ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
 //                                 display_name RequestedModelBuildType
-//                                 documentation ```java\n@Retention(RetentionPolicy.SOURCE)\n@IntDef({RequestedModelBuildType.NONE, RequestedModelBuildType.NEXT_FRAME, RequestedModelBuildType.DELAYED})\nprivate @interface RequestedModelBuildType\n```
-//                                 relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                                 signature_documentation java @Retention(RetentionPolicy.SOURCE)\n@IntDef({RequestedModelBuildType.NONE, RequestedModelBuildType.NEXT_FRAME, RequestedModelBuildType.DELAYED})\nprivate @interface RequestedModelBuildType
+//                                 relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
 //                                 ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE.
       RequestedModelBuildType.NEXT_FRAME,
@@ -341,18 +341,18 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
     int NONE = 0;
 //      ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE.
 //           display_name NONE
-//           documentation ```java\npublic static final int NONE\n```
+//           signature_documentation java public static final int NONE
     /** A request has been made to build models immediately. It is posted. */
     int NEXT_FRAME = 1;
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NEXT_FRAME.
 //                 display_name NEXT_FRAME
-//                 documentation ```java\npublic static final int NEXT_FRAME\n```
+//                 signature_documentation java public static final int NEXT_FRAME
 //                 documentation A request has been made to build models immediately. It is posted. 
     /** A request has been made to build models after a delay. It is post delayed. */
     int DELAYED = 2;
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#DELAYED.
 //              display_name DELAYED
-//              documentation ```java\npublic static final int DELAYED\n```
+//              signature_documentation java public static final int DELAYED
 //              documentation A request has been made to build models after a delay. It is post delayed. 
   }
 
@@ -372,7 +372,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
   public void requestModelBuild() {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
 //                              display_name requestModelBuild
-//                              documentation ```java\npublic void requestModelBuild()\n```
+//                              signature_documentation java public void requestModelBuild()
 //                              documentation  Call this to request a model update. The controller will schedule a call to {@link\n #buildModels()} so that models can be rebuilt for the current data. Once a build is requested\n all subsequent requests are ignored until the model build runs. Therefore, the calling code\n need not worry about calling this multiple times in a row.\n <p>\n The exception is that the first time this is called on a new instance of {@link\n EpoxyController} it is run synchronously. This allows state to be restored and the initial view\n to be draw quicker.\n <p>\n If you would like to be alerted when models have finished building use\n {@link #addModelBuildListener(OnModelBuildFinishedListener)}\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#requestModelBuild().
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestModelBuild().
@@ -409,7 +409,7 @@ public void requestModelBuild() {
   public boolean hasPendingModelBuild() {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#hasPendingModelBuild().
 //                                    display_name hasPendingModelBuild
-//                                    documentation ```java\npublic boolean hasPendingModelBuild()\n```
+//                                    signature_documentation java public boolean hasPendingModelBuild()
 //                                    documentation  Whether an update to models is currently pending. This can either be because\n {@link #requestModelBuild()} was called, or because models are currently being built or diff\n on a background thread.\n
     return requestedModelBuildType != RequestedModelBuildType.NONE // model build is posted
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestedModelBuildType.
@@ -435,12 +435,12 @@ public boolean hasPendingModelBuild() {
   public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addModelBuildListener().
 //                                  display_name addModelBuildListener
-//                                  documentation ```java\npublic void addModelBuildListener(OnModelBuildFinishedListener listener)\n```
+//                                  signature_documentation java public void addModelBuildListener(OnModelBuildFinishedListener listener)
 //                                  documentation  Add a listener that will be called every time {@link #buildModels()} has finished running\n and changes have been dispatched to the RecyclerView.\n <p>\n Since buildModels can be called once for many calls to {@link #requestModelBuild()}, this is\n called just once for each buildModels execution, not for every request.\n <p>\n Use this to react to changes in your models that need to happen after the RecyclerView has\n been notified, such as scrolling.\n
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                               ^^^^^^^^ definition local 2
 //                                                                        display_name listener
-//                                                                        documentation ```java\nOnModelBuildFinishedListener listener\n```
+//                                                                        signature_documentation java OnModelBuildFinishedListener listener
     adapter.addModelBuildListener(listener);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#addModelBuildListener().
@@ -455,12 +455,12 @@ public void addModelBuildListener(OnModelBuildFinishedListener listener) {
   public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#removeModelBuildListener().
 //                                     display_name removeModelBuildListener
-//                                     documentation ```java\npublic void removeModelBuildListener(OnModelBuildFinishedListener listener)\n```
+//                                     signature_documentation java public void removeModelBuildListener(OnModelBuildFinishedListener listener)
 //                                     documentation  Remove a listener added with {@link #addModelBuildListener(OnModelBuildFinishedListener)}.\n This is safe to call from inside the callback\n {@link OnModelBuildFinishedListener#onModelBuildFinished(DiffResult)}\n
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                                  ^^^^^^^^ definition local 3
 //                                                                           display_name listener
-//                                                                           documentation ```java\nOnModelBuildFinishedListener listener\n```
+//                                                                           signature_documentation java OnModelBuildFinishedListener listener
     adapter.removeModelBuildListener(listener);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#removeModelBuildListener().
@@ -489,7 +489,7 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
   public synchronized void requestDelayedModelBuild(int delayMs) {
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                                  display_name requestDelayedModelBuild
-//                                                  documentation ```java\npublic void requestDelayedModelBuild(int delayMs)\n```
+//                                                  signature_documentation java public void requestDelayedModelBuild(int delayMs)
 //                                                  documentation  Call this to request a delayed model update. The controller will schedule a call to {@link\n #buildModels()} so that models can be rebuilt for the current data.\n <p>\n Using this to delay a model update may be helpful in cases where user input is causing many\n rapid changes in the models, such as typing. In that case, the view is already updated on\n screen and constantly rebuilding models is potentially slow and unnecessary. The downside to\n delaying the model build too long is that models will not be in sync with the data or view, and\n scrolling the view offscreen and back onscreen will cause the model to bind old data.\n <p>\n If a previous request is still pending it will be removed in favor of this new delay\n <p>\n Any call to {@link #requestModelBuild()} will override a delayed request.\n <p>\n In most cases you should use {@link #requestModelBuild()} instead of this.\n\n @param delayMs The time in milliseconds to delay the model build by. Should be greater than or\n                equal to 0. A value of 0 is equivalent to calling {@link #requestModelBuild()}\n
 //                                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild().
 //                                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestDelayedModelBuild().
@@ -497,7 +497,7 @@ public synchronized void requestDelayedModelBuild(int delayMs) {
 //                                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestDelayedModelBuild().
 //                                                      ^^^^^^^ definition local 4
 //                                                              display_name delayMs
-//                                                              documentation ```java\nint delayMs\n```
+//                                                              signature_documentation java int delayMs
     if (isBuildingModels()) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
       throw new IllegalEpoxyUsage(
@@ -541,7 +541,7 @@ public synchronized void requestDelayedModelBuild(int delayMs) {
   public synchronized void cancelPendingModelBuild() {
 //                         ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#cancelPendingModelBuild().
 //                                                 display_name cancelPendingModelBuild
-//                                                 documentation ```java\npublic void cancelPendingModelBuild()\n```
+//                                                 signature_documentation java public void cancelPendingModelBuild()
 //                                                 documentation  Cancels a pending call to {@link #buildModels()} if one has been queued by {@link\n #requestModelBuild()}.\n
     // Access to requestedModelBuildType is synchronized because the model building thread clears
     // it when model building starts, and the main thread needs to set it to indicate a build
@@ -568,14 +568,14 @@ public synchronized void cancelPendingModelBuild() {
 //              ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModelsRunnable.
 //                                           display_name buildModelsRunnable
-//                                           documentation ```java\nprivate final Runnable buildModelsRunnable\n```
+//                                           signature_documentation java private final Runnable buildModelsRunnable
 //                                                 ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void run() {
 //              ^^^ definition local 6
 //                  display_name run
-//                  documentation ```java\n@Override\npublic void run()\n```
+//                  signature_documentation java @Override\npublic void run()
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
       // Do this first to mark the controller as being in the model building process.
       threadBuildingModels = Thread.currentThread();
@@ -614,7 +614,7 @@ public void run() {
 //             ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Throwable#
 //                       ^^^^^^^^^ definition local 7
 //                                 display_name throwable
-//                                 documentation ```java\nThrowable throwable\n```
+//                                 signature_documentation java Throwable throwable
         timer.stop();
 //      ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
 //            ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#stop().
@@ -670,12 +670,12 @@ public void run() {
   private int getExpectedModelCount() {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getExpectedModelCount().
 //                                  display_name getExpectedModelCount
-//                                  documentation ```java\nprivate int getExpectedModelCount()\n```
+//                                  signature_documentation java private int getExpectedModelCount()
 //                                  documentation An estimate for how many models will be built in the next {@link #buildModels()} phase. 
     int currentModelCount = adapter.getItemCount();
 //      ^^^^^^^^^^^^^^^^^ definition local 8
 //                        display_name currentModelCount
-//                        documentation ```java\nint currentModelCount\n```
+//                        signature_documentation java int currentModelCount
 //                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
     return currentModelCount != 0 ? currentModelCount : 25;
@@ -699,7 +699,7 @@ private int getExpectedModelCount() {
   protected abstract void buildModels();
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
 //                                    display_name buildModels
-//                                    documentation ```java\nprotected abstract void buildModels()\n```
+//                                    signature_documentation java protected abstract void buildModels()
 //                                    documentation  Subclasses should implement this to describe what models should be shown for the current state.\n Implementations should call either {@link #add(EpoxyModel)}, {@link\n EpoxyModel#addTo(EpoxyController)}, or {@link EpoxyModel#addIf(boolean, EpoxyController)} with\n the models that should be shown, in the order that is desired.\n <p>\n Once a model is added to the controller it should be treated as immutable and never modified\n again. This is necessary for adapter updates to be accurate. If "validateEpoxyModelUsage" is\n enabled then runtime validations will be done to make sure models are not changed.\n <p>\n You CANNOT call this method directly. Instead, call {@link #requestModelBuild()} to have the\n controller schedule an update.\n
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#buildModels().
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels().
@@ -710,24 +710,24 @@ private int getExpectedModelCount() {
   int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList().
 //                                       display_name getFirstIndexOfModelInBuildingList
-//                                       documentation ```java\nint getFirstIndexOfModelInBuildingList(EpoxyModel<?> model)\n```
+//                                       signature_documentation java int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model)
 //                                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                     ^^^^^ definition local 9
 //                                                           display_name model
-//                                                           documentation ```java\nEpoxyModel<?> model\n```
+//                                                           signature_documentation java EpoxyModel<?> model
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
     int size = modelsBeingBuilt.size();
 //      ^^^^ definition local 10
 //           display_name size
-//           documentation ```java\nint size\n```
+//           signature_documentation java int size
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                              ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 11
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 11
 //                      ^^^^ reference local 10
 //                            ^ reference local 11
@@ -747,28 +747,28 @@ int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
   boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
 //                                  display_name isModelAddedMultipleTimes
-//                                  documentation ```java\nboolean isModelAddedMultipleTimes(EpoxyModel<?> model)\n```
+//                                  signature_documentation java boolean isModelAddedMultipleTimes(EpoxyModel<?> model)
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^ definition local 12
 //                                                      display_name model
-//                                                      documentation ```java\nEpoxyModel<?> model\n```
+//                                                      signature_documentation java EpoxyModel<?> model
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
     int modelCount = 0;
 //      ^^^^^^^^^^ definition local 13
 //                 display_name modelCount
-//                 documentation ```java\nint modelCount\n```
+//                 signature_documentation java int modelCount
     int size = modelsBeingBuilt.size();
 //      ^^^^ definition local 14
 //           display_name size
-//           documentation ```java\nint size\n```
+//           signature_documentation java int size
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                              ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 15
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 15
 //                      ^^^^ reference local 14
 //                            ^ reference local 15
@@ -789,11 +789,11 @@ boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
   void addAfterInterceptorCallback(ModelInterceptorCallback callback) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addAfterInterceptorCallback().
 //                                 display_name addAfterInterceptorCallback
-//                                 documentation ```java\nvoid addAfterInterceptorCallback(ModelInterceptorCallback callback)\n```
+//                                 signature_documentation java void addAfterInterceptorCallback(ModelInterceptorCallback callback)
 //                                 ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                                          ^^^^^^^^ definition local 16
 //                                                                   display_name callback
-//                                                                   documentation ```java\nModelInterceptorCallback callback\n```
+//                                                                   signature_documentation java ModelInterceptorCallback callback
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
@@ -817,30 +817,30 @@ void addAfterInterceptorCallback(ModelInterceptorCallback callback) {
   interface ModelInterceptorCallback {
 //          ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                   display_name ModelInterceptorCallback
-//                                   documentation ```java\ninterface ModelInterceptorCallback\n```
+//                                   signature_documentation java interface ModelInterceptorCallback
 //                                   documentation  Callbacks to each model for when interceptors are started and stopped, so the models know when\n to allow changes.\n
     void onInterceptorsStarted(EpoxyController controller);
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
 //                             display_name onInterceptorsStarted
-//                             documentation ```java\npublic abstract void onInterceptorsStarted(EpoxyController controller)\n```
+//                             signature_documentation java public abstract void onInterceptorsStarted(EpoxyController controller)
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                             ^^^^^^^^^^ definition local 17
 //                                                        display_name controller
-//                                                        documentation ```java\nEpoxyController controller\n```
+//                                                        signature_documentation java EpoxyController controller
     void onInterceptorsFinished(EpoxyController controller);
 //       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
 //                              display_name onInterceptorsFinished
-//                              documentation ```java\npublic abstract void onInterceptorsFinished(EpoxyController controller)\n```
+//                              signature_documentation java public abstract void onInterceptorsFinished(EpoxyController controller)
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                              ^^^^^^^^^^ definition local 18
 //                                                         display_name controller
-//                                                         documentation ```java\nEpoxyController controller\n```
+//                                                         signature_documentation java EpoxyController controller
   }
 
   private void runInterceptors() {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
 //                             display_name runInterceptors
-//                             documentation ```java\nprivate void runInterceptors()\n```
+//                             signature_documentation java private void runInterceptors()
     if (!interceptors.isEmpty()) {
 //       ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
 //                    ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -850,7 +850,7 @@ private void runInterceptors() {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                    ^^^^^^^^ definition local 19
 //                                             display_name callback
-//                                             documentation ```java\nModelInterceptorCallback callback\n```
+//                                             signature_documentation java ModelInterceptorCallback callback
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
           callback.onInterceptorsStarted(this);
 //        ^^^^^^^^ reference local 19
@@ -866,7 +866,7 @@ private void runInterceptors() {
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                     ^^^^^^^^^^^ definition local 20
 //                                 display_name interceptor
-//                                 documentation ```java\nInterceptor interceptor\n```
+//                                 signature_documentation java Interceptor interceptor
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
         interceptor.intercept(modelsBeingBuilt);
 //      ^^^^^^^^^^^ reference local 20
@@ -884,7 +884,7 @@ private void runInterceptors() {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                    ^^^^^^^^ definition local 21
 //                                             display_name callback
-//                                             documentation ```java\nModelInterceptorCallback callback\n```
+//                                             signature_documentation java ModelInterceptorCallback callback
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
           callback.onInterceptorsFinished(this);
 //        ^^^^^^^^ reference local 21
@@ -904,7 +904,7 @@ private void runInterceptors() {
   public interface Interceptor {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                             display_name Interceptor
-//                             documentation ```java\npublic interface Interceptor\n```
+//                             signature_documentation java public interface Interceptor
 //                             documentation A callback that is run after {@link #buildModels()} completes and before diffing is run. 
     /**
      * This is called immediately after {@link #buildModels()} and before diffing is run and the
@@ -919,14 +919,14 @@ public interface Interceptor {
     void intercept(@NonNull List<EpoxyModel<?>> models);
 //       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#intercept().
 //                 display_name intercept
-//                 documentation ```java\npublic abstract void intercept(List<EpoxyModel<?>> models)\n```
+//                 signature_documentation java public abstract void intercept(List<EpoxyModel<?>> models)
 //                 documentation  This is called immediately after {@link #buildModels()} and before diffing is run and the\n models are set on the adapter. This is a final chance to make any changes to the the models\n added in {@link #buildModels()}. This may be useful for actions that act on all models in\n aggregate, such as toggling divider settings, or for cases such as rearranging models for an\n experiment.\n <p>\n The models list must not be changed after this method returns. Doing so will throw an\n exception.\n
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^ definition local 22
 //                                                     display_name models
-//                                                     documentation ```java\n@NonNull\nList<EpoxyModel<?>> models\n```
+//                                                     signature_documentation java @NonNull\nList<EpoxyModel<?>> models
   }
 
   /**
@@ -940,13 +940,13 @@ public interface Interceptor {
   public void addInterceptor(@NonNull Interceptor interceptor) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInterceptor().
 //                           display_name addInterceptor
-//                           documentation ```java\npublic void addInterceptor(Interceptor interceptor)\n```
+//                           signature_documentation java public void addInterceptor(Interceptor interceptor)
 //                           documentation  Add an interceptor callback to be run after models are built, to make any last changes before\n they are set on the adapter. Interceptors are run in the order they are added.\n <p>\n Interceptors are run on the same thread that models are built on.\n\n @see Interceptor#intercept(List)\n
 //                            ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                    ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                                                ^^^^^^^^^^^ definition local 23
 //                                                            display_name interceptor
-//                                                            documentation ```java\n@NonNull\nInterceptor interceptor\n```
+//                                                            signature_documentation java @NonNull\nInterceptor interceptor
     interceptors.add(interceptor);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
 //               ^^^ reference semanticdb maven jdk 11 java/util/List#add().
@@ -957,13 +957,13 @@ public void addInterceptor(@NonNull Interceptor interceptor) {
   public void removeInterceptor(@NonNull Interceptor interceptor) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#removeInterceptor().
 //                              display_name removeInterceptor
-//                              documentation ```java\npublic void removeInterceptor(Interceptor interceptor)\n```
+//                              signature_documentation java public void removeInterceptor(Interceptor interceptor)
 //                              documentation Remove an interceptor that was added with {@link #addInterceptor(Interceptor)}. 
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                                                   ^^^^^^^^^^^ definition local 24
 //                                                               display_name interceptor
-//                                                               documentation ```java\n@NonNull\nInterceptor interceptor\n```
+//                                                               signature_documentation java @NonNull\nInterceptor interceptor
     interceptors.remove(interceptor);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
 //               ^^^^^^ reference semanticdb maven jdk 11 java/util/List#remove().
@@ -981,7 +981,7 @@ public void removeInterceptor(@NonNull Interceptor interceptor) {
   protected int getModelCountBuiltSoFar() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getModelCountBuiltSoFar().
 //                                      display_name getModelCountBuiltSoFar
-//                                      documentation ```java\nprotected int getModelCountBuiltSoFar()\n```
+//                                      signature_documentation java protected int getModelCountBuiltSoFar()
 //                                      documentation  Get the number of models added so far during the {@link #buildModels()} phase. It is only valid\n to call this from within that method.\n <p>\n This is different from the number of models currently on the adapter, since models on the\n adapter are not updated until after models are finished being built. To access current adapter\n count call {@link #getAdapter()} and {@link EpoxyControllerAdapter#getItemCount()}\n
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
@@ -993,7 +993,7 @@ protected int getModelCountBuiltSoFar() {
   private void assertIsBuildingModels() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 //                                    display_name assertIsBuildingModels
-//                                    documentation ```java\nprivate void assertIsBuildingModels()\n```
+//                                    signature_documentation java private void assertIsBuildingModels()
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
       throw new IllegalEpoxyUsage("Can only call this when inside the `buildModels` method");
@@ -1004,7 +1004,7 @@ private void assertIsBuildingModels() {
   private void assertNotBuildingModels() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
 //                                     display_name assertNotBuildingModels
-//                                     documentation ```java\nprivate void assertNotBuildingModels()\n```
+//                                     signature_documentation java private void assertNotBuildingModels()
     if (isBuildingModels()) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
       throw new IllegalEpoxyUsage("Cannot call this from inside `buildModels`");
@@ -1019,13 +1019,13 @@ private void assertNotBuildingModels() {
   public void add(@NonNull EpoxyModel<?> model) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
 //                display_name add
-//                documentation ```java\npublic void add(EpoxyModel<?> model)\n```
+//                signature_documentation java public void add(EpoxyModel<?> model)
 //                documentation  Add the model to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^ definition local 25
 //                                             display_name model
-//                                             documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
+//                                             signature_documentation java @NonNull\nEpoxyModel<?> model
     model.addTo(this);
 //  ^^^^^ reference local 25
 //        ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addTo().
@@ -1038,13 +1038,13 @@ public void add(@NonNull EpoxyModel<?> model) {
   protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+1).
 //                   display_name add
-//                   documentation ```java\nprotected void add(EpoxyModel<?>[] modelsToAdd)\n```
+//                   signature_documentation java protected void add(EpoxyModel<?>[] modelsToAdd)
 //                   documentation  Add the models to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^^^ definition local 26
 //                                                         display_name modelsToAdd
-//                                                         documentation ```java\n@NonNull\nEpoxyModel<?>[] modelsToAdd\n```
+//                                                         signature_documentation java @NonNull\nEpoxyModel<?>[] modelsToAdd
     modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.length);
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#ensureCapacity().
@@ -1057,7 +1057,7 @@ protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 27
 //                           display_name model
-//                           documentation ```java\nEpoxyModel<?> model\n```
+//                           signature_documentation java EpoxyModel<?> model
 //                             ^^^^^^^^^^^ reference local 26
       add(model);
 //    ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
@@ -1072,14 +1072,14 @@ protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
   protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+2).
 //                   display_name add
-//                   documentation ```java\nprotected void add(List<? extends EpoxyModel<?>> modelsToAdd)\n```
+//                   signature_documentation java protected void add(List<? extends EpoxyModel<?>> modelsToAdd)
 //                   documentation  Add the models to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^^^^^^^ definition local 28
 //                                                                      display_name modelsToAdd
-//                                                                      documentation ```java\n@NonNull\nList<? extends EpoxyModel<?>> modelsToAdd\n```
+//                                                                      signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> modelsToAdd
     modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.size());
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#ensureCapacity().
@@ -1092,7 +1092,7 @@ protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 29
 //                           display_name model
-//                           documentation ```java\nEpoxyModel<?> model\n```
+//                           signature_documentation java EpoxyModel<?> model
 //                             ^^^^^^^^^^^ reference local 28
       add(model);
 //    ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
@@ -1107,12 +1107,12 @@ protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
   void addInternal(EpoxyModel<?> modelToAdd) {
 //     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInternal().
 //                 display_name addInternal
-//                 documentation ```java\nvoid addInternal(EpoxyModel<?> modelToAdd)\n```
+//                 signature_documentation java void addInternal(EpoxyModel<?> modelToAdd)
 //                 documentation  Method to actually add the model to the list being built. Should be called after all\n validations are done.\n
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                               ^^^^^^^^^^ definition local 30
 //                                          display_name modelToAdd
-//                                          documentation ```java\nEpoxyModel<?> modelToAdd\n```
+//                                          signature_documentation java EpoxyModel<?> modelToAdd
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
@@ -1161,12 +1161,12 @@ void addInternal(EpoxyModel<?> modelToAdd) {
   void setStagedModel(EpoxyModel<?> model) {
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setStagedModel().
 //                    display_name setStagedModel
-//                    documentation ```java\nvoid setStagedModel(EpoxyModel<?> model)\n```
+//                    signature_documentation java void setStagedModel(EpoxyModel<?> model)
 //                    documentation  Staging models allows them to be implicitly added after the user finishes modifying them. This\n means that if a user has modified a model, and then moves on to modifying a different model,\n the first model is automatically added as soon as the second model is modified.\n <p>\n There are some edge cases for handling models that are added without modification, or models\n that are modified but then fail an `addIf` check.\n <p>\n This only works for AutoModels, and only if implicitly adding is enabled in configuration.\n
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^ definition local 31
 //                                        display_name model
-//                                        documentation ```java\nEpoxyModel<?> model\n```
+//                                        signature_documentation java EpoxyModel<?> model
     if (model != stagedModel) {
 //      ^^^^^ reference local 31
 //               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
@@ -1182,7 +1182,7 @@ void setStagedModel(EpoxyModel<?> model) {
   void addCurrentlyStagedModelIfExists() {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addCurrentlyStagedModelIfExists().
 //                                     display_name addCurrentlyStagedModelIfExists
-//                                     documentation ```java\nvoid addCurrentlyStagedModelIfExists()\n```
+//                                     signature_documentation java void addCurrentlyStagedModelIfExists()
     if (stagedModel != null) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
       stagedModel.addTo(this);
@@ -1196,11 +1196,11 @@ void addCurrentlyStagedModelIfExists() {
   void clearModelFromStaging(EpoxyModel<?> model) {
 //     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#clearModelFromStaging().
 //                           display_name clearModelFromStaging
-//                           documentation ```java\nvoid clearModelFromStaging(EpoxyModel<?> model)\n```
+//                           signature_documentation java void clearModelFromStaging(EpoxyModel<?> model)
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^ definition local 32
 //                                               display_name model
-//                                               documentation ```java\nEpoxyModel<?> model\n```
+//                                               signature_documentation java EpoxyModel<?> model
     if (stagedModel != model) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
 //                     ^^^^^ reference local 32
@@ -1215,7 +1215,7 @@ void clearModelFromStaging(EpoxyModel<?> model) {
   protected boolean isBuildingModels() {
 //                  ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
 //                                   display_name isBuildingModels
-//                                   documentation ```java\nprotected boolean isBuildingModels()\n```
+//                                   signature_documentation java protected boolean isBuildingModels()
 //                                   documentation True if the current callstack originated from the buildModels call, on the same thread. 
     return threadBuildingModels == Thread.currentThread();
 //         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#threadBuildingModels.
@@ -1226,12 +1226,12 @@ protected boolean isBuildingModels() {
   private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
 //                                      display_name filterDuplicatesIfNeeded
-//                                      documentation ```java\nprivate void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models)\n```
+//                                      signature_documentation java private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models)
 //                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^^ definition local 33
 //                                                                 display_name models
-//                                                                 documentation ```java\nList<EpoxyModel<?>> models\n```
+//                                                                 signature_documentation java List<EpoxyModel<?>> models
     if (!filterDuplicates) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
       return;
@@ -1245,7 +1245,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //      ^^^^ reference semanticdb maven jdk 11 java/lang/Long#
 //            ^^^^^^^^ definition local 34
 //                     display_name modelIds
-//                     documentation ```java\nSet<Long> modelIds\n```
+//                     signature_documentation java Set<Long> modelIds
 //                           ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashSet#`<init>`(+3).
 //                                     ^^^^^^ reference local 33
 //                                            ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -1255,7 +1255,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                              ^^^^^^^^^^^^^ definition local 35
 //                                            display_name modelIterator
-//                                            documentation ```java\nListIterator<EpoxyModel<?>> modelIterator\n```
+//                                            signature_documentation java ListIterator<EpoxyModel<?>> modelIterator
 //                                              ^^^^^^ reference local 33
 //                                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/List#listIterator().
     while (modelIterator.hasNext()) {
@@ -1265,7 +1265,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^ definition local 36
 //                        display_name model
-//                        documentation ```java\nEpoxyModel<?> model\n```
+//                        signature_documentation java EpoxyModel<?> model
 //                          ^^^^^^^^^^^^^ reference local 35
 //                                        ^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#next().
       if (!modelIds.add(model.id())) {
@@ -1276,7 +1276,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
         int indexOfDuplicate = modelIterator.previousIndex();
 //          ^^^^^^^^^^^^^^^^ definition local 37
 //                           display_name indexOfDuplicate
-//                           documentation ```java\nint indexOfDuplicate\n```
+//                           signature_documentation java int indexOfDuplicate
 //                             ^^^^^^^^^^^^^ reference local 35
 //                                           ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         modelIterator.remove();
@@ -1286,7 +1286,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
         int indexOfOriginal = findPositionOfDuplicate(models, model);
 //          ^^^^^^^^^^^^^^^ definition local 38
 //                          display_name indexOfOriginal
-//                          documentation ```java\nint indexOfOriginal\n```
+//                          signature_documentation java int indexOfOriginal
 //                            ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                                                    ^^^^^^ reference local 33
 //                                                            ^^^^^ reference local 36
@@ -1294,7 +1294,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^^^^ definition local 39
 //                                  display_name originalModel
-//                                  documentation ```java\nEpoxyModel<?> originalModel\n```
+//                                  signature_documentation java EpoxyModel<?> originalModel
 //                                    ^^^^^^ reference local 33
 //                                           ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                               ^^^^^^^^^^^^^^^ reference local 38
@@ -1328,26 +1328,26 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
   private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> duplicateModel) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                                    display_name findPositionOfDuplicate
-//                                    documentation ```java\nprivate int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> duplicateModel)\n```
+//                                    signature_documentation java private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> duplicateModel)
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^^ definition local 40
 //                                                               display_name models
-//                                                               documentation ```java\nList<EpoxyModel<?>> models\n```
+//                                                               signature_documentation java List<EpoxyModel<?>> models
 //                                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                              ^^^^^^^^^^^^^^ definition local 41
 //                                                                                             display_name duplicateModel
-//                                                                                             documentation ```java\nEpoxyModel<?> duplicateModel\n```
+//                                                                                             signature_documentation java EpoxyModel<?> duplicateModel
     int size = models.size();
 //      ^^^^ definition local 42
 //           display_name size
-//           documentation ```java\nint size\n```
+//           signature_documentation java int size
 //             ^^^^^^ reference local 40
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 43
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 43
 //                      ^^^^ reference local 42
 //                            ^ reference local 43
@@ -1355,7 +1355,7 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^ definition local 44
 //                        display_name model
-//                        documentation ```java\nEpoxyModel<?> model\n```
+//                        signature_documentation java EpoxyModel<?> model
 //                          ^^^^^^ reference local 40
 //                                 ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                     ^ reference local 43
@@ -1386,11 +1386,11 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
   public void setFilterDuplicates(boolean filterDuplicates) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setFilterDuplicates().
 //                                display_name setFilterDuplicates
-//                                documentation ```java\npublic void setFilterDuplicates(boolean filterDuplicates)\n```
+//                                signature_documentation java public void setFilterDuplicates(boolean filterDuplicates)
 //                                documentation  If set to true, Epoxy will search for models with duplicate ids added during {@link\n #buildModels()} and remove any duplicates found. If models with the same id are found, the\n first one is left in the adapter and any subsequent models are removed. {@link\n #onExceptionSwallowed(RuntimeException)} will be called for each duplicate removed.\n <p>\n This may be useful if your models are created via server supplied data, in which case the\n server may erroneously send duplicate items. Duplicate items are otherwise left in and can\n result in undefined behavior.\n
 //                                        ^^^^^^^^^^^^^^^^ definition local 45
 //                                                         display_name filterDuplicates
-//                                                         documentation ```java\nboolean filterDuplicates\n```
+//                                                         signature_documentation java boolean filterDuplicates
     this.filterDuplicates = filterDuplicates;
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
 //                          ^^^^^^^^^^^^^^^^ reference local 45
@@ -1399,7 +1399,7 @@ public void setFilterDuplicates(boolean filterDuplicates) {
   public boolean isDuplicateFilteringEnabled() {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isDuplicateFilteringEnabled().
 //                                           display_name isDuplicateFilteringEnabled
-//                                           documentation ```java\npublic boolean isDuplicateFilteringEnabled()\n```
+//                                           signature_documentation java public boolean isDuplicateFilteringEnabled()
     return filterDuplicates;
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
   }
@@ -1412,11 +1412,11 @@ public boolean isDuplicateFilteringEnabled() {
   public static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesByDefault) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalDuplicateFilteringDefault().
 //                                                      display_name setGlobalDuplicateFilteringDefault
-//                                                      documentation ```java\npublic static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesByDefault)\n```
+//                                                      signature_documentation java public static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesByDefault)
 //                                                      documentation  {@link #setFilterDuplicates(boolean)} is disabled in each EpoxyController by default. It can be\n toggled individually in each controller, or alternatively you can use this to change the\n default value for all EpoxyControllers.\n
 //                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 46
 //                                                                                        display_name filterDuplicatesByDefault
-//                                                                                        documentation ```java\nboolean filterDuplicatesByDefault\n```
+//                                                                                        signature_documentation java boolean filterDuplicatesByDefault
     EpoxyController.filterDuplicatesDefault = filterDuplicatesByDefault;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesDefault.
@@ -1437,11 +1437,11 @@ public static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesBy
   public void setDebugLoggingEnabled(boolean enabled) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setDebugLoggingEnabled().
 //                                   display_name setDebugLoggingEnabled
-//                                   documentation ```java\npublic void setDebugLoggingEnabled(boolean enabled)\n```
+//                                   signature_documentation java public void setDebugLoggingEnabled(boolean enabled)
 //                                   documentation  If enabled, DEBUG logcat messages will be printed to show when models are rebuilt, the time\n taken to build them, the time taken to diff them, and the item change outcomes from the\n differ. The tag of the logcat message is the class name of your EpoxyController.\n <p>\n This is useful to verify that models are being diffed as expected, as well as to watch for\n slowdowns in model building or diffing to indicate when you should optimize model building or\n model hashCode/equals implementations (which can often slow down diffing).\n <p>\n This should only be used in debug builds to avoid a performance hit in prod.\n
 //                                           ^^^^^^^ definition local 47
 //                                                   display_name enabled
-//                                                   documentation ```java\nboolean enabled\n```
+//                                                   signature_documentation java boolean enabled
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
 
@@ -1481,7 +1481,7 @@ public void setDebugLoggingEnabled(boolean enabled) {
   public boolean isDebugLoggingEnabled() {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isDebugLoggingEnabled().
 //                                     display_name isDebugLoggingEnabled
-//                                     documentation ```java\npublic boolean isDebugLoggingEnabled()\n```
+//                                     signature_documentation java public boolean isDebugLoggingEnabled()
     return timer != NO_OP_TIMER;
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
 //                  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#NO_OP_TIMER.
@@ -1496,11 +1496,11 @@ public boolean isDebugLoggingEnabled() {
   public static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnabled) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalDebugLoggingEnabled().
 //                                                display_name setGlobalDebugLoggingEnabled
-//                                                documentation ```java\npublic static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnabled)\n```
+//                                                signature_documentation java public static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnabled)
 //                                                documentation  Similar to {@link #setDebugLoggingEnabled(boolean)}, but this changes the global default for\n all EpoxyControllers.\n <p>\n The default is false.\n
 //                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 48
 //                                                                                  display_name globalDebugLoggingEnabled
-//                                                                                  documentation ```java\nboolean globalDebugLoggingEnabled\n```
+//                                                                                  signature_documentation java boolean globalDebugLoggingEnabled
     EpoxyController.globalDebugLoggingEnabled = globalDebugLoggingEnabled;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalDebugLoggingEnabled.
@@ -1524,7 +1524,7 @@ public static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnable
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                      display_name moveModel
-//                      documentation ```java\npublic void moveModel(int fromPosition, int toPosition)\n```
+//                      signature_documentation java public void moveModel(int fromPosition, int toPosition)
 //                      documentation  An optimized way to move a model from one position to another without rebuilding all models.\n This is intended to be used with {@link androidx.recyclerview.widget.ItemTouchHelper} to\n allow for efficient item dragging and rearranging. It cannot be\n <p>\n If you call this you MUST also update the data backing your models as necessary.\n <p>\n This will immediately change the model's position and notify the change to the RecyclerView.\n However, a delayed request to rebuild models will be scheduled for the future to guarantee that\n models are in sync with data.\n\n @param fromPosition Previous position of the item.\n @param toPosition   New position of the item.\n
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#moveModel().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#moveModel().
@@ -1532,10 +1532,10 @@ public void moveModel(int fromPosition, int toPosition) {
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 49
 //                                       display_name fromPosition
-//                                       documentation ```java\nint fromPosition\n```
+//                                       signature_documentation java int fromPosition
 //                                            ^^^^^^^^^^ definition local 50
 //                                                       display_name toPosition
-//                                                       documentation ```java\nint toPosition\n```
+//                                                       signature_documentation java int toPosition
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
 
@@ -1561,11 +1561,11 @@ public void moveModel(int fromPosition, int toPosition) {
   public void notifyModelChanged(int position) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#notifyModelChanged().
 //                               display_name notifyModelChanged
-//                               documentation ```java\npublic void notifyModelChanged(int position)\n```
+//                               signature_documentation java public void notifyModelChanged(int position)
 //                               documentation  An way to notify the adapter that a model has changed. This is intended to be used with\n {@link androidx.recyclerview.widget.ItemTouchHelper} to allow revert swiping a model.\n <p>\n This will immediately notify the change to the RecyclerView.\n\n @param position Position of the item.\n
 //                                   ^^^^^^^^ definition local 51
 //                                            display_name position
-//                                            documentation ```java\nint position\n```
+//                                            signature_documentation java int position
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
 
@@ -1586,7 +1586,7 @@ public EpoxyControllerAdapter getAdapter() {
 //       ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#
 //                              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getAdapter().
 //                                         display_name getAdapter
-//                                         documentation ```java\n@NonNull\npublic EpoxyControllerAdapter getAdapter()\n```
+//                                         signature_documentation java @NonNull\npublic EpoxyControllerAdapter getAdapter()
 //                                         documentation  Get the underlying adapter built by this controller. Use this to get the adapter to set on a\n RecyclerView, or to get information about models currently in use.\n
     return adapter;
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1595,12 +1595,12 @@ public EpoxyControllerAdapter getAdapter() {
   public void onSaveInstanceState(@NonNull Bundle outState) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onSaveInstanceState().
 //                                display_name onSaveInstanceState
-//                                documentation ```java\npublic void onSaveInstanceState(unresolved_type outState)\n```
+//                                signature_documentation java public void onSaveInstanceState(unresolved_type outState)
 //                                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                         ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                ^^^^^^^^ definition local 52
 //                                                         display_name outState
-//                                                         documentation ```java\n@NonNull\nunresolved_type outState\n```
+//                                                         signature_documentation java @NonNull\nunresolved_type outState
     adapter.onSaveInstanceState(outState);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState().
@@ -1610,12 +1610,12 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
   public void onRestoreInstanceState(@Nullable Bundle inState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onRestoreInstanceState().
 //                                   display_name onRestoreInstanceState
-//                                   documentation ```java\npublic void onRestoreInstanceState(unresolved_type inState)\n```
+//                                   signature_documentation java public void onRestoreInstanceState(unresolved_type inState)
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                    ^^^^^^^ definition local 53
 //                                                            display_name inState
-//                                                            documentation ```java\n@Nullable\nunresolved_type inState\n```
+//                                                            signature_documentation java @Nullable\nunresolved_type inState
     adapter.onRestoreInstanceState(inState);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onRestoreInstanceState().
@@ -1634,7 +1634,7 @@ public SpanSizeLookup getSpanSizeLookup() {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getSpanSizeLookup().
 //                                        display_name getSpanSizeLookup
-//                                        documentation ```java\n@NonNull\npublic unresolved_type getSpanSizeLookup()\n```
+//                                        signature_documentation java @NonNull\npublic unresolved_type getSpanSizeLookup()
 //                                        documentation  For use with a grid layout manager - use this to get the {@link SpanSizeLookup} for models in\n this controller. This will delegate span look up calls to each model's {@link\n EpoxyModel#getSpanSize(int, int, int)}. Make sure to also call {@link #setSpanCount(int)} so\n the span count is correct.\n
     return adapter.getSpanSizeLookup();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1651,11 +1651,11 @@ public SpanSizeLookup getSpanSizeLookup() {
   public void setSpanCount(int spanCount) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setSpanCount().
 //                         display_name setSpanCount
-//                         documentation ```java\npublic void setSpanCount(int spanCount)\n```
+//                         signature_documentation java public void setSpanCount(int spanCount)
 //                         documentation  If you are using a grid layout manager you must call this to set the span count of the grid.\n This span count will be passed on to the models so models can choose which span count to be.\n\n @see #getSpanSizeLookup()\n @see EpoxyModel#getSpanSize(int, int, int)\n
 //                             ^^^^^^^^^ definition local 54
 //                                       display_name spanCount
-//                                       documentation ```java\nint spanCount\n```
+//                                       signature_documentation java int spanCount
     adapter.setSpanCount(spanCount);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount().
@@ -1665,7 +1665,7 @@ public void setSpanCount(int spanCount) {
   public int getSpanCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getSpanCount().
 //                        display_name getSpanCount
-//                        documentation ```java\npublic int getSpanCount()\n```
+//                        signature_documentation java public int getSpanCount()
     return adapter.getSpanCount();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                 ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getSpanCount().
@@ -1674,7 +1674,7 @@ public int getSpanCount() {
   public boolean isMultiSpan() {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isMultiSpan().
 //                           display_name isMultiSpan
-//                           documentation ```java\npublic boolean isMultiSpan()\n```
+//                           signature_documentation java public boolean isMultiSpan()
     return adapter.isMultiSpan();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                 ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isMultiSpan().
@@ -1695,13 +1695,13 @@ public boolean isMultiSpan() {
   protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onExceptionSwallowed().
 //                                    display_name onExceptionSwallowed
-//                                    documentation ```java\nprotected void onExceptionSwallowed(RuntimeException exception)\n```
+//                                    signature_documentation java protected void onExceptionSwallowed(RuntimeException exception)
 //                                    documentation  This is called when recoverable exceptions occur at runtime. By default they are ignored and\n Epoxy will recover, but you can override this to be aware of when they happen.\n <p>\n A common use for this is being aware of duplicates when {@link #setFilterDuplicates(boolean)}\n is enabled.\n <p>\n By default the global exception handler provided by\n {@link #setGlobalExceptionHandler(ExceptionHandler)}\n is called with the exception. Overriding this allows you to provide your own handling for a\n controller.\n
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                              ^^^^^^^^^ definition local 55
 //                                                                        display_name exception
-//                                                                        documentation ```java\n@NonNull\nRuntimeException exception\n```
+//                                                                        signature_documentation java @NonNull\nRuntimeException exception
     globalExceptionHandler.onException(this, exception);
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
 //                         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
@@ -1716,7 +1716,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
 //                                ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
 //                                                       display_name globalExceptionHandler
-//                                                       documentation ```java\nprivate static ExceptionHandler globalExceptionHandler\n```
+//                                                       signature_documentation java private static ExceptionHandler globalExceptionHandler
 //                                                       documentation  Default handler for exceptions in all EpoxyControllers. Set with {@link\n #setGlobalExceptionHandler(ExceptionHandler)}\n
       new ExceptionHandler() {
 //        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
@@ -1726,19 +1726,19 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
         public void onException(@NonNull EpoxyController controller,
 //                  ^^^^^^^^^^^ definition local 57
 //                              display_name onException
-//                              documentation ```java\n@Override\npublic void onException(EpoxyController controller, RuntimeException exception)\n```
+//                              signature_documentation java @Override\npublic void onException(EpoxyController controller, RuntimeException exception)
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                       ^^^^^^^^^^ definition local 58
 //                                                                  display_name controller
-//                                                                  documentation ```java\n@NonNull\nEpoxyController controller\n```
+//                                                                  signature_documentation java @NonNull\nEpoxyController controller
             @NonNull RuntimeException exception) {
 //           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                    ^^^^^^^^^ definition local 59
 //                                              display_name exception
-//                                              documentation ```java\n@NonNull\nRuntimeException exception\n```
+//                                              signature_documentation java @NonNull\nRuntimeException exception
           // Ignore exceptions as the default
         }
       };
@@ -1760,14 +1760,14 @@ public void onException(@NonNull EpoxyController controller,
   public static void setGlobalExceptionHandler(
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalExceptionHandler().
 //                                             display_name setGlobalExceptionHandler
-//                                             documentation ```java\npublic static void setGlobalExceptionHandler(ExceptionHandler globalExceptionHandler)\n```
+//                                             signature_documentation java public static void setGlobalExceptionHandler(ExceptionHandler globalExceptionHandler)
 //                                             documentation  Set a callback to be notified when a recoverable exception occurs at runtime.  By default these\n are ignored and Epoxy will recover, but you can override this to be aware of when they happen.\n <p>\n For example, you could choose to rethrow the exception in development builds, or log them in\n production.\n <p>\n A common use for this is being aware of duplicates when {@link #setFilterDuplicates(boolean)}\n is enabled.\n <p>\n This callback will be used in all EpoxyController classes. If you would like specific handling\n in a certain controller you can override {@link #onExceptionSwallowed(RuntimeException)} in\n that controller.\n
       @NonNull ExceptionHandler globalExceptionHandler) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
 //                              ^^^^^^^^^^^^^^^^^^^^^^ definition local 60
 //                                                     display_name globalExceptionHandler
-//                                                     documentation ```java\n@NonNull\nExceptionHandler globalExceptionHandler\n```
+//                                                     signature_documentation java @NonNull\nExceptionHandler globalExceptionHandler
     EpoxyController.globalExceptionHandler = globalExceptionHandler;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
@@ -1777,7 +1777,7 @@ public static void setGlobalExceptionHandler(
   public interface ExceptionHandler {
 //                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
 //                                  display_name ExceptionHandler
-//                                  documentation ```java\npublic interface ExceptionHandler\n```
+//                                  signature_documentation java public interface ExceptionHandler
     /**
      * This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy
      * will recover, but you can override this to be aware of when they happen.
@@ -1790,28 +1790,28 @@ public interface ExceptionHandler {
     void onException(@NonNull EpoxyController controller, @NonNull RuntimeException exception);
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
 //                   display_name onException
-//                   documentation ```java\npublic abstract void onException(EpoxyController controller, RuntimeException exception)\n```
+//                   signature_documentation java public abstract void onException(EpoxyController controller, RuntimeException exception)
 //                   documentation  This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy\n will recover, but you can override this to be aware of when they happen.\n <p>\n For example, you could choose to rethrow the exception in development builds, or log them in\n production.\n\n @param controller The EpoxyController that the error occurred in.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                            ^^^^^^^^^^ definition local 61
 //                                                       display_name controller
-//                                                       documentation ```java\n@NonNull\nEpoxyController controller\n```
+//                                                       signature_documentation java @NonNull\nEpoxyController controller
 //                                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                                                  ^^^^^^^^^ definition local 62
 //                                                                                            display_name exception
-//                                                                                            documentation ```java\n@NonNull\nRuntimeException exception\n```
+//                                                                                            signature_documentation java @NonNull\nRuntimeException exception
   }
 
   void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerViewInternal().
 //                                      display_name onAttachedToRecyclerViewInternal
-//                                      documentation ```java\nvoid onAttachedToRecyclerViewInternal(unresolved_type recyclerView)\n```
+//                                      signature_documentation java void onAttachedToRecyclerViewInternal(unresolved_type recyclerView)
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                   ^^^^^^^^^^^^ definition local 63
 //                                                                display_name recyclerView
-//                                                                documentation ```java\nunresolved_type recyclerView\n```
+//                                                                signature_documentation java unresolved_type recyclerView
     recyclerViewAttachCount++;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
 
@@ -1828,7 +1828,7 @@ void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
         public void run() {
 //                  ^^^ definition local 65
 //                      display_name run
-//                      documentation ```java\n@Override\npublic void run()\n```
+//                      signature_documentation java @Override\npublic void run()
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
           // Only warn if there are still multiple adapters attached after a delay, to allow for
           // a grace period
@@ -1861,11 +1861,11 @@ public void run() {
   void onDetachedFromRecyclerViewInternal(RecyclerView recyclerView) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerViewInternal().
 //                                        display_name onDetachedFromRecyclerViewInternal
-//                                        documentation ```java\nvoid onDetachedFromRecyclerViewInternal(unresolved_type recyclerView)\n```
+//                                        signature_documentation java void onDetachedFromRecyclerViewInternal(unresolved_type recyclerView)
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                     ^^^^^^^^^^^^ definition local 66
 //                                                                  display_name recyclerView
-//                                                                  documentation ```java\nunresolved_type recyclerView\n```
+//                                                                  signature_documentation java unresolved_type recyclerView
     recyclerViewAttachCount--;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
     onDetachedFromRecyclerView(recyclerView);
@@ -1877,13 +1877,13 @@ void onDetachedFromRecyclerViewInternal(RecyclerView recyclerView) {
   protected void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerView().
 //                                        display_name onAttachedToRecyclerView
-//                                        documentation ```java\nprotected void onAttachedToRecyclerView(unresolved_type recyclerView)\n```
+//                                        signature_documentation java protected void onAttachedToRecyclerView(unresolved_type recyclerView)
 //                                        documentation Called when the controller's adapter is attach to a recyclerview. 
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                              ^^^^^^^^^^^^ definition local 67
 //                                                                           display_name recyclerView
-//                                                                           documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
+//                                                                           signature_documentation java @NonNull\nunresolved_type recyclerView
 
   }
 
@@ -1891,13 +1891,13 @@ protected void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
   protected void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerView().
 //                                          display_name onDetachedFromRecyclerView
-//                                          documentation ```java\nprotected void onDetachedFromRecyclerView(unresolved_type recyclerView)\n```
+//                                          signature_documentation java protected void onDetachedFromRecyclerView(unresolved_type recyclerView)
 //                                          documentation Called when the controller's adapter is detached from a recyclerview. 
 //                                           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                ^^^^^^^^^^^^ definition local 68
 //                                                                             display_name recyclerView
-//                                                                             documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
+//                                                                             signature_documentation java @NonNull\nunresolved_type recyclerView
 
   }
 
@@ -1937,28 +1937,28 @@ protected void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
   protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel<?> boundModel,
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
 //                            display_name onModelBound
-//                            documentation ```java\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> boundModel, int position, EpoxyModel<?> previouslyBoundModel)\n```
+//                            signature_documentation java protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> boundModel, int position, EpoxyModel<?> previouslyBoundModel)
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound. Alternatively you may attach a listener directly to\n a generated model with model.onBind(...)\n\n @param previouslyBoundModel If non null, this is a model with the same id as the newly bound\n                             model, and was previously bound to a view. This means that {@link\n                             #buildModels()} returned a model that is different from the\n                             previouslyBoundModel and the view is being rebound to incorporate\n                             the change. You can compare this previous model with the new one to\n                             see exactly what changed.\n                             <p>\n                             The newly bound model and the previously bound model are guaranteed\n                             to have the same id, but will not necessarily be of the same type\n                             depending on your implementation of {@link #buildModels()}. With\n                             common usage patterns of Epoxy they should be the same type, and\n                             will only differ if you are using different model classes with the\n                             same id.\n                             <p>\n                             Comparing the newly bound model with the previous model allows you\n                             to be more intelligent when updating your view. This may help you\n                             optimize, or make it easier to work with animations.\n                             <p>\n                             If the new model and the previous model have the same view type\n                             (given by {@link EpoxyModel#getViewType()}), and if you are using\n                             the default ReyclerView item animator, the same view will be kept.\n                             If you are using a custom item animator then the view will be the\n                             same if the animator returns true in canReuseUpdatedViewHolder.\n                             <p>\n                             This previously bound model is taken as a payload from the diffing\n                             process, and follows the same general conditions for all\n                             recyclerview change payloads.\n
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 69
 //                                                            display_name holder
-//                                                            documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
+//                                                            signature_documentation java @NonNull\nEpoxyViewHolder holder
 //                                                              ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^^^^^^ definition local 70
 //                                                                                               display_name boundModel
-//                                                                                               documentation ```java\n@NonNull\nEpoxyModel<?> boundModel\n```
+//                                                                                               signature_documentation java @NonNull\nEpoxyModel<?> boundModel
       int position,
 //        ^^^^^^^^ definition local 71
 //                 display_name position
-//                 documentation ```java\nint position\n```
+//                 signature_documentation java int position
       @Nullable EpoxyModel<?> previouslyBoundModel) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 72
 //                                                 display_name previouslyBoundModel
-//                                                 documentation ```java\n@Nullable\nEpoxyModel<?> previouslyBoundModel\n```
+//                                                 signature_documentation java @Nullable\nEpoxyModel<?> previouslyBoundModel
   }
 
   /**
@@ -1969,18 +1969,18 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel
   protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelUnbound().
 //                              display_name onModelUnbound
-//                              documentation ```java\nprotected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
+//                              signature_documentation java protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)
 //                              documentation  Called immediately after a model is unbound from a view holder. Subclasses can override this if\n they want alerts on when a model is unbound. Alternatively you may attach a listener directly\n to a generated model with model.onUnbind(...)\n
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                       ^^^^^^ definition local 73
 //                                                              display_name holder
-//                                                              documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
+//                                                              signature_documentation java @NonNull\nEpoxyViewHolder holder
 //                                                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                      ^^^^^ definition local 74
 //                                                                                            display_name model
-//                                                                                            documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
+//                                                                                            signature_documentation java @NonNull\nEpoxyModel<?> model
 
   }
 
@@ -1993,19 +1993,19 @@ protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyMod
   protected void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder,
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewAttachedToWindow().
 //                                      display_name onViewAttachedToWindow
-//                                      documentation ```java\nprotected void onViewAttachedToWindow(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
+//                                      signature_documentation java protected void onViewAttachedToWindow(EpoxyViewHolder holder, EpoxyModel<?> model)
 //                                      documentation  Called when the given viewholder is attached to the window, along with the model it is bound\n to.\n\n @see BaseEpoxyAdapter#onViewAttachedToWindow(EpoxyViewHolder)\n
 //                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                               ^^^^^^ definition local 75
 //                                                                      display_name holder
-//                                                                      documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
+//                                                                      signature_documentation java @NonNull\nEpoxyViewHolder holder
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 76
 //                                 display_name model
-//                                 documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
+//                                 signature_documentation java @NonNull\nEpoxyModel<?> model
 
   }
 
@@ -2018,19 +2018,19 @@ protected void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder,
   protected void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder,
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewDetachedFromWindow().
 //                                        display_name onViewDetachedFromWindow
-//                                        documentation ```java\nprotected void onViewDetachedFromWindow(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
+//                                        signature_documentation java protected void onViewDetachedFromWindow(EpoxyViewHolder holder, EpoxyModel<?> model)
 //                                        documentation  Called when the given viewholder is detechaed from the window, along with the model it is bound\n to.\n\n @see BaseEpoxyAdapter#onViewDetachedFromWindow(EpoxyViewHolder)\n
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                 ^^^^^^ definition local 77
 //                                                                        display_name holder
-//                                                                        documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
+//                                                                        signature_documentation java @NonNull\nEpoxyViewHolder holder
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 78
 //                                 display_name model
-//                                 documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
+//                                 signature_documentation java @NonNull\nEpoxyModel<?> model
 
   }
 
@@ -2048,13 +2048,13 @@ protected void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder,
   public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setupStickyHeaderView().
 //                                  display_name setupStickyHeaderView
-//                                  documentation ```java\n@Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)\n```
+//                                  signature_documentation java @Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)
 //                                  documentation  Optional callback to setup the sticky view,\n by default it doesn't do anything.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^^ definition local 79
 //                                                             display_name stickyHeader
-//                                                             documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
+//                                                             signature_documentation java @NotNull\nunresolved_type stickyHeader
     // no-op
   }
 
@@ -2070,13 +2070,13 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
   public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView().
 //                                     display_name teardownStickyHeaderView
-//                                     documentation ```java\n@Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)\n```
+//                                     signature_documentation java @Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)
 //                                     documentation  Optional callback to perform tear down operation on the\n sticky view, by default it doesn't do anything.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^^^^^ definition local 80
 //                                                                display_name stickyHeader
-//                                                                documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
+//                                                                signature_documentation java @NotNull\nunresolved_type stickyHeader
     // no-op
   }
 
@@ -2092,11 +2092,11 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
   public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isStickyHeader().
 //                              display_name isStickyHeader
-//                              documentation ```java\n@Override\npublic boolean isStickyHeader(int position)\n```
+//                              signature_documentation java @Override\npublic boolean isStickyHeader(int position)
 //                              documentation  Called to check if the item at the position is a sticky item,\n by default returns false.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                  ^^^^^^^^ definition local 81
 //                                           display_name position
-//                                           documentation ```java\nint position\n```
+//                                           signature_documentation java int position
     return false;
   }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
index 9a91334bc..c822f2dc9 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
@@ -58,7 +58,7 @@
 public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements ResultCallback {
 //                 ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#
 //                                        display_name EpoxyControllerAdapter
-//                                        documentation ```java\npublic final class EpoxyControllerAdapter\n```
+//                                        signature_documentation java public final class EpoxyControllerAdapter
 //                                        relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                        relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                        relationship is_implementation semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
@@ -69,43 +69,43 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
 //              ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#
 //                            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyBlocker.
 //                                          display_name notifyBlocker
-//                                          documentation ```java\nprivate final NotifyBlocker notifyBlocker\n```
+//                                          signature_documentation java private final NotifyBlocker notifyBlocker
 //                                                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#`<init>`().
   private final AsyncEpoxyDiffer differ;
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                      display_name differ
-//                                      documentation ```java\nprivate final AsyncEpoxyDiffer differ\n```
+//                                      signature_documentation java private final AsyncEpoxyDiffer differ
   private final EpoxyController epoxyController;
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                                              display_name epoxyController
-//                                              documentation ```java\nprivate final EpoxyController epoxyController\n```
+//                                              signature_documentation java private final EpoxyController epoxyController
   private int itemCount;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#itemCount.
 //                      display_name itemCount
-//                      documentation ```java\nprivate int itemCount\n```
+//                      signature_documentation java private int itemCount
   private final List<OnModelBuildFinishedListener> modelBuildListeners = new ArrayList<>();
 //              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                 ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                                                                     display_name modelBuildListeners
-//                                                                     documentation ```java\nprivate final List<OnModelBuildFinishedListener> modelBuildListeners\n```
+//                                                                     signature_documentation java private final List<OnModelBuildFinishedListener> modelBuildListeners
 //                                                                           ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
 
   EpoxyControllerAdapter(@NonNull EpoxyController epoxyController, Handler diffingHandler) {
 //^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\nEpoxyControllerAdapter(EpoxyController epoxyController, unresolved_type diffingHandler)\n```
+//                       signature_documentation java EpoxyControllerAdapter(EpoxyController epoxyController, unresolved_type diffingHandler)
 //                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                ^^^^^^^^^^^^^^^ definition local 0
 //                                                                display_name epoxyController
-//                                                                documentation ```java\n@NonNull\nEpoxyController epoxyController\n```
+//                                                                signature_documentation java @NonNull\nEpoxyController epoxyController
 //                                                                 ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                         ^^^^^^^^^^^^^^ definition local 1
 //                                                                                        display_name diffingHandler
-//                                                                                        documentation ```java\nunresolved_type diffingHandler\n```
+//                                                                                        signature_documentation java unresolved_type diffingHandler
     this.epoxyController = epoxyController;
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                         ^^^^^^^^^^^^^^^ reference local 0
@@ -128,13 +128,13 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
   protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed().
 //                                    display_name onExceptionSwallowed
-//                                    documentation ```java\n@Override\nprotected void onExceptionSwallowed(RuntimeException exception)\n```
+//                                    signature_documentation java @Override\nprotected void onExceptionSwallowed(RuntimeException exception)
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onExceptionSwallowed().
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                              ^^^^^^^^^ definition local 2
 //                                                                        display_name exception
-//                                                                        documentation ```java\n@NonNull\nRuntimeException exception\n```
+//                                                                        signature_documentation java @NonNull\nRuntimeException exception
     epoxyController.onExceptionSwallowed(exception);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#onExceptionSwallowed().
@@ -150,7 +150,7 @@ List<? extends EpoxyModel<?>> getCurrentModels() {
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                               display_name getCurrentModels
-//                                               documentation ```java\n@NonNull\n@Override\nList<? extends EpoxyModel<?>> getCurrentModels()\n```
+//                                               signature_documentation java @NonNull\n@Override\nList<? extends EpoxyModel<?>> getCurrentModels()
 //                                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
     return differ.getCurrentList();
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
@@ -162,7 +162,7 @@ List<? extends EpoxyModel<?>> getCurrentModels() {
   public int getItemCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
 //                        display_name getItemCount
-//                        documentation ```java\n@Override\npublic int getItemCount()\n```
+//                        signature_documentation java @Override\npublic int getItemCount()
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemCount().
     // RecyclerView calls this A LOT. The base class implementation does
     // getCurrentModels().size() which adds some overhead because of the method calls.
@@ -175,13 +175,13 @@ public int getItemCount() {
   void setModels(@NonNull ControllerModelList models) {
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
 //               display_name setModels
-//               documentation ```java\nvoid setModels(ControllerModelList models)\n```
+//               signature_documentation java void setModels(ControllerModelList models)
 //               documentation This is set from whatever thread model building happened on, so must be thread safe. 
 //                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
 //                                            ^^^^^^ definition local 3
 //                                                   display_name models
-//                                                   documentation ```java\n@NonNull\nControllerModelList models\n```
+//                                                   signature_documentation java @NonNull\nControllerModelList models
     // If debug model validations are on then we should help detect the error case where models
     // were incorrectly mutated once they were added. That check is also done before and after
     // bind, but there is no other check after that to see if a model is incorrectly
@@ -196,7 +196,7 @@ void setModels(@NonNull ControllerModelList models) {
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^^^^^^^^^^^^^ definition local 4
 //                                              display_name currentModels
-//                                              documentation ```java\nList<? extends EpoxyModel<?>> currentModels\n```
+//                                              signature_documentation java List<? extends EpoxyModel<?>> currentModels
 //                                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
     if (!currentModels.isEmpty() && currentModels.get(0).isDebugValidationEnabled()) {
 //       ^^^^^^^^^^^^^ reference local 4
@@ -207,7 +207,7 @@ void setModels(@NonNull ControllerModelList models) {
       for (int i = 0; i < currentModels.size(); i++) {
 //             ^ definition local 5
 //               display_name i
-//               documentation ```java\nint i\n```
+//               signature_documentation java int i
 //                    ^ reference local 5
 //                        ^^^^^^^^^^^^^ reference local 4
 //                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -216,7 +216,7 @@ void setModels(@NonNull ControllerModelList models) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^ definition local 6
 //                          display_name model
-//                          documentation ```java\nEpoxyModel<?> model\n```
+//                          signature_documentation java EpoxyModel<?> model
 //                            ^^^^^^^^^^^^^ reference local 4
 //                                          ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                              ^ reference local 5
@@ -242,7 +242,7 @@ void setModels(@NonNull ControllerModelList models) {
   public boolean isDiffInProgress() {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isDiffInProgress().
 //                                display_name isDiffInProgress
-//                                documentation ```java\npublic boolean isDiffInProgress()\n```
+//                                signature_documentation java public boolean isDiffInProgress()
 //                                documentation  @return True if a diff operation is in progress.\n
     return differ.isDiffInProgress();
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
@@ -255,13 +255,13 @@ public boolean isDiffInProgress() {
   public void onResult(@NonNull DiffResult result) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
 //                     display_name onResult
-//                     documentation ```java\n@Override\npublic void onResult(DiffResult result)\n```
+//                     signature_documentation java @Override\npublic void onResult(DiffResult result)
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult().
 //                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                                         ^^^^^^ definition local 7
 //                                                display_name result
-//                                                documentation ```java\n@NonNull\nDiffResult result\n```
+//                                                signature_documentation java @NonNull\nDiffResult result
     itemCount = result.newModels.size();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#itemCount.
 //              ^^^^^^ reference local 7
@@ -280,7 +280,7 @@ public void onResult(@NonNull DiffResult result) {
     for (int i = modelBuildListeners.size() - 1; i >= 0; i--) {
 //           ^ definition local 8
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                                   ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 //                                               ^ reference local 8
@@ -297,11 +297,11 @@ public void onResult(@NonNull DiffResult result) {
   public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#addModelBuildListener().
 //                                  display_name addModelBuildListener
-//                                  documentation ```java\npublic void addModelBuildListener(OnModelBuildFinishedListener listener)\n```
+//                                  signature_documentation java public void addModelBuildListener(OnModelBuildFinishedListener listener)
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                               ^^^^^^^^ definition local 9
 //                                                                        display_name listener
-//                                                                        documentation ```java\nOnModelBuildFinishedListener listener\n```
+//                                                                        signature_documentation java OnModelBuildFinishedListener listener
     modelBuildListeners.add(listener);
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                      ^^^ reference semanticdb maven jdk 11 java/util/List#add().
@@ -311,11 +311,11 @@ public void addModelBuildListener(OnModelBuildFinishedListener listener) {
   public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#removeModelBuildListener().
 //                                     display_name removeModelBuildListener
-//                                     documentation ```java\npublic void removeModelBuildListener(OnModelBuildFinishedListener listener)\n```
+//                                     signature_documentation java public void removeModelBuildListener(OnModelBuildFinishedListener listener)
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                                  ^^^^^^^^ definition local 10
 //                                                                           display_name listener
-//                                                                           documentation ```java\nOnModelBuildFinishedListener listener\n```
+//                                                                           signature_documentation java OnModelBuildFinishedListener listener
     modelBuildListeners.remove(listener);
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/List#remove().
@@ -327,7 +327,7 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
   boolean diffPayloadsEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#diffPayloadsEnabled().
 //                            display_name diffPayloadsEnabled
-//                            documentation ```java\n@Override\nboolean diffPayloadsEnabled()\n```
+//                            signature_documentation java @Override\nboolean diffPayloadsEnabled()
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
     return true;
   }
@@ -337,12 +337,12 @@ boolean diffPayloadsEnabled() {
   public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onAttachedToRecyclerView().
 //                                     display_name onAttachedToRecyclerView
-//                                     documentation ```java\n@Override\npublic void onAttachedToRecyclerView(unresolved_type recyclerView)\n```
+//                                     signature_documentation java @Override\npublic void onAttachedToRecyclerView(unresolved_type recyclerView)
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                           ^^^^^^^^^^^^ definition local 11
 //                                                                        display_name recyclerView
-//                                                                        documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
+//                                                                        signature_documentation java @NonNull\nunresolved_type recyclerView
     super.onAttachedToRecyclerView(recyclerView);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onAttachedToRecyclerView#
@@ -358,13 +358,13 @@ public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
   public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView().
 //                                       display_name onDetachedFromRecyclerView
-//                                       documentation ```java\n@Override\npublic void onDetachedFromRecyclerView(unresolved_type recyclerView)\n```
+//                                       signature_documentation java @Override\npublic void onDetachedFromRecyclerView(unresolved_type recyclerView)
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
 //                                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                             ^^^^^^^^^^^^ definition local 12
 //                                                                          display_name recyclerView
-//                                                                          documentation ```java\n@NonNull\nunresolved_type recyclerView\n```
+//                                                                          signature_documentation java @NonNull\nunresolved_type recyclerView
     super.onDetachedFromRecyclerView(recyclerView);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
@@ -380,13 +380,13 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
   public void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
-//                                   documentation ```java\n@Override\npublic void onViewAttachedToWindow(EpoxyViewHolder holder)\n```
+//                                   signature_documentation java @Override\npublic void onViewAttachedToWindow(EpoxyViewHolder holder)
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
 //                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                            ^^^^^^ definition local 13
 //                                                                   display_name holder
-//                                                                   documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
+//                                                                   signature_documentation java @NonNull\nEpoxyViewHolder holder
     super.onViewAttachedToWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
@@ -404,13 +404,13 @@ public void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder) {
   public void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
-//                                     documentation ```java\n@Override\npublic void onViewDetachedFromWindow(EpoxyViewHolder holder)\n```
+//                                     signature_documentation java @Override\npublic void onViewDetachedFromWindow(EpoxyViewHolder holder)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                              ^^^^^^ definition local 14
 //                                                                     display_name holder
-//                                                                     documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
+//                                                                     signature_documentation java @NonNull\nEpoxyViewHolder holder
     super.onViewDetachedFromWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
@@ -428,27 +428,27 @@ public void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder) {
   protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel<?> model,
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
 //                            display_name onModelBound
-//                            documentation ```java\n@Override\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, EpoxyModel<?> previouslyBoundModel)\n```
+//                            signature_documentation java @Override\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, EpoxyModel<?> previouslyBoundModel)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 15
 //                                                            display_name holder
-//                                                            documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
+//                                                            signature_documentation java @NonNull\nEpoxyViewHolder holder
 //                                                              ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^ definition local 16
 //                                                                                          display_name model
-//                                                                                          documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
+//                                                                                          signature_documentation java @NonNull\nEpoxyModel<?> model
       int position, @Nullable EpoxyModel<?> previouslyBoundModel) {
 //        ^^^^^^^^ definition local 17
 //                 display_name position
-//                 documentation ```java\nint position\n```
+//                 signature_documentation java int position
 //                   ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 18
 //                                                               display_name previouslyBoundModel
-//                                                               documentation ```java\n@Nullable\nEpoxyModel<?> previouslyBoundModel\n```
+//                                                               signature_documentation java @Nullable\nEpoxyModel<?> previouslyBoundModel
     epoxyController.onModelBound(holder, model, position, previouslyBoundModel);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
@@ -463,18 +463,18 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel
   protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound().
 //                              display_name onModelUnbound
-//                              documentation ```java\n@Override\nprotected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)\n```
+//                              signature_documentation java @Override\nprotected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelUnbound().
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                       ^^^^^^ definition local 19
 //                                                              display_name holder
-//                                                              documentation ```java\n@NonNull\nEpoxyViewHolder holder\n```
+//                                                              signature_documentation java @NonNull\nEpoxyViewHolder holder
 //                                                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                      ^^^^^ definition local 20
 //                                                                                            display_name model
-//                                                                                            documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
+//                                                                                            signature_documentation java @NonNull\nEpoxyModel<?> model
     epoxyController.onModelUnbound(holder, model);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelUnbound().
@@ -490,7 +490,7 @@ public List<EpoxyModel<?>> getCopyOfModels() {
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCopyOfModels().
 //                                           display_name getCopyOfModels
-//                                           documentation ```java\n@NonNull\npublic List<EpoxyModel<?>> getCopyOfModels()\n```
+//                                           signature_documentation java @NonNull\npublic List<EpoxyModel<?>> getCopyOfModels()
 //                                           documentation Get an unmodifiable copy of the current models set on the adapter. 
     //noinspection unchecked
     return (List<EpoxyModel<?>>) getCurrentModels();
@@ -509,11 +509,11 @@ public EpoxyModel<?> getModelAtPosition(int position) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelAtPosition().
 //                                        display_name getModelAtPosition
-//                                        documentation ```java\n@NonNull\npublic EpoxyModel<?> getModelAtPosition(int position)\n```
+//                                        signature_documentation java @NonNull\npublic EpoxyModel<?> getModelAtPosition(int position)
 //                                        documentation  @throws IndexOutOfBoundsException If the given position is out of range of the current model\n                                   list.\n
 //                                            ^^^^^^^^ definition local 21
 //                                                     display_name position
-//                                                     documentation ```java\nint position\n```
+//                                                     signature_documentation java int position
     return getCurrentModels().get(position);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                            ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -530,16 +530,16 @@ public EpoxyModel<?> getModelById(long id) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelById().
 //                                  display_name getModelById
-//                                  documentation ```java\n@Nullable\npublic EpoxyModel<?> getModelById(long id)\n```
+//                                  signature_documentation java @Nullable\npublic EpoxyModel<?> getModelById(long id)
 //                                  documentation  Searches the current model list for the model with the given id. Returns the matching model if\n one is found, otherwise null is returned.\n
 //                                       ^^ definition local 22
 //                                          display_name id
-//                                          documentation ```java\nlong id\n```
+//                                          signature_documentation java long id
     for (EpoxyModel<?> model : getCurrentModels()) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 23
 //                           display_name model
-//                           documentation ```java\nEpoxyModel<?> model\n```
+//                           signature_documentation java EpoxyModel<?> model
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
       if (model.id() == id) {
 //        ^^^^^ reference local 23
@@ -558,23 +558,23 @@ public EpoxyModel<?> getModelById(long id) {
   public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
 //                            display_name getModelPosition
-//                            documentation ```java\n@Override\npublic int getModelPosition(EpoxyModel<?> targetModel)\n```
+//                            signature_documentation java @Override\npublic int getModelPosition(EpoxyModel<?> targetModel)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                   ^^^^^^^^^^^ definition local 24
 //                                                               display_name targetModel
-//                                                               documentation ```java\n@NonNull\nEpoxyModel<?> targetModel\n```
+//                                                               signature_documentation java @NonNull\nEpoxyModel<?> targetModel
     int size = getCurrentModels().size();
 //      ^^^^ definition local 25
 //           display_name size
-//           documentation ```java\nint size\n```
+//           signature_documentation java int size
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 26
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 26
 //                      ^^^^ reference local 25
 //                            ^ reference local 26
@@ -582,7 +582,7 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^ definition local 27
 //                        display_name model
-//                        documentation ```java\nEpoxyModel<?> model\n```
+//                        signature_documentation java EpoxyModel<?> model
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                             ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                                 ^ reference local 26
@@ -607,7 +607,7 @@ public BoundViewHolders getBoundViewHolders() {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getBoundViewHolders().
 //                                            display_name getBoundViewHolders
-//                                            documentation ```java\n@NonNull\n@Override\npublic BoundViewHolders getBoundViewHolders()\n```
+//                                            signature_documentation java @NonNull\n@Override\npublic BoundViewHolders getBoundViewHolders()
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
     return super.getBoundViewHolders();
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
@@ -619,19 +619,19 @@ public BoundViewHolders getBoundViewHolders() {
   void moveModel(int fromPosition, int toPosition) {
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
 //               display_name moveModel
-//               documentation ```java\n@UiThread\nvoid moveModel(int fromPosition, int toPosition)\n```
+//               signature_documentation java @UiThread\nvoid moveModel(int fromPosition, int toPosition)
 //                   ^^^^^^^^^^^^ definition local 28
 //                                display_name fromPosition
-//                                documentation ```java\nint fromPosition\n```
+//                                signature_documentation java int fromPosition
 //                                     ^^^^^^^^^^ definition local 29
 //                                                display_name toPosition
-//                                                documentation ```java\nint toPosition\n```
+//                                                signature_documentation java int toPosition
     ArrayList<EpoxyModel<?>> updatedList = new ArrayList<>(getCurrentModels());
 //  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^ definition local 30
 //                                       display_name updatedList
-//                                       documentation ```java\nArrayList<EpoxyModel<?>> updatedList\n```
+//                                       signature_documentation java ArrayList<EpoxyModel<?>> updatedList
 //                                             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+2).
 //                                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 
@@ -656,7 +656,7 @@ void moveModel(int fromPosition, int toPosition) {
     boolean interruptedDiff = differ.forceListOverride(updatedList);
 //          ^^^^^^^^^^^^^^^ definition local 31
 //                          display_name interruptedDiff
-//                          documentation ```java\nboolean interruptedDiff\n```
+//                          signature_documentation java boolean interruptedDiff
 //                            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                                     ^^^^^^^^^^^ reference local 30
@@ -676,16 +676,16 @@ void moveModel(int fromPosition, int toPosition) {
   void notifyModelChanged(int position) {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged().
 //                        display_name notifyModelChanged
-//                        documentation ```java\n@UiThread\nvoid notifyModelChanged(int position)\n```
+//                        signature_documentation java @UiThread\nvoid notifyModelChanged(int position)
 //                            ^^^^^^^^ definition local 32
 //                                     display_name position
-//                                     documentation ```java\nint position\n```
+//                                     signature_documentation java int position
     ArrayList<EpoxyModel<?>> updatedList = new ArrayList<>(getCurrentModels());
 //  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^ definition local 33
 //                                       display_name updatedList
-//                                       documentation ```java\nArrayList<EpoxyModel<?>> updatedList\n```
+//                                       signature_documentation java ArrayList<EpoxyModel<?>> updatedList
 //                                             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+2).
 //                                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 
@@ -702,7 +702,7 @@ void notifyModelChanged(int position) {
     boolean interruptedDiff = differ.forceListOverride(updatedList);
 //          ^^^^^^^^^^^^^^^ definition local 34
 //                          display_name interruptedDiff
-//                          documentation ```java\nboolean interruptedDiff\n```
+//                          signature_documentation java boolean interruptedDiff
 //                            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                                     ^^^^^^^^^^^ reference local 33
@@ -722,7 +722,7 @@ void notifyModelChanged(int position) {
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#ITEM_CALLBACK.
 //                                                               display_name ITEM_CALLBACK
-//                                                               documentation ```java\nprivate static final unresolved_type ITEM_CALLBACK\n```
+//                                                               signature_documentation java private static final unresolved_type ITEM_CALLBACK
       new ItemCallback<EpoxyModel<?>>() {
 //        ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -751,12 +751,12 @@ public Object getChangePayload(EpoxyModel<?> oldItem, EpoxyModel<?> newItem) {
   public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader().
 //                              display_name isStickyHeader
-//                              documentation ```java\n@Override\npublic boolean isStickyHeader(int position)\n```
+//                              signature_documentation java @Override\npublic boolean isStickyHeader(int position)
 //                              documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader().
 //                                  ^^^^^^^^ definition local 35
 //                                           display_name position
-//                                           documentation ```java\nint position\n```
+//                                           signature_documentation java int position
     return epoxyController.isStickyHeader(position);
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                         ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isStickyHeader().
@@ -772,14 +772,14 @@ public boolean isStickyHeader(int position) {
   public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView().
 //                                  display_name setupStickyHeaderView
-//                                  documentation ```java\n@Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)\n```
+//                                  signature_documentation java @Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)
 //                                  documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView().
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^^ definition local 36
 //                                                             display_name stickyHeader
-//                                                             documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
+//                                                             signature_documentation java @NotNull\nunresolved_type stickyHeader
     epoxyController.setupStickyHeaderView(stickyHeader);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#setupStickyHeaderView().
@@ -795,14 +795,14 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
   public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView().
 //                                     display_name teardownStickyHeaderView
-//                                     documentation ```java\n@Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)\n```
+//                                     signature_documentation java @Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)
 //                                     documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView().
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^^^^^ definition local 37
 //                                                                display_name stickyHeader
-//                                                                documentation ```java\n@NotNull\nunresolved_type stickyHeader\n```
+//                                                                signature_documentation java @NotNull\nunresolved_type stickyHeader
     epoxyController.teardownStickyHeaderView(stickyHeader);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
index c79a89fda..c906df1dd 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
@@ -30,7 +30,7 @@
 public class EpoxyDiffLogger extends AdapterDataObserver {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#
 //                           display_name EpoxyDiffLogger
-//                           documentation ```java\npublic class EpoxyDiffLogger\n```
+//                           signature_documentation java public class EpoxyDiffLogger
 //                           documentation  This data observer can be registered with an Epoxy adapter or controller to log all item change\n events. This may be useful to use in debug builds in order to observe model updates and monitor\n for issues.\n <p>\n You may want to look for unexpected item updates to catch improper hashCode/equals\n implementations in your models.\n <p>\n Additionally, you may want to look for frequent or unnecessary updates as an opportunity for\n optimization.\n
 //                           relationship is_implementation semanticdb maven . . AdapterDataObserver#
 //                                   ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . AdapterDataObserver#
@@ -38,16 +38,16 @@ public class EpoxyDiffLogger extends AdapterDataObserver {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#tag.
 //                         display_name tag
-//                         documentation ```java\nprivate final String tag\n```
+//                         signature_documentation java private final String tag
 
   public EpoxyDiffLogger(String tag) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\npublic EpoxyDiffLogger(String tag)\n```
+//                       signature_documentation java public EpoxyDiffLogger(String tag)
 //                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                              ^^^ definition local 0
 //                                  display_name tag
-//                                  documentation ```java\nString tag\n```
+//                                  signature_documentation java String tag
     this.tag = tag;
 //       ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#tag.
 //             ^^^ reference local 0
@@ -58,13 +58,13 @@ public EpoxyDiffLogger(String tag) {
   public void onItemRangeChanged(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged().
 //                               display_name onItemRangeChanged
-//                               documentation ```java\n@Override\npublic void onItemRangeChanged(int positionStart, int itemCount)\n```
+//                               signature_documentation java @Override\npublic void onItemRangeChanged(int positionStart, int itemCount)
 //                                   ^^^^^^^^^^^^^ definition local 1
 //                                                 display_name positionStart
-//                                                 documentation ```java\nint positionStart\n```
+//                                                 signature_documentation java int positionStart
 //                                                      ^^^^^^^^^ definition local 2
 //                                                                display_name itemCount
-//                                                                documentation ```java\nint itemCount\n```
+//                                                                signature_documentation java int itemCount
     Log.d(tag, "Item range changed. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
 //      ^ reference semanticdb maven . . Log#d#
@@ -78,18 +78,18 @@ public void onItemRangeChanged(int positionStart, int itemCount) {
   public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Object payload) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(+1).
 //                               display_name onItemRangeChanged
-//                               documentation ```java\n@Override\npublic void onItemRangeChanged(int positionStart, int itemCount, Object payload)\n```
+//                               signature_documentation java @Override\npublic void onItemRangeChanged(int positionStart, int itemCount, Object payload)
 //                                   ^^^^^^^^^^^^^ definition local 3
 //                                                 display_name positionStart
-//                                                 documentation ```java\nint positionStart\n```
+//                                                 signature_documentation java int positionStart
 //                                                      ^^^^^^^^^ definition local 4
 //                                                                display_name itemCount
-//                                                                documentation ```java\nint itemCount\n```
+//                                                                signature_documentation java int itemCount
 //                                                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                  ^^^^^^^ definition local 5
 //                                                                                          display_name payload
-//                                                                                          documentation ```java\n@Nullable\nObject payload\n```
+//                                                                                          signature_documentation java @Nullable\nObject payload
     if (payload == null) {
 //      ^^^^^^^ reference local 5
       onItemRangeChanged(positionStart, itemCount);
@@ -112,13 +112,13 @@ public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Objec
   public void onItemRangeInserted(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeInserted().
 //                                display_name onItemRangeInserted
-//                                documentation ```java\n@Override\npublic void onItemRangeInserted(int positionStart, int itemCount)\n```
+//                                signature_documentation java @Override\npublic void onItemRangeInserted(int positionStart, int itemCount)
 //                                    ^^^^^^^^^^^^^ definition local 6
 //                                                  display_name positionStart
-//                                                  documentation ```java\nint positionStart\n```
+//                                                  signature_documentation java int positionStart
 //                                                       ^^^^^^^^^ definition local 7
 //                                                                 display_name itemCount
-//                                                                 documentation ```java\nint itemCount\n```
+//                                                                 signature_documentation java int itemCount
     Log.d(tag, "Item range inserted. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
 //      ^ reference semanticdb maven . . Log#d#
@@ -132,13 +132,13 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
   public void onItemRangeRemoved(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeRemoved().
 //                               display_name onItemRangeRemoved
-//                               documentation ```java\n@Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)\n```
+//                               signature_documentation java @Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)
 //                                   ^^^^^^^^^^^^^ definition local 8
 //                                                 display_name positionStart
-//                                                 documentation ```java\nint positionStart\n```
+//                                                 signature_documentation java int positionStart
 //                                                      ^^^^^^^^^ definition local 9
 //                                                                display_name itemCount
-//                                                                documentation ```java\nint itemCount\n```
+//                                                                signature_documentation java int itemCount
     Log.d(tag, "Item range removed. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
 //      ^ reference semanticdb maven . . Log#d#
@@ -152,16 +152,16 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
   public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeMoved().
 //                             display_name onItemRangeMoved
-//                             documentation ```java\n@Override\npublic void onItemRangeMoved(int fromPosition, int toPosition, int itemCount)\n```
+//                             signature_documentation java @Override\npublic void onItemRangeMoved(int fromPosition, int toPosition, int itemCount)
 //                                 ^^^^^^^^^^^^ definition local 10
 //                                              display_name fromPosition
-//                                              documentation ```java\nint fromPosition\n```
+//                                              signature_documentation java int fromPosition
 //                                                   ^^^^^^^^^^ definition local 11
 //                                                              display_name toPosition
-//                                                              documentation ```java\nint toPosition\n```
+//                                                              signature_documentation java int toPosition
 //                                                                   ^^^^^^^^^ definition local 12
 //                                                                             display_name itemCount
-//                                                                             documentation ```java\nint itemCount\n```
+//                                                                             signature_documentation java int itemCount
     Log.d(tag, "Item moved. From: " + fromPosition + " To: " + toPosition);
 //  ^^^ reference semanticdb maven . . Log#
 //      ^ reference semanticdb maven . . Log#d#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
index 028c6f472..e7ee890d3 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
@@ -11,12 +11,12 @@
 public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchCallback<T> {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
 //                                 display_name EpoxyDragCallback
-//                                 documentation ```java\npublic interface EpoxyDragCallback<T extends EpoxyModel>\n```
+//                                 signature_documentation java public interface EpoxyDragCallback<T extends EpoxyModel>
 //                                 documentation  For use with {@link EpoxyModelTouchCallback}\n
 //                                 relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                 ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                                   display_name T
-//                                   documentation ```java\nT extends EpoxyModel\n```
+//                                   signature_documentation java T extends EpoxyModel
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
@@ -35,21 +35,21 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
   void onDragStarted(T model, View itemView, int adapterPosition);
 //     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                   display_name onDragStarted
-//                   documentation ```java\npublic abstract void onDragStarted(T model, unresolved_type itemView, int adapterPosition)\n```
+//                   signature_documentation java public abstract void onDragStarted(T model, unresolved_type itemView, int adapterPosition)
 //                   documentation  Called when the view switches from an idle state to a dragged state, as the user begins a drag\n interaction with it. You can use this callback to modify the view to indicate it is being\n dragged.\n <p>\n This is the first callback in the lifecycle of a drag event.\n\n @param model           The model representing the view that is being dragged\n @param itemView        The view that is being dragged\n @param adapterPosition The adapter position of the model\n
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
 //                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                     ^^^^^ definition local 0
 //                           display_name model
-//                           documentation ```java\nT model\n```
+//                           signature_documentation java T model
 //                            ^^^^ reference semanticdb maven . . View#
 //                                 ^^^^^^^^ definition local 1
 //                                          display_name itemView
-//                                          documentation ```java\nunresolved_type itemView\n```
+//                                          signature_documentation java unresolved_type itemView
 //                                               ^^^^^^^^^^^^^^^ definition local 2
 //                                                               display_name adapterPosition
-//                                                               documentation ```java\nint adapterPosition\n```
+//                                                               signature_documentation java int adapterPosition
 
   /**
    * Called after {@link #onDragStarted(EpoxyModel, View, int)} when the dragged view is dropped to
@@ -68,24 +68,24 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
   void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, View itemView);
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                  display_name onModelMoved
-//                  documentation ```java\npublic abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)\n```
+//                  signature_documentation java public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)
 //                  documentation  Called after {@link #onDragStarted(EpoxyModel, View, int)} when the dragged view is dropped to\n a new position. The EpoxyController will be updated automatically for you to reposition the\n models and notify the RecyclerView of the change.\n <p>\n You MUST use this callback to modify your data backing the models to reflect the change.\n <p>\n The next callback in the drag lifecycle will be {@link #onDragStarted(EpoxyModel, View, int)}\n\n @param modelBeingMoved The model representing the view that was moved\n @param itemView        The view that was moved\n @param fromPosition    The adapter position that the model came from\n @param toPosition      The new adapter position of the model\n
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
 //                      ^^^^^^^^^^^^ definition local 3
 //                                   display_name fromPosition
-//                                   documentation ```java\nint fromPosition\n```
+//                                   signature_documentation java int fromPosition
 //                                        ^^^^^^^^^^ definition local 4
 //                                                   display_name toPosition
-//                                                   documentation ```java\nint toPosition\n```
+//                                                   signature_documentation java int toPosition
 //                                                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                                                      ^^^^^^^^^^^^^^^ definition local 5
 //                                                                      display_name modelBeingMoved
-//                                                                      documentation ```java\nT modelBeingMoved\n```
+//                                                                      signature_documentation java T modelBeingMoved
 //                                                                       ^^^^ reference semanticdb maven . . View#
 //                                                                            ^^^^^^^^ definition local 6
 //                                                                                     display_name itemView
-//                                                                                     documentation ```java\nunresolved_type itemView\n```
+//                                                                                     signature_documentation java unresolved_type itemView
 
   /**
    * Called after {@link #onDragStarted(EpoxyModel, View, int)} when the view being dragged is
@@ -104,16 +104,16 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
   void onDragReleased(T model, View itemView);
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                    display_name onDragReleased
-//                    documentation ```java\npublic abstract void onDragReleased(T model, unresolved_type itemView)\n```
+//                    signature_documentation java public abstract void onDragReleased(T model, unresolved_type itemView)
 //                    documentation  Called after {@link #onDragStarted(EpoxyModel, View, int)} when the view being dragged is\n released. If the view was dragged to a new, valid location then {@link #onModelMoved(int, int,\n EpoxyModel, View)} will be called before this and the view will settle to the new location.\n Otherwise the view will animate back to its original position.\n <p>\n You can use this callback to modify the view as it animates back into position.\n <p>\n {@link BaseEpoxyTouchCallback#clearView(EpoxyModel, View)} will be called after this, when the\n view has finished animating. Final cleanup of the view should be done there.\n\n @param model    The model representing the view that is being released\n @param itemView The view that was being dragged\n
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                      ^^^^^ definition local 7
 //                            display_name model
-//                            documentation ```java\nT model\n```
+//                            signature_documentation java T model
 //                             ^^^^ reference semanticdb maven . . View#
 //                                  ^^^^^^^^ definition local 8
 //                                           display_name itemView
-//                                           documentation ```java\nunresolved_type itemView\n```
+//                                           signature_documentation java unresolved_type itemView
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
index 96f65b281..32f1ca307 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
@@ -21,18 +21,18 @@
 public abstract class EpoxyHolder {
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                                display_name EpoxyHolder
-//                                documentation ```java\npublic abstract class EpoxyHolder\n```
+//                                signature_documentation java public abstract class EpoxyHolder
 //                                documentation  Used in conjunction with {@link com.airbnb.epoxy.EpoxyModelWithHolder} to provide a view holder\n pattern when binding to a model.\n
 
   public EpoxyHolder(@NonNull ViewParent parent) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`().
 //                   display_name <init>
-//                   documentation ```java\npublic EpoxyHolder(unresolved_type parent)\n```
+//                   signature_documentation java public EpoxyHolder(unresolved_type parent)
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                       ^^^^^^ definition local 0
 //                                              display_name parent
-//                                              documentation ```java\n@NonNull\nunresolved_type parent\n```
+//                                              signature_documentation java @NonNull\nunresolved_type parent
     this();
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`(+1).
   }
@@ -40,7 +40,7 @@ public EpoxyHolder(@NonNull ViewParent parent) {
   public EpoxyHolder() {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`(+1).
 //                   display_name <init>
-//                   documentation ```java\npublic EpoxyHolder()\n```
+//                   signature_documentation java public EpoxyHolder()
   }
 
   /**
@@ -54,11 +54,11 @@ public EpoxyHolder() {
   protected abstract void bindView(@NonNull View itemView);
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#bindView().
 //                                 display_name bindView
-//                                 documentation ```java\nprotected abstract void bindView(unresolved_type itemView)\n```
+//                                 signature_documentation java protected abstract void bindView(unresolved_type itemView)
 //                                 documentation  Called when this holder is created, with the view that it should hold. You can use this\n opportunity to find views by id, and do any other initialization you need. This is called only\n once for the lifetime of the class.\n\n @param itemView A view inflated from the layout provided by\n {@link EpoxyModelWithHolder#getLayout()}\n
 //                                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                          ^^^^ reference semanticdb maven . . View#
 //                                               ^^^^^^^^ definition local 1
 //                                                        display_name itemView
-//                                                        documentation ```java\n@NonNull\nunresolved_type itemView\n```
+//                                                        signature_documentation java @NonNull\nunresolved_type itemView
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
index 524a2b6a6..e1dd85d11 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
@@ -59,7 +59,7 @@
 public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#
 //                                     display_name EpoxyItemSpacingDecorator
-//                                     documentation ```java\npublic class EpoxyItemSpacingDecorator\n```
+//                                     signature_documentation java public class EpoxyItemSpacingDecorator
 //                                     documentation  Modifies item spacing in a recycler view so that items are equally spaced no matter where they\n are on the grid. Only designed to work with standard linear or grid layout managers.\n
 //                                     relationship is_implementation semanticdb maven . . RecyclerView/ItemDecoration#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
@@ -67,49 +67,49 @@ public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration {
   private int pxBetweenItems;
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
 //                           display_name pxBetweenItems
-//                           documentation ```java\nprivate int pxBetweenItems\n```
+//                           signature_documentation java private int pxBetweenItems
   private boolean verticallyScrolling;
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#verticallyScrolling.
 //                                    display_name verticallyScrolling
-//                                    documentation ```java\nprivate boolean verticallyScrolling\n```
+//                                    signature_documentation java private boolean verticallyScrolling
   private boolean horizontallyScrolling;
 //                ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#horizontallyScrolling.
 //                                      display_name horizontallyScrolling
-//                                      documentation ```java\nprivate boolean horizontallyScrolling\n```
+//                                      signature_documentation java private boolean horizontallyScrolling
   private boolean firstItem;
 //                ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#firstItem.
 //                          display_name firstItem
-//                          documentation ```java\nprivate boolean firstItem\n```
+//                          signature_documentation java private boolean firstItem
   private boolean lastItem;
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#lastItem.
 //                         display_name lastItem
-//                         documentation ```java\nprivate boolean lastItem\n```
+//                         signature_documentation java private boolean lastItem
   private boolean grid;
 //                ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
 //                     display_name grid
-//                     documentation ```java\nprivate boolean grid\n```
+//                     signature_documentation java private boolean grid
 
   private boolean isFirstItemInRow;
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isFirstItemInRow.
 //                                 display_name isFirstItemInRow
-//                                 documentation ```java\nprivate boolean isFirstItemInRow\n```
+//                                 signature_documentation java private boolean isFirstItemInRow
   private boolean fillsLastSpan;
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#fillsLastSpan.
 //                              display_name fillsLastSpan
-//                              documentation ```java\nprivate boolean fillsLastSpan\n```
+//                              signature_documentation java private boolean fillsLastSpan
   private boolean isInFirstRow;
 //                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow.
 //                             display_name isInFirstRow
-//                             documentation ```java\nprivate boolean isInFirstRow\n```
+//                             signature_documentation java private boolean isInFirstRow
   private boolean isInLastRow;
 //                ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow.
 //                            display_name isInLastRow
-//                            documentation ```java\nprivate boolean isInLastRow\n```
+//                            signature_documentation java private boolean isInLastRow
 
   public EpoxyItemSpacingDecorator() {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`().
 //                                 display_name <init>
-//                                 documentation ```java\npublic EpoxyItemSpacingDecorator()\n```
+//                                 signature_documentation java public EpoxyItemSpacingDecorator()
     this(0);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`(+1).
   }
@@ -117,11 +117,11 @@ public EpoxyItemSpacingDecorator() {
   public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`(+1).
 //                                 display_name <init>
-//                                 documentation ```java\npublic EpoxyItemSpacingDecorator(int pxBetweenItems)\n```
+//                                 signature_documentation java public EpoxyItemSpacingDecorator(int pxBetweenItems)
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                         ^^^^^^^^^^^^^^ definition local 0
 //                                                        display_name pxBetweenItems
-//                                                        documentation ```java\n@Px\nint pxBetweenItems\n```
+//                                                        signature_documentation java @Px\nint pxBetweenItems
     setPxBetweenItems(pxBetweenItems);
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems().
 //                    ^^^^^^^^^^^^^^ reference local 0
@@ -130,11 +130,11 @@ public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) {
   public void setPxBetweenItems(@Px int pxBetweenItems) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems().
 //                              display_name setPxBetweenItems
-//                              documentation ```java\npublic void setPxBetweenItems(int pxBetweenItems)\n```
+//                              signature_documentation java public void setPxBetweenItems(int pxBetweenItems)
 //                               ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                      ^^^^^^^^^^^^^^ definition local 1
 //                                                     display_name pxBetweenItems
-//                                                     documentation ```java\n@Px\nint pxBetweenItems\n```
+//                                                     signature_documentation java @Px\nint pxBetweenItems
     this.pxBetweenItems = pxBetweenItems;
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
 //                        ^^^^^^^^^^^^^^ reference local 1
@@ -145,7 +145,7 @@ public void setPxBetweenItems(@Px int pxBetweenItems) {
   public int getPxBetweenItems() {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getPxBetweenItems().
 //                             display_name getPxBetweenItems
-//                             documentation ```java\n@Px\npublic int getPxBetweenItems()\n```
+//                             signature_documentation java @Px\npublic int getPxBetweenItems()
     return pxBetweenItems;
 //         ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
   }
@@ -155,23 +155,23 @@ public int getPxBetweenItems() {
   public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State state) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                           display_name getItemOffsets
-//                           documentation ```java\n@Override\npublic void getItemOffsets(unresolved_type outRect, unresolved_type view, unresolved_type parent, unresolved_type state)\n```
+//                           signature_documentation java @Override\npublic void getItemOffsets(unresolved_type outRect, unresolved_type view, unresolved_type parent, unresolved_type state)
 //                           ^^^^ reference semanticdb maven . . Rect#
 //                                ^^^^^^^ definition local 2
 //                                        display_name outRect
-//                                        documentation ```java\nunresolved_type outRect\n```
+//                                        signature_documentation java unresolved_type outRect
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^ definition local 3
 //                                                   display_name view
-//                                                   documentation ```java\nunresolved_type view\n```
+//                                                   signature_documentation java unresolved_type view
 //                                                    ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                 ^^^^^^ definition local 4
 //                                                                        display_name parent
-//                                                                        documentation ```java\nunresolved_type parent\n```
+//                                                                        signature_documentation java unresolved_type parent
 //                                                                         ^^^^^ reference semanticdb maven . . State#
 //                                                                               ^^^^^ definition local 5
 //                                                                                     display_name state
-//                                                                                     documentation ```java\nunresolved_type state\n```
+//                                                                                     signature_documentation java unresolved_type state
     // Zero everything out for the common case
     outRect.setEmpty();
 //  ^^^^^^^ reference local 2
@@ -180,7 +180,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
     int position = parent.getChildAdapterPosition(view);
 //      ^^^^^^^^ definition local 6
 //               display_name position
-//               documentation ```java\nint position\n```
+//               signature_documentation java int position
 //                 ^^^^^^ reference local 4
 //                        ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getChildAdapterPosition#
 //                                                ^^^^ reference local 3
@@ -197,7 +197,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //               ^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/LayoutManager#
 //                             ^^^^^^ definition local 7
 //                                    display_name layout
-//                                    documentation ```java\nunresolved_type layout\n```
+//                                    signature_documentation java unresolved_type layout
 //                                      ^^^^^^ reference local 4
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getLayoutManager#
     calculatePositionDetails(parent, position, layout);
@@ -209,22 +209,22 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
     boolean left = useLeftPadding();
 //          ^^^^ definition local 8
 //               display_name left
-//               documentation ```java\nboolean left\n```
+//               signature_documentation java boolean left
 //                 ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useLeftPadding().
     boolean right = useRightPadding();
 //          ^^^^^ definition local 9
 //                display_name right
-//                documentation ```java\nboolean right\n```
+//                signature_documentation java boolean right
 //                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useRightPadding().
     boolean top = useTopPadding();
 //          ^^^ definition local 10
 //              display_name top
-//              documentation ```java\nboolean top\n```
+//              signature_documentation java boolean top
 //                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useTopPadding().
     boolean bottom = useBottomPadding();
 //          ^^^^^^ definition local 11
 //                 display_name bottom
-//                 documentation ```java\nboolean bottom\n```
+//                 signature_documentation java boolean bottom
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useBottomPadding().
 
     if (shouldReverseLayout(layout, horizontallyScrolling)) {
@@ -236,7 +236,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
         boolean temp = left;
 //              ^^^^ definition local 12
 //                   display_name temp
-//                   documentation ```java\nboolean temp\n```
+//                   signature_documentation java boolean temp
 //                     ^^^^ reference local 8
         left = right;
 //      ^^^^ reference local 8
@@ -248,7 +248,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
         boolean temp = top;
 //              ^^^^ definition local 13
 //                   display_name temp
-//                   documentation ```java\nboolean temp\n```
+//                   signature_documentation java boolean temp
 //                     ^^^ reference local 10
         top = bottom;
 //      ^^^ reference local 10
@@ -264,7 +264,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
     int padding = pxBetweenItems / 2;
 //      ^^^^^^^ definition local 14
 //              display_name padding
-//              documentation ```java\nint padding\n```
+//              signature_documentation java int padding
 //                ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
     outRect.right = right ? padding : 0;
 //  ^^^^^^^ reference local 2
@@ -291,22 +291,22 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
   private void calculatePositionDetails(RecyclerView parent, int position, LayoutManager layout) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                                      display_name calculatePositionDetails
-//                                      documentation ```java\nprivate void calculatePositionDetails(unresolved_type parent, int position, unresolved_type layout)\n```
+//                                      signature_documentation java private void calculatePositionDetails(unresolved_type parent, int position, unresolved_type layout)
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                   ^^^^^^ definition local 15
 //                                                          display_name parent
-//                                                          documentation ```java\nunresolved_type parent\n```
+//                                                          signature_documentation java unresolved_type parent
 //                                                               ^^^^^^^^ definition local 16
 //                                                                        display_name position
-//                                                                        documentation ```java\nint position\n```
+//                                                                        signature_documentation java int position
 //                                                                         ^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#
 //                                                                                       ^^^^^^ definition local 17
 //                                                                                              display_name layout
-//                                                                                              documentation ```java\nunresolved_type layout\n```
+//                                                                                              signature_documentation java unresolved_type layout
     int itemCount = parent.getAdapter().getItemCount();
 //      ^^^^^^^^^ definition local 18
 //                display_name itemCount
-//                documentation ```java\nint itemCount\n```
+//                signature_documentation java int itemCount
 //                  ^^^^^^ reference local 15
 //                         ^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getAdapter#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getAdapter#getItemCount#
@@ -336,33 +336,33 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //    ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#
 //                      ^^^^ definition local 19
 //                           display_name grid
-//                           documentation ```java\nunresolved_type grid\n```
+//                           signature_documentation java unresolved_type grid
 //                              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#
 //                                                 ^^^^^^ reference local 17
       final SpanSizeLookup spanSizeLookup = grid.getSpanSizeLookup();
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                         ^^^^^^^^^^^^^^ definition local 20
 //                                        display_name spanSizeLookup
-//                                        documentation ```java\nfinal unresolved_type spanSizeLookup\n```
+//                                        signature_documentation java final unresolved_type spanSizeLookup
 //                                          ^^^^ reference local 19
 //                                               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#getSpanSizeLookup#
       int spanSize = spanSizeLookup.getSpanSize(position);
 //        ^^^^^^^^ definition local 21
 //                 display_name spanSize
-//                 documentation ```java\nint spanSize\n```
+//                 signature_documentation java int spanSize
 //                   ^^^^^^^^^^^^^^ reference local 20
 //                                  ^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#getSpanSize#
 //                                              ^^^^^^^^ reference local 16
       int spanCount = grid.getSpanCount();
 //        ^^^^^^^^^ definition local 22
 //                  display_name spanCount
-//                  documentation ```java\nint spanCount\n```
+//                  signature_documentation java int spanCount
 //                    ^^^^ reference local 19
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#getSpanCount#
       int spanIndex = spanSizeLookup.getSpanIndex(position, spanCount);
 //        ^^^^^^^^^ definition local 23
 //                  display_name spanIndex
-//                  documentation ```java\nint spanIndex\n```
+//                  signature_documentation java int spanIndex
 //                    ^^^^^^^^^^^^^^ reference local 20
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#getSpanIndex#
 //                                                ^^^^^^^^ reference local 16
@@ -396,18 +396,18 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
   private static boolean shouldReverseLayout(LayoutManager layout, boolean horizontallyScrolling) {
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
 //                                           display_name shouldReverseLayout
-//                                           documentation ```java\nprivate static boolean shouldReverseLayout(unresolved_type layout, boolean horizontallyScrolling)\n```
+//                                           signature_documentation java private static boolean shouldReverseLayout(unresolved_type layout, boolean horizontallyScrolling)
 //                                           ^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#
 //                                                         ^^^^^^ definition local 24
 //                                                                display_name layout
-//                                                                documentation ```java\nunresolved_type layout\n```
+//                                                                signature_documentation java unresolved_type layout
 //                                                                         ^^^^^^^^^^^^^^^^^^^^^ definition local 25
 //                                                                                               display_name horizontallyScrolling
-//                                                                                               documentation ```java\nboolean horizontallyScrolling\n```
+//                                                                                               signature_documentation java boolean horizontallyScrolling
     boolean reverseLayout =
 //          ^^^^^^^^^^^^^ definition local 26
 //                        display_name reverseLayout
-//                        documentation ```java\nboolean reverseLayout\n```
+//                        signature_documentation java boolean reverseLayout
         layout instanceof LinearLayoutManager && ((LinearLayoutManager) layout).getReverseLayout();
 //      ^^^^^^ reference local 24
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . LinearLayoutManager#
@@ -417,7 +417,7 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
     boolean rtl = layout.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL;
 //          ^^^ definition local 27
 //              display_name rtl
-//              documentation ```java\nboolean rtl\n```
+//              signature_documentation java boolean rtl
 //                ^^^^^^ reference local 24
 //                       ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#getLayoutDirection#
 //                                               ^^^^^^^^^^ reference semanticdb maven . . ViewCompat#
@@ -438,7 +438,7 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
   private boolean useBottomPadding() {
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useBottomPadding().
 //                                 display_name useBottomPadding
-//                                 documentation ```java\nprivate boolean useBottomPadding()\n```
+//                                 signature_documentation java private boolean useBottomPadding()
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
       return (horizontallyScrolling && !fillsLastSpan)
@@ -457,7 +457,7 @@ private boolean useBottomPadding() {
   private boolean useTopPadding() {
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useTopPadding().
 //                              display_name useTopPadding
-//                              documentation ```java\nprivate boolean useTopPadding()\n```
+//                              signature_documentation java private boolean useTopPadding()
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
       return (horizontallyScrolling && !isFirstItemInRow)
@@ -476,7 +476,7 @@ private boolean useTopPadding() {
   private boolean useRightPadding() {
 //                ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useRightPadding().
 //                                display_name useRightPadding
-//                                documentation ```java\nprivate boolean useRightPadding()\n```
+//                                signature_documentation java private boolean useRightPadding()
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
       return (horizontallyScrolling && !isInLastRow)
@@ -495,7 +495,7 @@ private boolean useRightPadding() {
   private boolean useLeftPadding() {
 //                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useLeftPadding().
 //                               display_name useLeftPadding
-//                               documentation ```java\nprivate boolean useLeftPadding()\n```
+//                               signature_documentation java private boolean useLeftPadding()
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
       return (horizontallyScrolling && !isInFirstRow)
@@ -514,25 +514,25 @@ private boolean useLeftPadding() {
   private static boolean isInFirstRow(int position, SpanSizeLookup spanSizeLookup, int spanCount) {
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
 //                                    display_name isInFirstRow
-//                                    documentation ```java\nprivate static boolean isInFirstRow(int position, unresolved_type spanSizeLookup, int spanCount)\n```
+//                                    signature_documentation java private static boolean isInFirstRow(int position, unresolved_type spanSizeLookup, int spanCount)
 //                                        ^^^^^^^^ definition local 28
 //                                                 display_name position
-//                                                 documentation ```java\nint position\n```
+//                                                 signature_documentation java int position
 //                                                  ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                                                                 ^^^^^^^^^^^^^^ definition local 29
 //                                                                                display_name spanSizeLookup
-//                                                                                documentation ```java\nunresolved_type spanSizeLookup\n```
+//                                                                                signature_documentation java unresolved_type spanSizeLookup
 //                                                                                     ^^^^^^^^^ definition local 30
 //                                                                                               display_name spanCount
-//                                                                                               documentation ```java\nint spanCount\n```
+//                                                                                               signature_documentation java int spanCount
     int totalSpan = 0;
 //      ^^^^^^^^^ definition local 31
 //                display_name totalSpan
-//                documentation ```java\nint totalSpan\n```
+//                signature_documentation java int totalSpan
     for (int i = 0; i <= position; i++) {
 //           ^ definition local 32
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 32
 //                       ^^^^^^^^ reference local 28
 //                                 ^ reference local 32
@@ -554,29 +554,29 @@ private static boolean isInFirstRow(int position, SpanSizeLookup spanSizeLookup,
   private static boolean isInLastRow(int position, int itemCount, SpanSizeLookup spanSizeLookup,
 //                       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
 //                                   display_name isInLastRow
-//                                   documentation ```java\nprivate static boolean isInLastRow(int position, int itemCount, unresolved_type spanSizeLookup, int spanCount)\n```
+//                                   signature_documentation java private static boolean isInLastRow(int position, int itemCount, unresolved_type spanSizeLookup, int spanCount)
 //                                       ^^^^^^^^ definition local 33
 //                                                display_name position
-//                                                documentation ```java\nint position\n```
+//                                                signature_documentation java int position
 //                                                     ^^^^^^^^^ definition local 34
 //                                                               display_name itemCount
-//                                                               documentation ```java\nint itemCount\n```
+//                                                               signature_documentation java int itemCount
 //                                                                ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                                                                               ^^^^^^^^^^^^^^ definition local 35
 //                                                                                              display_name spanSizeLookup
-//                                                                                              documentation ```java\nunresolved_type spanSizeLookup\n```
+//                                                                                              signature_documentation java unresolved_type spanSizeLookup
       int spanCount) {
 //        ^^^^^^^^^ definition local 36
 //                  display_name spanCount
-//                  documentation ```java\nint spanCount\n```
+//                  signature_documentation java int spanCount
     int totalSpan = 0;
 //      ^^^^^^^^^ definition local 37
 //                display_name totalSpan
-//                documentation ```java\nint totalSpan\n```
+//                signature_documentation java int totalSpan
     for (int i = itemCount - 1; i >= position; i--) {
 //           ^ definition local 38
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //               ^^^^^^^^^ reference local 34
 //                              ^ reference local 38
 //                                   ^^^^^^^^ reference local 33
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
index 7424aed06..385013b0b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
@@ -73,11 +73,11 @@
 public abstract class EpoxyModel<T> {
 //                    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                               display_name EpoxyModel
-//                               documentation ```java\npublic abstract class EpoxyModel<T>\n```
+//                               signature_documentation java public abstract class EpoxyModel<T>
 //                               documentation  Helper to bind data to a view using a builder style. The parameterized type should extend\n Android's View or EpoxyHolder.\n\n @see EpoxyModelWithHolder\n @see EpoxyModelWithView\n
 //                               ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                 display_name T
-//                                 documentation ```java\nT\n```
+//                                 signature_documentation java T
 
   /**
    * Counts how many of these objects are created, so that each new object can have a unique id .
@@ -87,7 +87,7 @@ public abstract class EpoxyModel<T> {
   private static long idCounter = -1;
 //                    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#idCounter.
 //                              display_name idCounter
-//                              documentation ```java\nprivate static long idCounter\n```
+//                              signature_documentation java private static long idCounter
 //                              documentation  Counts how many of these objects are created, so that each new object can have a unique id .\n Uses negative values so that these autogenerated ids don't clash with database ids that may be\n set with {@link #id(long)}\n
 
   /**
@@ -98,17 +98,17 @@ public abstract class EpoxyModel<T> {
   private long id;
 //             ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
 //                display_name id
-//                documentation ```java\nprivate long id\n```
+//                signature_documentation java private long id
 //                documentation  An id that can be used to uniquely identify this {@link EpoxyModel} for use in RecyclerView\n stable ids. It defaults to a unique id for this object instance, if you want to maintain the\n same id across instances use {@link #id(long)}\n
   @LayoutRes private int layout;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                       ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout.
 //                              display_name layout
-//                              documentation ```java\n@LayoutRes\nprivate int layout\n```
+//                              signature_documentation java @LayoutRes\nprivate int layout
   private boolean shown = true;
 //                ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shown.
 //                      display_name shown
-//                      documentation ```java\nprivate boolean shown\n```
+//                      signature_documentation java private boolean shown
   /**
    * Set to true once this model is diffed in an adapter. Used to ensure that this model's id
    * doesn't change after being diffed.
@@ -116,7 +116,7 @@ public abstract class EpoxyModel<T> {
   boolean addedToAdapter;
 //        ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addedToAdapter.
 //                       display_name addedToAdapter
-//                       documentation ```java\nboolean addedToAdapter\n```
+//                       signature_documentation java boolean addedToAdapter
 //                       documentation  Set to true once this model is diffed in an adapter. Used to ensure that this model's id\n doesn't change after being diffed.\n
   /**
    * The first controller this model was added to. A reference is kept in debug mode in order to run
@@ -127,7 +127,7 @@ public abstract class EpoxyModel<T> {
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo.
 //                                               display_name firstControllerAddedTo
-//                                               documentation ```java\nprivate EpoxyController firstControllerAddedTo\n```
+//                                               signature_documentation java private EpoxyController firstControllerAddedTo
 //                                               documentation  The first controller this model was added to. A reference is kept in debug mode in order to run\n validations. The model is allowed to be added to other controllers, but we only keep a\n reference to the first.\n
   /**
    * Models are staged when they are changed. This allows them to be automatically added when they
@@ -138,34 +138,34 @@ public abstract class EpoxyModel<T> {
 //^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#controllerToStageTo.
 //                                    display_name controllerToStageTo
-//                                    documentation ```java\nEpoxyController controllerToStageTo\n```
+//                                    signature_documentation java EpoxyController controllerToStageTo
 //                                    documentation  Models are staged when they are changed. This allows them to be automatically added when they\n are done being changed (eg the next model is changed/added or buildModels finishes). It is only\n allowed for AutoModels, and only if implicit adding is enabled.\n
   private boolean currentlyInInterceptors;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#currentlyInInterceptors.
 //                                        display_name currentlyInInterceptors
-//                                        documentation ```java\nprivate boolean currentlyInInterceptors\n```
+//                                        signature_documentation java private boolean currentlyInInterceptors
   private int hashCodeWhenAdded;
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCodeWhenAdded.
 //                              display_name hashCodeWhenAdded
-//                              documentation ```java\nprivate int hashCodeWhenAdded\n```
+//                              signature_documentation java private int hashCodeWhenAdded
   private boolean hasDefaultId;
 //                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId.
 //                             display_name hasDefaultId
-//                             documentation ```java\nprivate boolean hasDefaultId\n```
+//                             signature_documentation java private boolean hasDefaultId
   @Nullable private SpanSizeOverrideCallback spanSizeOverride;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
 //                                           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
 //                                                            display_name spanSizeOverride
-//                                                            documentation ```java\n@Nullable\nprivate SpanSizeOverrideCallback spanSizeOverride\n```
+//                                                            signature_documentation java @Nullable\nprivate SpanSizeOverrideCallback spanSizeOverride
 
   protected EpoxyModel(long id) {
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
 //                     display_name <init>
-//                     documentation ```java\nprotected EpoxyModel(long id)\n```
+//                     signature_documentation java protected EpoxyModel(long id)
 //                          ^^ definition local 0
 //                             display_name id
-//                             documentation ```java\nlong id\n```
+//                             signature_documentation java long id
     id(id);
 //  ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
 //     ^^ reference local 0
@@ -174,7 +174,7 @@ protected EpoxyModel(long id) {
   public EpoxyModel() {
 //       ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`(+1).
 //                  display_name <init>
-//                  documentation ```java\npublic EpoxyModel()\n```
+//                  signature_documentation java public EpoxyModel()
     this(idCounter--);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
 //       ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#idCounter.
@@ -185,7 +185,7 @@ public EpoxyModel() {
   boolean hasDefaultId() {
 //        ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId().
 //                     display_name hasDefaultId
-//                     documentation ```java\nboolean hasDefaultId()\n```
+//                     signature_documentation java boolean hasDefaultId()
     return hasDefaultId;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId.
   }
@@ -201,7 +201,7 @@ boolean hasDefaultId() {
   protected int getViewType() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
 //                          display_name getViewType
-//                          documentation ```java\nprotected int getViewType()\n```
+//                          signature_documentation java protected int getViewType()
 //                          documentation  Get the view type to associate with this model in the recyclerview. For models that use a\n layout resource, the view type is simply the layout resource value by default.\n <p>\n If this returns 0 Epoxy will assign a unique view type for this model at run time.\n\n @see androidx.recyclerview.widget.RecyclerView.Adapter#getItemViewType(int)\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getViewType().
     return getLayout();
@@ -216,14 +216,14 @@ protected View buildView(@NonNull ViewGroup parent) {
 //          ^^^^ reference semanticdb maven . . View#
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
 //                         display_name buildView
-//                         documentation ```java\nprotected unresolved_type buildView(unresolved_type parent)\n```
+//                         signature_documentation java protected unresolved_type buildView(unresolved_type parent)
 //                         documentation  Create and return a new instance of a view for this model. By default a view is created by\n inflating the layout resource.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#buildView().
 //                          ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                  ^^^^^^^^^ reference semanticdb maven . . ViewGroup#
 //                                            ^^^^^^ definition local 1
 //                                                   display_name parent
-//                                                   documentation ```java\n@NonNull\nunresolved_type parent\n```
+//                                                   signature_documentation java @NonNull\nunresolved_type parent
     return LayoutInflater.from(parent.getContext()).inflate(getLayout(), parent, false);
 //         ^^^^^^^^^^^^^^ reference semanticdb maven . . LayoutInflater#
 //                        ^^^^ reference semanticdb maven . . LayoutInflater#from#
@@ -241,7 +241,7 @@ protected View buildView(@NonNull ViewGroup parent) {
   public void bind(@NonNull T view) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                 display_name bind
-//                 documentation ```java\npublic void bind(T view)\n```
+//                 signature_documentation java public void bind(T view)
 //                 documentation  Binds the current data to the given view. You should bind all fields including unset/empty\n fields to ensure proper recycling.\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
@@ -250,7 +250,7 @@ public void bind(@NonNull T view) {
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                            ^^^^ definition local 2
 //                                 display_name view
-//                                 documentation ```java\n@NonNull\nT view\n```
+//                                 signature_documentation java @NonNull\nT view
 
   }
 
@@ -265,7 +265,7 @@ public void bind(@NonNull T view) {
   public void bind(@NonNull T view, @NonNull List<Object> payloads) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                 display_name bind
-//                 documentation ```java\npublic void bind(T view, List<Object> payloads)\n```
+//                 signature_documentation java public void bind(T view, List<Object> payloads)
 //                 documentation  Similar to {@link #bind(Object)}, but provides a non null, non empty list of payloads\n describing what changed. This is the payloads list specified in the adapter's notifyItemChanged\n method. This is a useful optimization to allow you to only change part of a view instead of\n updating the whole thing, which may prevent unnecessary layout calls. If there are no payloads\n then {@link #bind(Object)} is called instead. This will only be used if the model is used with\n an {@link EpoxyAdapter}\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
@@ -273,13 +273,13 @@ public void bind(@NonNull T view, @NonNull List<Object> payloads) {
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                            ^^^^ definition local 3
 //                                 display_name view
-//                                 documentation ```java\n@NonNull\nT view\n```
+//                                 signature_documentation java @NonNull\nT view
 //                                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                           ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                        ^^^^^^^^ definition local 4
 //                                                                 display_name payloads
-//                                                                 documentation ```java\n@NonNull\nList<Object> payloads\n```
+//                                                                 signature_documentation java @NonNull\nList<Object> payloads
     bind(view);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //       ^^^^ reference local 3
@@ -319,7 +319,7 @@ public void bind(@NonNull T view, @NonNull List<Object> payloads) {
   public void bind(@NonNull T view, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                 display_name bind
-//                 documentation ```java\npublic void bind(T view, EpoxyModel<?> previouslyBoundModel)\n```
+//                 signature_documentation java public void bind(T view, EpoxyModel<?> previouslyBoundModel)
 //                 documentation  Similar to {@link #bind(Object)}, but provides a non null model which was previously bound to\n this view. This will only be called if the model is used with an {@link EpoxyController}.\n\n @param previouslyBoundModel This is a model with the same id that was previously bound. You can\n                             compare this previous model with the current one to see exactly\n                             what changed.\n                             <p>\n                             This model and the previously bound model are guaranteed to have\n                             the same id, but will not necessarily be of the same type depending\n                             on your implementation of {@link EpoxyController#buildModels()}.\n                             With common usage patterns of Epoxy they should be the same type,\n                             and will only differ if you are using different model classes with\n                             the same id.\n                             <p>\n                             Comparing the newly bound model with the previous model allows you\n                             to be more intelligent when binding your view. This may help you\n                             optimize view binding, or make it easier to work with animations.\n                             <p>\n                             If the new model and the previous model have the same view type\n                             (given by {@link EpoxyModel#getViewType()}), and if you are using\n                             the default ReyclerView item animator, the same view will be\n                             reused. This means that you only need to update the view to reflect\n                             the data that changed. If you are using a custom item animator then\n                             the view will be the same if the animator returns true in\n                             canReuseUpdatedViewHolder.\n                             <p>\n                             This previously bound model is taken as a payload from the diffing\n                             process, and follows the same general conditions for all\n                             recyclerview change payloads.\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
@@ -327,12 +327,12 @@ public void bind(@NonNull T view, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                            ^^^^ definition local 5
 //                                 display_name view
-//                                 documentation ```java\n@NonNull\nT view\n```
+//                                 signature_documentation java @NonNull\nT view
 //                                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                         ^^^^^^^^^^^^^^^^^^^^ definition local 6
 //                                                                              display_name previouslyBoundModel
-//                                                                              documentation ```java\n@NonNull\nEpoxyModel<?> previouslyBoundModel\n```
+//                                                                              signature_documentation java @NonNull\nEpoxyModel<?> previouslyBoundModel
     bind(view);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //       ^^^^ reference local 5
@@ -351,7 +351,7 @@ public void bind(@NonNull T view, @NonNull EpoxyModel<?> previouslyBoundModel) {
   public void unbind(@NonNull T view) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                   display_name unbind
-//                   documentation ```java\npublic void unbind(T view)\n```
+//                   signature_documentation java public void unbind(T view)
 //                   documentation  Called when the view bound to this model is recycled. Subclasses can override this if their\n view should release resources when it's recycled.\n <p>\n Note that {@link #bind(Object)} can be called multiple times without an unbind call in between\n if the view has remained on screen to be reused across item changes. This means that you should\n not rely on unbind to clear a view or model's state before bind is called again.\n\n @see EpoxyAdapter#onViewRecycled(EpoxyViewHolder)\n
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
@@ -360,7 +360,7 @@ public void unbind(@NonNull T view) {
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                              ^^^^ definition local 7
 //                                   display_name view
-//                                   documentation ```java\n@NonNull\nT view\n```
+//                                   signature_documentation java @NonNull\nT view
   }
 
   /**
@@ -371,18 +371,18 @@ public void unbind(@NonNull T view) {
   public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T view) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
 //                                     display_name onVisibilityStateChanged
-//                                     documentation ```java\npublic void onVisibilityStateChanged(int visibilityState, T view)\n```
+//                                     signature_documentation java public void onVisibilityStateChanged(int visibilityState, T view)
 //                                     documentation  TODO link to the wiki\n\n @see OnVisibilityStateChanged annotation\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged().
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                     ^^^^^^^^^^^^^^^ definition local 8
 //                                                                     display_name visibilityState
-//                                                                     documentation ```java\n@Visibility\nint visibilityState\n```
+//                                                                     signature_documentation java @Visibility\nint visibilityState
 //                                                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                                                                 ^^^^ definition local 9
 //                                                                                      display_name view
-//                                                                                      documentation ```java\n@NonNull\nT view\n```
+//                                                                                      signature_documentation java @NonNull\nT view
   }
 
   /**
@@ -393,7 +393,7 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T
   public void onVisibilityChanged(
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
 //                                display_name onVisibilityChanged
-//                                documentation ```java\npublic void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T view)\n```
+//                                signature_documentation java public void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T view)
 //                                documentation  TODO link to the wiki\n\n @see OnVisibilityChanged annotation\n
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleHeight,
@@ -402,37 +402,37 @@ public void onVisibilityChanged(
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                                ^^^^^^^^^^^^^^^^^^^^ definition local 10
 //                                                                     display_name percentVisibleHeight
-//                                                                     documentation ```java\n@FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleHeight\n```
+//                                                                     signature_documentation java @FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleHeight
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                                ^^^^^^^^^^^^^^^^^^^ definition local 11
 //                                                                    display_name percentVisibleWidth
-//                                                                    documentation ```java\n@FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleWidth\n```
+//                                                                    signature_documentation java @FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleWidth
       @Px int visibleHeight,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 12
 //                          display_name visibleHeight
-//                          documentation ```java\n@Px\nint visibleHeight\n```
+//                          signature_documentation java @Px\nint visibleHeight
       @Px int visibleWidth,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^ definition local 13
 //                         display_name visibleWidth
-//                         documentation ```java\n@Px\nint visibleWidth\n```
+//                         signature_documentation java @Px\nint visibleWidth
       @NonNull T view
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //               ^^^^ definition local 14
 //                    display_name view
-//                    documentation ```java\n@NonNull\nT view\n```
+//                    signature_documentation java @NonNull\nT view
   ) {
   }
 
   public long id() {
 //            ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id().
 //               display_name id
-//               documentation ```java\npublic long id()\n```
+//               signature_documentation java public long id()
     return id;
 //         ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
   }
@@ -447,11 +447,11 @@ public EpoxyModel<T> id(long id) {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
 //                        display_name id
-//                        documentation ```java\npublic EpoxyModel<T> id(long id)\n```
+//                        signature_documentation java public EpoxyModel<T> id(long id)
 //                        documentation  Override the default id in cases where the data subject naturally has an id, like an object\n from a database. This id can only be set before the model is added to the adapter, it is an\n error to change the id after that.\n
 //                             ^^ definition local 15
 //                                display_name id
-//                                documentation ```java\nlong id\n```
+//                                signature_documentation java long id
     if ((addedToAdapter || firstControllerAddedTo != null) && id != this.id) {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addedToAdapter.
 //                         ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo.
@@ -481,17 +481,17 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+2).
 //                        display_name id
-//                        documentation ```java\npublic EpoxyModel<T> id(Number[] ids)\n```
+//                        signature_documentation java public EpoxyModel<T> id(Number[] ids)
 //                        documentation  Use multiple numbers as the id for this model. Useful when you don't have a single long that\n represents a unique id.\n <p>\n This hashes the numbers, so there is a tiny risk of collision with other ids.\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Number#
 //                                            ^^^ definition local 16
 //                                                display_name ids
-//                                                documentation ```java\n@Nullable\nNumber[] ids\n```
+//                                                signature_documentation java @Nullable\nNumber[] ids
     long result = 0;
 //       ^^^^^^ definition local 17
 //              display_name result
-//              documentation ```java\nlong result\n```
+//              signature_documentation java long result
     if (ids != null) {
 //      ^^^ reference local 16
       for (@Nullable Number id : ids) {
@@ -499,7 +499,7 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //                   ^^^^^^ reference semanticdb maven jdk 11 java/lang/Number#
 //                          ^^ definition local 18
 //                             display_name id
-//                             documentation ```java\n@Nullable\nNumber id\n```
+//                             signature_documentation java @Nullable\nNumber id
 //                               ^^^ reference local 16
         result = 31 * result + hashLong64Bit(id == null ? 0 : id.hashCode());
 //      ^^^^^^ reference local 17
@@ -526,18 +526,18 @@ public EpoxyModel<T> id(long id1, long id2) {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+3).
 //                        display_name id
-//                        documentation ```java\npublic EpoxyModel<T> id(long id1, long id2)\n```
+//                        signature_documentation java public EpoxyModel<T> id(long id1, long id2)
 //                        documentation  Use two numbers as the id for this model. Useful when you don't have a single long that\n represents a unique id.\n <p>\n This hashes the two numbers, so there is a tiny risk of collision with other ids.\n
 //                             ^^^ definition local 19
 //                                 display_name id1
-//                                 documentation ```java\nlong id1\n```
+//                                 signature_documentation java long id1
 //                                       ^^^ definition local 20
 //                                           display_name id2
-//                                           documentation ```java\nlong id2\n```
+//                                           signature_documentation java long id2
     long result = hashLong64Bit(id1);
 //       ^^^^^^ definition local 21
 //              display_name result
-//              documentation ```java\nlong result\n```
+//              signature_documentation java long result
 //                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashLong64Bit().
 //                              ^^^ reference local 19
     result = 31 * result + hashLong64Bit(id2);
@@ -567,13 +567,13 @@ public EpoxyModel<T> id(@Nullable CharSequence key) {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+4).
 //                        display_name id
-//                        documentation ```java\npublic EpoxyModel<T> id(CharSequence key)\n```
+//                        signature_documentation java public EpoxyModel<T> id(CharSequence key)
 //                        documentation  Use a string as the model id. Useful for models that don't clearly map to a numerical id. This\n is preferable to using {@link String#hashCode()} because that is a 32 bit hash and this is a 64\n bit hash, giving better spread and less chance of collision with other ids.\n <p>\n Since this uses a hashcode method to convert the String to a long there is a very small chance\n that you may have a collision with another id. Assuming an even spread of hashcodes, and\n several hundred models in the adapter, there would be roughly 1 in 100 trillion chance of a\n collision. (http://preshing.com/20110504/hash-collision-probabilities/)\n\n @see IdUtils#hashString64Bit(CharSequence)\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^ definition local 22
 //                                                   display_name key
-//                                                   documentation ```java\n@Nullable\nCharSequence key\n```
+//                                                   signature_documentation java @Nullable\nCharSequence key
     id(hashString64Bit(key));
 //  ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
 //     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
@@ -591,22 +591,22 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
 //                        display_name id
-//                        documentation ```java\npublic EpoxyModel<T> id(CharSequence key, CharSequence[] otherKeys)\n```
+//                        signature_documentation java public EpoxyModel<T> id(CharSequence key, CharSequence[] otherKeys)
 //                        documentation  Use several strings to define the id of the model.\n <p>\n Similar to {@link #id(CharSequence)}, but with additional strings.\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^ definition local 23
 //                                                   display_name key
-//                                                   documentation ```java\n@Nullable\nCharSequence key\n```
+//                                                   signature_documentation java @Nullable\nCharSequence key
 //                                                     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                                              ^^^^^^^^^ definition local 24
 //                                                                                        display_name otherKeys
-//                                                                                        documentation ```java\n@Nullable\nCharSequence[] otherKeys\n```
+//                                                                                        signature_documentation java @Nullable\nCharSequence[] otherKeys
     long result = hashString64Bit(key);
 //       ^^^^^^ definition local 25
 //              display_name result
-//              documentation ```java\nlong result\n```
+//              signature_documentation java long result
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                ^^^ reference local 23
     if (otherKeys != null) {
@@ -615,7 +615,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
 //         ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                      ^^^^^^^^ definition local 26
 //                               display_name otherKey
-//                               documentation ```java\nCharSequence otherKey\n```
+//                               signature_documentation java CharSequence otherKey
 //                                 ^^^^^^^^^ reference local 24
         result = 31 * result + hashString64Bit(otherKey);
 //      ^^^^^^ reference local 25
@@ -646,20 +646,20 @@ public EpoxyModel<T> id(@Nullable CharSequence key, long id) {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+6).
 //                        display_name id
-//                        documentation ```java\npublic EpoxyModel<T> id(CharSequence key, long id)\n```
+//                        signature_documentation java public EpoxyModel<T> id(CharSequence key, long id)
 //                        documentation  Set an id that is namespaced with a string. This is useful when you need to show models of\n multiple types, side by side and don't want to risk id collisions.\n <p>\n Since this uses a hashcode method to convert the String to a long there is a very small chance\n that you may have a collision with another id. Assuming an even spread of hashcodes, and\n several hundred models in the adapter, there would be roughly 1 in 100 trillion chance of a\n collision. (http://preshing.com/20110504/hash-collision-probabilities/)\n\n @see IdUtils#hashString64Bit(CharSequence)\n @see IdUtils#hashLong64Bit(long)\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^ definition local 27
 //                                                   display_name key
-//                                                   documentation ```java\n@Nullable\nCharSequence key\n```
+//                                                   signature_documentation java @Nullable\nCharSequence key
 //                                                         ^^ definition local 28
 //                                                            display_name id
-//                                                            documentation ```java\nlong id\n```
+//                                                            signature_documentation java long id
     long result = hashString64Bit(key);
 //       ^^^^^^ definition local 29
 //              display_name result
-//              documentation ```java\nlong result\n```
+//              signature_documentation java long result
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                ^^^ reference local 27
     result = 31 * result + hashLong64Bit(id);
@@ -689,7 +689,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, long id) {
   protected abstract int getDefaultLayout();
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
 //                                        display_name getDefaultLayout
-//                                        documentation ```java\n@LayoutRes\nprotected abstract int getDefaultLayout()\n```
+//                                        signature_documentation java @LayoutRes\nprotected abstract int getDefaultLayout()
 //                                        documentation  Return the default layout resource to be used when creating views for this model. The resource\n will be inflated to create a view for the model; additionally the layout int is used as the\n views type in the RecyclerView.\n <p>\n This can be left unimplemented if you use the {@link EpoxyModelClass} annotation to define a\n layout.\n <p>\n This default value can be overridden with {@link #layout(int)} at runtime to change the layout\n dynamically.\n
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getDefaultLayout().
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getDefaultLayout().
@@ -703,12 +703,12 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout().
 //                            display_name layout
-//                            documentation ```java\n@NonNull\npublic EpoxyModel<T> layout(int layoutRes)\n```
+//                            signature_documentation java @NonNull\npublic EpoxyModel<T> layout(int layoutRes)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#layout().
 //                             ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                           ^^^^^^^^^ definition local 30
 //                                                     display_name layoutRes
-//                                                     documentation ```java\n@LayoutRes\nint layoutRes\n```
+//                                                     signature_documentation java @LayoutRes\nint layoutRes
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
     layout = layoutRes;
@@ -722,7 +722,7 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
   public final int getLayout() {
 //                 ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getLayout().
 //                           display_name getLayout
-//                           documentation ```java\n@LayoutRes\npublic final int getLayout()\n```
+//                           signature_documentation java @LayoutRes\npublic final int getLayout()
     if (layout == 0) {
 //      ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout.
       return getDefaultLayout();
@@ -743,7 +743,7 @@ public EpoxyModel<T> reset() {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#reset().
 //                           display_name reset
-//                           documentation ```java\n@NonNull\npublic EpoxyModel<T> reset()\n```
+//                           signature_documentation java @NonNull\npublic EpoxyModel<T> reset()
 //                           documentation  Sets fields of the model to default ones.\n
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
@@ -763,13 +763,13 @@ public EpoxyModel<T> reset() {
   public void addTo(@NonNull EpoxyController controller) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addTo().
 //                  display_name addTo
-//                  documentation ```java\npublic void addTo(EpoxyController controller)\n```
+//                  signature_documentation java public void addTo(EpoxyController controller)
 //                  documentation  Add this model to the given controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                           ^^^^^^^^^^ definition local 31
 //                                                      display_name controller
-//                                                      documentation ```java\n@NonNull\nEpoxyController controller\n```
+//                                                      signature_documentation java @NonNull\nEpoxyController controller
     controller.addInternal(this);
 //  ^^^^^^^^^^ reference local 31
 //             ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInternal().
@@ -782,16 +782,16 @@ public void addTo(@NonNull EpoxyController controller) {
   public void addIf(boolean condition, @NonNull EpoxyController controller) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf().
 //                  display_name addIf
-//                  documentation ```java\npublic void addIf(boolean condition, EpoxyController controller)\n```
+//                  signature_documentation java public void addIf(boolean condition, EpoxyController controller)
 //                  documentation  Add this model to the given controller if the condition is true. Can only be called from inside\n {@link EpoxyController#buildModels()}.\n
 //                          ^^^^^^^^^ definition local 32
 //                                    display_name condition
-//                                    documentation ```java\nboolean condition\n```
+//                                    signature_documentation java boolean condition
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                              ^^^^^^^^^^ definition local 33
 //                                                                         display_name controller
-//                                                                         documentation ```java\n@NonNull\nEpoxyController controller\n```
+//                                                                         signature_documentation java @NonNull\nEpoxyController controller
     if (condition) {
 //      ^^^^^^^^^ reference local 32
       addTo(controller);
@@ -817,18 +817,18 @@ public void addIf(boolean condition, @NonNull EpoxyController controller) {
   public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController controller) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf(+1).
 //                  display_name addIf
-//                  documentation ```java\npublic void addIf(AddPredicate predicate, EpoxyController controller)\n```
+//                  signature_documentation java public void addIf(AddPredicate predicate, EpoxyController controller)
 //                  documentation  Add this model to the given controller if the {@link AddPredicate} return true. Can only be\n called from inside {@link EpoxyController#buildModels()}.\n
 //                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#
 //                                        ^^^^^^^^^ definition local 34
 //                                                  display_name predicate
-//                                                  documentation ```java\n@NonNull\nAddPredicate predicate\n```
+//                                                  signature_documentation java @NonNull\nAddPredicate predicate
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                                            ^^^^^^^^^^ definition local 35
 //                                                                                       display_name controller
-//                                                                                       documentation ```java\n@NonNull\nEpoxyController controller\n```
+//                                                                                       signature_documentation java @NonNull\nEpoxyController controller
     addIf(predicate.addIf(), controller);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf().
 //        ^^^^^^^^^ reference local 34
@@ -842,12 +842,12 @@ public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController cont
   public interface AddPredicate {
 //                 ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#
 //                              display_name AddPredicate
-//                              documentation ```java\npublic interface AddPredicate\n```
+//                              signature_documentation java public interface AddPredicate
 //                              documentation  @see #addIf(AddPredicate, EpoxyController)\n
     boolean addIf();
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#addIf().
 //                display_name addIf
-//                documentation ```java\npublic abstract boolean addIf()\n```
+//                signature_documentation java public abstract boolean addIf()
   }
 
   /**
@@ -857,13 +857,13 @@ public interface AddPredicate {
   protected final void addWithDebugValidation(@NonNull EpoxyController controller) {
 //                     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addWithDebugValidation().
 //                                            display_name addWithDebugValidation
-//                                            documentation ```java\nprotected final void addWithDebugValidation(EpoxyController controller)\n```
+//                                            signature_documentation java protected final void addWithDebugValidation(EpoxyController controller)
 //                                            documentation  This is used internally by generated models to turn on validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with an {@link EpoxyController}.\n
 //                                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                                     ^^^^^^^^^^ definition local 36
 //                                                                                display_name controller
-//                                                                                documentation ```java\n@NonNull\nEpoxyController controller\n```
+//                                                                                signature_documentation java @NonNull\nEpoxyController controller
     if (controller == null) {
 //      ^^^^^^^^^^ reference local 36
       throw new IllegalArgumentException("Controller cannot be null");
@@ -906,12 +906,12 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller)
         public void onInterceptorsStarted(EpoxyController controller) {
 //                  ^^^^^^^^^^^^^^^^^^^^^ definition local 38
 //                                        display_name onInterceptorsStarted
-//                                        documentation ```java\n@Override\npublic void onInterceptorsStarted(EpoxyController controller)\n```
+//                                        signature_documentation java @Override\npublic void onInterceptorsStarted(EpoxyController controller)
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                        ^^^^^^^^^^ definition local 39
 //                                                                   display_name controller
-//                                                                   documentation ```java\nEpoxyController controller\n```
+//                                                                   signature_documentation java EpoxyController controller
           currentlyInInterceptors = true;
 //        ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#currentlyInInterceptors.
         }
@@ -921,12 +921,12 @@ public void onInterceptorsStarted(EpoxyController controller) {
         public void onInterceptorsFinished(EpoxyController controller) {
 //                  ^^^^^^^^^^^^^^^^^^^^^^ definition local 40
 //                                         display_name onInterceptorsFinished
-//                                         documentation ```java\n@Override\npublic void onInterceptorsFinished(EpoxyController controller)\n```
+//                                         signature_documentation java @Override\npublic void onInterceptorsFinished(EpoxyController controller)
 //                                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                         ^^^^^^^^^^ definition local 41
 //                                                                    display_name controller
-//                                                                    documentation ```java\nEpoxyController controller\n```
+//                                                                    signature_documentation java EpoxyController controller
           hashCodeWhenAdded = EpoxyModel.this.hashCode();
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCodeWhenAdded.
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -942,7 +942,7 @@ public void onInterceptorsFinished(EpoxyController controller) {
   boolean isDebugValidationEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isDebugValidationEnabled().
 //                                 display_name isDebugValidationEnabled
-//                                 documentation ```java\nboolean isDebugValidationEnabled()\n```
+//                                 signature_documentation java boolean isDebugValidationEnabled()
     return firstControllerAddedTo != null;
 //         ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo.
   }
@@ -960,7 +960,7 @@ boolean isDebugValidationEnabled() {
   protected final void onMutation() {
 //                     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
 //                                display_name onMutation
-//                                documentation ```java\nprotected final void onMutation()\n```
+//                                signature_documentation java protected final void onMutation()
 //                                documentation  This is used internally by generated models to do validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with an {@link EpoxyController}.\n This method validates that it is ok to change this model. It is only valid if the model hasn't\n yet been added, or the change is being done from an {@link EpoxyController.Interceptor}\n callback.\n <p>\n This is also used to stage the model for implicitly adding it, if it is an AutoModel and\n implicit adding is enabled.\n
     // The model may be added to multiple controllers, in which case if it was already diffed
     // and added to an adapter in one controller we don't want to even allow interceptors
@@ -986,18 +986,18 @@ protected final void onMutation() {
   private static int getPosition(@NonNull EpoxyController controller,
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getPosition().
 //                               display_name getPosition
-//                               documentation ```java\nprivate static int getPosition(EpoxyController controller, EpoxyModel<?> model)\n```
+//                               signature_documentation java private static int getPosition(EpoxyController controller, EpoxyModel<?> model)
 //                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                        ^^^^^^^^^^ definition local 42
 //                                                                   display_name controller
-//                                                                   documentation ```java\n@NonNull\nEpoxyController controller\n```
+//                                                                   signature_documentation java @NonNull\nEpoxyController controller
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 43
 //                                 display_name model
-//                                 documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
+//                                 signature_documentation java @NonNull\nEpoxyModel<?> model
     // If the model was added to multiple controllers, or was removed from the controller and then
     // modified, this won't be correct. But those should be very rare cases that we don't need to
     // worry about
@@ -1029,16 +1029,16 @@ private static int getPosition(@NonNull EpoxyController controller,
   protected final void validateStateHasNotChangedSinceAdded(String descriptionOfChange,
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#validateStateHasNotChangedSinceAdded().
 //                                                          display_name validateStateHasNotChangedSinceAdded
-//                                                          documentation ```java\nprotected final void validateStateHasNotChangedSinceAdded(String descriptionOfChange, int modelPosition)\n```
+//                                                          signature_documentation java protected final void validateStateHasNotChangedSinceAdded(String descriptionOfChange, int modelPosition)
 //                                                          documentation  This is used internally by generated models to do validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with a {@link EpoxyController}. This\n method validates that the model's hashCode hasn't been changed since it was added to the\n controller. This is similar to {@link #onMutation()}, but that method is only used for\n specific model changes such as calling a setter. By checking the hashCode, this method allows\n us to catch more subtle changes, such as through setting a field directly or through changing\n an object that is set on the model.\n
 //                                                          ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                                                 ^^^^^^^^^^^^^^^^^^^ definition local 44
 //                                                                                     display_name descriptionOfChange
-//                                                                                     documentation ```java\nString descriptionOfChange\n```
+//                                                                                     signature_documentation java String descriptionOfChange
       int modelPosition) {
 //        ^^^^^^^^^^^^^ definition local 45
 //                      display_name modelPosition
-//                      documentation ```java\nint modelPosition\n```
+//                      signature_documentation java int modelPosition
     if (isDebugValidationEnabled()
 //      ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isDebugValidationEnabled().
         && !currentlyInInterceptors
@@ -1058,14 +1058,14 @@ protected final void validateStateHasNotChangedSinceAdded(String descriptionOfCh
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                      display_name equals
-//                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
+//                      signature_documentation java @Override\npublic boolean equals(Object o)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 46
 //                               display_name o
-//                               documentation ```java\nObject o\n```
+//                               signature_documentation java Object o
     if (this == o) {
 //              ^ reference local 46
       return true;
@@ -1080,7 +1080,7 @@ public boolean equals(Object o) {
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^ definition local 47
 //                     display_name that
-//                     documentation ```java\nEpoxyModel<?> that\n```
+//                     signature_documentation java EpoxyModel<?> that
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^ reference local 46
 
@@ -1107,14 +1107,14 @@ public boolean equals(Object o) {
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                    display_name hashCode
-//                    documentation ```java\n@Override\npublic int hashCode()\n```
+//                    signature_documentation java @Override\npublic int hashCode()
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = (int) (id ^ (id >>> 32));
 //      ^^^^^^ definition local 48
 //             display_name result
-//             documentation ```java\nint result\n```
+//             signature_documentation java int result
 //                      ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
 //                            ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
     result = 31 * result + getViewType();
@@ -1140,20 +1140,20 @@ public int hashCode() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                       display_name getSpanSize
-//                       documentation ```java\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)\n```
+//                       signature_documentation java public int getSpanSize(int totalSpanCount, int position, int itemCount)
 //                       documentation  Subclasses can override this if they want their view to take up more than one span in a grid\n layout.\n\n @param totalSpanCount The number of spans in the grid\n @param position       The position of the model\n @param itemCount      The total number of items in the adapter\n
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize().
 //                           ^^^^^^^^^^^^^^ definition local 49
 //                                          display_name totalSpanCount
-//                                          documentation ```java\nint totalSpanCount\n```
+//                                          signature_documentation java int totalSpanCount
 //                                               ^^^^^^^^ definition local 50
 //                                                        display_name position
-//                                                        documentation ```java\nint position\n```
+//                                                        signature_documentation java int position
 //                                                             ^^^^^^^^^ definition local 51
 //                                                                       display_name itemCount
-//                                                                       documentation ```java\nint itemCount\n```
+//                                                                       signature_documentation java int itemCount
     return 1;
   }
 
@@ -1162,12 +1162,12 @@ public EpoxyModel<T> spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride().
 //                                      display_name spanSizeOverride
-//                                      documentation ```java\npublic EpoxyModel<T> spanSizeOverride(SpanSizeOverrideCallback spanSizeCallback)\n```
+//                                      signature_documentation java public EpoxyModel<T> spanSizeOverride(SpanSizeOverrideCallback spanSizeCallback)
 //                                       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
 //                                                                         ^^^^^^^^^^^^^^^^ definition local 52
 //                                                                                          display_name spanSizeCallback
-//                                                                                          documentation ```java\n@Nullable\nSpanSizeOverrideCallback spanSizeCallback\n```
+//                                                                                          signature_documentation java @Nullable\nSpanSizeOverrideCallback spanSizeCallback
     this.spanSizeOverride = spanSizeCallback;
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
 //                          ^^^^^^^^^^^^^^^^ reference local 52
@@ -1177,20 +1177,20 @@ public EpoxyModel<T> spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz
   public interface SpanSizeOverrideCallback {
 //                 ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
 //                                          display_name SpanSizeOverrideCallback
-//                                          documentation ```java\npublic interface SpanSizeOverrideCallback\n```
+//                                          signature_documentation java public interface SpanSizeOverrideCallback
     int getSpanSize(int totalSpanCount, int position, int itemCount);
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize().
 //                  display_name getSpanSize
-//                  documentation ```java\npublic abstract int getSpanSize(int totalSpanCount, int position, int itemCount)\n```
+//                  signature_documentation java public abstract int getSpanSize(int totalSpanCount, int position, int itemCount)
 //                      ^^^^^^^^^^^^^^ definition local 53
 //                                     display_name totalSpanCount
-//                                     documentation ```java\nint totalSpanCount\n```
+//                                     signature_documentation java int totalSpanCount
 //                                          ^^^^^^^^ definition local 54
 //                                                   display_name position
-//                                                   documentation ```java\nint position\n```
+//                                                   signature_documentation java int position
 //                                                        ^^^^^^^^^ definition local 55
 //                                                                  display_name itemCount
-//                                                                  documentation ```java\nint itemCount\n```
+//                                                                  signature_documentation java int itemCount
   }
 
   /**
@@ -1200,17 +1200,17 @@ public interface SpanSizeOverrideCallback {
   public final int spanSize(int totalSpanCount, int position, int itemCount) {
 //                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSize().
 //                          display_name spanSize
-//                          documentation ```java\npublic final int spanSize(int totalSpanCount, int position, int itemCount)\n```
+//                          signature_documentation java public final int spanSize(int totalSpanCount, int position, int itemCount)
 //                          documentation  Returns the actual span size of this model, using the {@link SpanSizeOverrideCallback} if one\n was set, otherwise using the value from {@link #getSpanSize(int, int, int)}\n
 //                              ^^^^^^^^^^^^^^ definition local 56
 //                                             display_name totalSpanCount
-//                                             documentation ```java\nint totalSpanCount\n```
+//                                             signature_documentation java int totalSpanCount
 //                                                  ^^^^^^^^ definition local 57
 //                                                           display_name position
-//                                                           documentation ```java\nint position\n```
+//                                                           signature_documentation java int position
 //                                                                ^^^^^^^^^ definition local 58
 //                                                                          display_name itemCount
-//                                                                          documentation ```java\nint itemCount\n```
+//                                                                          signature_documentation java int itemCount
     if (spanSizeOverride != null) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
       return spanSizeOverride.getSpanSize(totalSpanCount, position, itemCount);
@@ -1240,7 +1240,7 @@ public EpoxyModel<T> show() {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show().
 //                          display_name show
-//                          documentation ```java\n@NonNull\npublic EpoxyModel<T> show()\n```
+//                          signature_documentation java @NonNull\npublic EpoxyModel<T> show()
 //                          documentation  Change the visibility of the model so that it's view is shown. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
     return show(true);
 //         ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show(+1).
@@ -1258,11 +1258,11 @@ public EpoxyModel<T> show(boolean show) {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show(+1).
 //                          display_name show
-//                          documentation ```java\n@NonNull\npublic EpoxyModel<T> show(boolean show)\n```
+//                          signature_documentation java @NonNull\npublic EpoxyModel<T> show(boolean show)
 //                          documentation  Change the visibility of the model's view. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
 //                                  ^^^^ definition local 59
 //                                       display_name show
-//                                       documentation ```java\nboolean show\n```
+//                                       signature_documentation java boolean show
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
     shown = show;
@@ -1283,7 +1283,7 @@ public EpoxyModel<T> hide() {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hide().
 //                          display_name hide
-//                          documentation ```java\n@NonNull\npublic EpoxyModel<T> hide()\n```
+//                          signature_documentation java @NonNull\npublic EpoxyModel<T> hide()
 //                          documentation  Change the visibility of the model so that it's view is hidden. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
     return show(false);
 //         ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show(+1).
@@ -1296,7 +1296,7 @@ public EpoxyModel<T> hide() {
   public boolean isShown() {
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isShown().
 //                       display_name isShown
-//                       documentation ```java\npublic boolean isShown()\n```
+//                       signature_documentation java public boolean isShown()
 //                       documentation  Whether the model's view should be shown on screen. If false it won't be inflated and drawn,\n and will be like it was never added to the recycler view.\n
     return shown;
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shown.
@@ -1308,7 +1308,7 @@ public boolean isShown() {
   public boolean shouldSaveViewState() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shouldSaveViewState().
 //                                   display_name shouldSaveViewState
-//                                   documentation ```java\npublic boolean shouldSaveViewState()\n```
+//                                   signature_documentation java public boolean shouldSaveViewState()
 //                                   documentation  Whether the adapter should save the state of the view bound to this model.\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(+1).
     return false;
@@ -1326,14 +1326,14 @@ public boolean shouldSaveViewState() {
   public boolean onFailedToRecycleView(@NonNull T view) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
 //                                     display_name onFailedToRecycleView
-//                                     documentation ```java\npublic boolean onFailedToRecycleView(T view)\n```
+//                                     signature_documentation java public boolean onFailedToRecycleView(T view)
 //                                     documentation  Called if the RecyclerView failed to recycle this model's view. You can take this opportunity\n to clear the animation(s) that affect the View's transient state and return <code>true</code>\n so that the View can be recycled. Keep in mind that the View in question is already removed\n from the RecyclerView.\n\n @return True if the View should be recycled, false otherwise\n @see EpoxyAdapter#onFailedToRecycleView(androidx.recyclerview.widget.RecyclerView.ViewHolder)\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                                ^^^^ definition local 60
 //                                                     display_name view
-//                                                     documentation ```java\n@NonNull\nT view\n```
+//                                                     signature_documentation java @NonNull\nT view
     return false;
   }
 
@@ -1345,7 +1345,7 @@ public boolean onFailedToRecycleView(@NonNull T view) {
   public void onViewAttachedToWindow(@NonNull T view) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
-//                                   documentation ```java\npublic void onViewAttachedToWindow(T view)\n```
+//                                   signature_documentation java public void onViewAttachedToWindow(T view)
 //                                   documentation  Called when this model's view is attached to the window.\n\n @see EpoxyAdapter#onViewAttachedToWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder)\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
@@ -1353,7 +1353,7 @@ public void onViewAttachedToWindow(@NonNull T view) {
 //                                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                              ^^^^ definition local 61
 //                                                   display_name view
-//                                                   documentation ```java\n@NonNull\nT view\n```
+//                                                   signature_documentation java @NonNull\nT view
 
   }
 
@@ -1366,7 +1366,7 @@ public void onViewAttachedToWindow(@NonNull T view) {
   public void onViewDetachedFromWindow(@NonNull T view) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
-//                                     documentation ```java\npublic void onViewDetachedFromWindow(T view)\n```
+//                                     signature_documentation java public void onViewDetachedFromWindow(T view)
 //                                     documentation  Called when this model's view is detached from the the window.\n\n @see EpoxyAdapter#onViewDetachedFromWindow(androidx.recyclerview.widget.RecyclerView\n .ViewHolder)\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
@@ -1374,7 +1374,7 @@ public void onViewDetachedFromWindow(@NonNull T view) {
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                                ^^^^ definition local 62
 //                                                     display_name view
-//                                                     documentation ```java\n@NonNull\nT view\n```
+//                                                     signature_documentation java @NonNull\nT view
 
   }
 
@@ -1384,7 +1384,7 @@ public String toString() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#toString().
 //                       display_name toString
-//                       documentation ```java\n@Override\npublic String toString()\n```
+//                       signature_documentation java @Override\npublic String toString()
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return getClass().getSimpleName() + "{"
 //         ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
index 59ec009f3..0d81cfdc3 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
@@ -99,7 +99,7 @@
 public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                           display_name EpoxyModelGroup
-//                           documentation ```java\n@SuppressWarnings("rawtypes")\npublic class EpoxyModelGroup\n```
+//                           signature_documentation java @SuppressWarnings("rawtypes")\npublic class EpoxyModelGroup
 //                           documentation  An {@link EpoxyModel} that contains other models, and allows you to combine those models in\n whatever view configuration you want.\n <p>\n The constructors take a list of models and a layout resource. The layout must have a viewgroup as\n its top level view; it determines how the view of each model is laid out. There are two ways to\n specify this\n <p>\n 1. Leave the viewgroup empty. The view for each model will be inflated and added in order. This\n works fine if you don't need to include any other views, your model views don't need their layout\n params changed, and your views don't need ids (eg for saving state).\n <p>\n Alternatively you can have nested view groups, with the innermost viewgroup given the id\n "epoxy_model_group_child_container" to mark it as the viewgroup that should have the model views\n added to it. The viewgroup marked with this id should be empty. This allows you to nest\n viewgroups, such as a LinearLayout inside of a CardView.\n <p>\n 2. Include a {@link ViewStub} for each of the models in the list. There should be at least as\n many view stubs as models. Extra stubs will be ignored. Each model will have its view replace the\n stub in order of the view stub's position in the view group. That is, the view group's children\n will be iterated through in order. The first view stub found will be used for the first model in\n the models list, the second view stub will be used for the second model, and so on. A depth first\n recursive search through nested viewgroups is done to find these viewstubs.\n <p>\n The layout can be of any ViewGroup subclass, and can have arbitrary other child views besides the\n view stubs. It can arrange the views and view stubs however is needed.\n <p>\n Any layout param options set on the view stubs will be transferred to the corresponding model\n view by default. If you want a model to keep the layout params from it's own layout resource you\n can override {@link #useViewStubLayoutParams(EpoxyModel, int)}\n <p>\n If you want to override the id used for a model's view you can set {@link\n ViewStub#setInflatedId(int)} via xml. That id will be transferred over to the view taking that\n stub's place. This is necessary if you want your model to save view state, since without this the\n model's view won't have an id to associate the saved state with.\n <p>\n By default this model inherits the same id as the first model in the list. Call {@link #id(long)}\n to override that if needed.\n <p>\n When a model group is recycled, its child views are automatically recycled to a pool that is\n shared with all other model groups in the activity. This enables model groups to more efficiently\n manage their children. The shared pool is cleaned up when the activity is destroyed.\n
 //                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#
@@ -111,12 +111,12 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                                           display_name models
-//                                           documentation ```java\nprotected final List<EpoxyModel<?>> models\n```
+//                                           signature_documentation java protected final List<EpoxyModel<?>> models
 
   private boolean shouldSaveViewStateDefault = false;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewStateDefault.
 //                                           display_name shouldSaveViewStateDefault
-//                                           documentation ```java\nprivate boolean shouldSaveViewStateDefault\n```
+//                                           signature_documentation java private boolean shouldSaveViewStateDefault
 
   @Nullable
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
@@ -124,7 +124,7 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
 //        ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Boolean#
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState.
 //                                    display_name shouldSaveViewState
-//                                    documentation ```java\n@Nullable\nprivate Boolean shouldSaveViewState\n```
+//                                    signature_documentation java @Nullable\nprivate Boolean shouldSaveViewState
 
   /**
    * @param layoutRes The layout to use with these models.
@@ -133,17 +133,17 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
   public EpoxyModelGroup(@LayoutRes int layoutRes, Collection<? extends EpoxyModel<?>> models) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\npublic EpoxyModelGroup(int layoutRes, Collection<? extends EpoxyModel<?>> models)\n```
+//                       signature_documentation java public EpoxyModelGroup(int layoutRes, Collection<? extends EpoxyModel<?>> models)
 //                       documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                      ^^^^^^^^^ definition local 0
 //                                                display_name layoutRes
-//                                                documentation ```java\n@LayoutRes\nint layoutRes\n```
+//                                                signature_documentation java @LayoutRes\nint layoutRes
 //                                                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                     ^^^^^^ definition local 1
 //                                                                                            display_name models
-//                                                                                            documentation ```java\nCollection<? extends EpoxyModel<?>> models\n```
+//                                                                                            signature_documentation java Collection<? extends EpoxyModel<?>> models
     this(layoutRes, new ArrayList<>(models));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
 //       ^^^^^^^^^ reference local 0
@@ -158,16 +158,16 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, Collection<? extends EpoxyModel
   public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel<?>... models) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+1).
 //                       display_name <init>
-//                       documentation ```java\npublic EpoxyModelGroup(int layoutRes, EpoxyModel<?>[] models)\n```
+//                       signature_documentation java public EpoxyModelGroup(int layoutRes, EpoxyModel<?>[] models)
 //                       documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                      ^^^^^^^^^ definition local 2
 //                                                display_name layoutRes
-//                                                documentation ```java\n@LayoutRes\nint layoutRes\n```
+//                                                signature_documentation java @LayoutRes\nint layoutRes
 //                                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^^ definition local 3
 //                                                                         display_name models
-//                                                                         documentation ```java\nEpoxyModel<?>[] models\n```
+//                                                                         signature_documentation java EpoxyModel<?>[] models
     this(layoutRes, new ArrayList<>(Arrays.asList(models)));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
 //       ^^^^^^^^^ reference local 2
@@ -184,17 +184,17 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel<?>... models) {
   private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
 //        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
 //                        display_name <init>
-//                        documentation ```java\nprivate EpoxyModelGroup(int layoutRes, List<EpoxyModel<?>> models)\n```
+//                        signature_documentation java private EpoxyModelGroup(int layoutRes, List<EpoxyModel<?>> models)
 //                        documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                         ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                       ^^^^^^^^^ definition local 4
 //                                                 display_name layoutRes
-//                                                 documentation ```java\n@LayoutRes\nint layoutRes\n```
+//                                                 signature_documentation java @LayoutRes\nint layoutRes
 //                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                      ^^^^^^ definition local 5
 //                                                                             display_name models
-//                                                                             documentation ```java\nList<EpoxyModel<?>> models\n```
+//                                                                             signature_documentation java List<EpoxyModel<?>> models
     if (models.isEmpty()) {
 //      ^^^^^^ reference local 5
 //             ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -217,12 +217,12 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
     boolean saveState = false;
 //          ^^^^^^^^^ definition local 6
 //                    display_name saveState
-//                    documentation ```java\nboolean saveState\n```
+//                    signature_documentation java boolean saveState
     for (EpoxyModel<?> model : models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 7
 //                           display_name model
-//                           documentation ```java\nEpoxyModel<?> model\n```
+//                           signature_documentation java EpoxyModel<?> model
 //                             ^^^^^^ reference local 5
       if (model.shouldSaveViewState()) {
 //        ^^^^^ reference local 7
@@ -244,7 +244,7 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
   protected EpoxyModelGroup() {
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+3).
 //                          display_name <init>
-//                          documentation ```java\nprotected EpoxyModelGroup()\n```
+//                          signature_documentation java protected EpoxyModelGroup()
 //                          documentation  Constructor use for DSL\n
     models = new ArrayList<>();
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
@@ -259,12 +259,12 @@ protected EpoxyModelGroup() {
   protected EpoxyModelGroup(@LayoutRes int layoutRes) {
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+4).
 //                          display_name <init>
-//                          documentation ```java\nprotected EpoxyModelGroup(int layoutRes)\n```
+//                          signature_documentation java protected EpoxyModelGroup(int layoutRes)
 //                          documentation  Constructor use for DSL\n
 //                           ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                         ^^^^^^^^^ definition local 8
 //                                                   display_name layoutRes
-//                                                   documentation ```java\n@LayoutRes\nint layoutRes\n```
+//                                                   signature_documentation java @LayoutRes\nint layoutRes
     this();
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+3).
     layout(layoutRes);
@@ -275,12 +275,12 @@ protected EpoxyModelGroup(@LayoutRes int layoutRes) {
   protected void addModel(@NonNull EpoxyModel<?> model) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#addModel().
 //                        display_name addModel
-//                        documentation ```java\nprotected void addModel(EpoxyModel<?> model)\n```
+//                        signature_documentation java protected void addModel(EpoxyModel<?> model)
 //                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^ definition local 9
 //                                                     display_name model
-//                                                     documentation ```java\n@NonNull\nEpoxyModel<?> model\n```
+//                                                     signature_documentation java @NonNull\nEpoxyModel<?> model
     // By default we save view state if any of the models need to save state.
     shouldSaveViewStateDefault |= model.shouldSaveViewState();
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewStateDefault.
@@ -299,14 +299,14 @@ protected void addModel(@NonNull EpoxyModel<?> model) {
   public void bind(@NonNull ModelGroupHolder holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
 //                 display_name bind
-//                 documentation ```java\n@CallSuper\n@Override\npublic void bind(unresolved_type holder)\n```
+//                 signature_documentation java @CallSuper\n@Override\npublic void bind(unresolved_type holder)
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                           ^^^^^^ definition local 10
 //                                                  display_name holder
-//                                                  documentation ```java\n@NonNull\nunresolved_type holder\n```
+//                                                  signature_documentation java @NonNull\nunresolved_type holder
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                ^^^^^^ reference local 10
@@ -316,19 +316,19 @@ public void bind(@NonNull ModelGroupHolder holder) {
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 12
 //                        display_name onModel
-//                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
+//                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 13
 //                                         display_name model
-//                                         documentation ```java\nEpoxyModel model\n```
+//                                         signature_documentation java EpoxyModel model
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 14
 //                                                                     display_name viewHolder
-//                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                     signature_documentation java EpoxyViewHolder viewHolder
 //                                                                          ^^^^^^^^^^ definition local 15
 //                                                                                     display_name modelIndex
-//                                                                                     documentation ```java\nint modelIndex\n```
+//                                                                                     signature_documentation java int modelIndex
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                        ^^^^^ reference local 13
@@ -351,20 +351,20 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
   public void bind(@NonNull ModelGroupHolder holder, @NonNull final List<Object> payloads) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
 //                 display_name bind
-//                 documentation ```java\n@CallSuper\n@Override\npublic void bind(unresolved_type holder, List<Object> payloads)\n```
+//                 signature_documentation java @CallSuper\n@Override\npublic void bind(unresolved_type holder, List<Object> payloads)
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                           ^^^^^^ definition local 16
 //                                                  display_name holder
-//                                                  documentation ```java\n@NonNull\nunresolved_type holder\n```
+//                                                  signature_documentation java @NonNull\nunresolved_type holder
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                               ^^^^^^^^ definition local 17
 //                                                                                        display_name payloads
-//                                                                                        documentation ```java\n@NonNull\nfinal List<Object> payloads\n```
+//                                                                                        signature_documentation java @NonNull\nfinal List<Object> payloads
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                ^^^^^^ reference local 16
@@ -374,19 +374,19 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull final List<Object> p
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 19
 //                        display_name onModel
-//                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
+//                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 20
 //                                         display_name model
-//                                         documentation ```java\nEpoxyModel model\n```
+//                                         signature_documentation java EpoxyModel model
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 21
 //                                                                     display_name viewHolder
-//                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                     signature_documentation java EpoxyViewHolder viewHolder
 //                                                                          ^^^^^^^^^^ definition local 22
 //                                                                                     display_name modelIndex
-//                                                                                     documentation ```java\nint modelIndex\n```
+//                                                                                     signature_documentation java int modelIndex
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                        ^^^^^ reference local 20
@@ -407,19 +407,19 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
   public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                 display_name bind
-//                 documentation ```java\n@Override\npublic void bind(unresolved_type holder, EpoxyModel<?> previouslyBoundModel)\n```
+//                 signature_documentation java @Override\npublic void bind(unresolved_type holder, EpoxyModel<?> previouslyBoundModel)
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                           ^^^^^^ definition local 23
 //                                                  display_name holder
-//                                                  documentation ```java\n@NonNull\nunresolved_type holder\n```
+//                                                  signature_documentation java @NonNull\nunresolved_type holder
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^^^^^^^^^^^^^^^^^^^^ definition local 24
 //                                                                                               display_name previouslyBoundModel
-//                                                                                               documentation ```java\n@NonNull\nEpoxyModel<?> previouslyBoundModel\n```
+//                                                                                               signature_documentation java @NonNull\nEpoxyModel<?> previouslyBoundModel
     if (!(previouslyBoundModel instanceof EpoxyModelGroup)) {
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 24
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
@@ -433,7 +433,7 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                        ^^^^^^^^^^^^^ definition local 25
 //                                      display_name previousGroup
-//                                      documentation ```java\nfinal EpoxyModelGroup previousGroup\n```
+//                                      signature_documentation java final EpoxyModelGroup previousGroup
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                                                          ^^^^^^^^^^^^^^^^^^^^ reference local 24
 
@@ -446,19 +446,19 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 27
 //                        display_name onModel
-//                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
+//                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 28
 //                                         display_name model
-//                                         documentation ```java\nEpoxyModel model\n```
+//                                         signature_documentation java EpoxyModel model
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 29
 //                                                                     display_name viewHolder
-//                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                     signature_documentation java EpoxyViewHolder viewHolder
 //                                                                          ^^^^^^^^^^ definition local 30
 //                                                                                     display_name modelIndex
-//                                                                                     documentation ```java\nint modelIndex\n```
+//                                                                                     signature_documentation java int modelIndex
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                        ^^^^^ reference local 28
@@ -473,7 +473,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^^^ definition local 31
 //                                    display_name previousModel
-//                                    documentation ```java\nEpoxyModel<?> previousModel\n```
+//                                    signature_documentation java EpoxyModel<?> previousModel
 //                                      ^^^^^^^^^^^^^ reference local 25
 //                                                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                                                           ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -509,15 +509,15 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
   private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHolder) {
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                                      display_name setViewVisibility
-//                                      documentation ```java\nprivate static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHolder)\n```
+//                                      signature_documentation java private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHolder)
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^ definition local 32
 //                                                       display_name model
-//                                                       documentation ```java\nEpoxyModel model\n```
+//                                                       signature_documentation java EpoxyModel model
 //                                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                        ^^^^^^^^^^ definition local 33
 //                                                                                   display_name viewHolder
-//                                                                                   documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                                   signature_documentation java EpoxyViewHolder viewHolder
     if (model.isShown()) {
 //      ^^^^^ reference local 32
 //            ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isShown().
@@ -544,14 +544,14 @@ private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHold
   public void unbind(@NonNull ModelGroupHolder holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
 //                   display_name unbind
-//                   documentation ```java\n@CallSuper\n@Override\npublic void unbind(unresolved_type holder)\n```
+//                   signature_documentation java @CallSuper\n@Override\npublic void unbind(unresolved_type holder)
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                             ^^^^^^ definition local 34
 //                                                    display_name holder
-//                                                    documentation ```java\n@NonNull\nunresolved_type holder\n```
+//                                                    signature_documentation java @NonNull\nunresolved_type holder
     holder.unbindGroup();
 //  ^^^^^^ reference local 34
 //         ^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#unbindGroup#
@@ -564,13 +564,13 @@ public void unbind(@NonNull ModelGroupHolder holder) {
   public void onViewAttachedToWindow(ModelGroupHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
-//                                   documentation ```java\n@CallSuper\n@Override\npublic void onViewAttachedToWindow(unresolved_type holder)\n```
+//                                   signature_documentation java @CallSuper\n@Override\npublic void onViewAttachedToWindow(unresolved_type holder)
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
 //                                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                                    ^^^^^^ definition local 35
 //                                                           display_name holder
-//                                                           documentation ```java\nunresolved_type holder\n```
+//                                                           signature_documentation java unresolved_type holder
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                ^^^^^^ reference local 35
@@ -580,19 +580,19 @@ public void onViewAttachedToWindow(ModelGroupHolder holder) {
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 37
 //                        display_name onModel
-//                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
+//                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 38
 //                                         display_name model
-//                                         documentation ```java\nEpoxyModel model\n```
+//                                         signature_documentation java EpoxyModel model
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 39
 //                                                                     display_name viewHolder
-//                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                     signature_documentation java EpoxyViewHolder viewHolder
 //                                                                          ^^^^^^^^^^ definition local 40
 //                                                                                     display_name modelIndex
-//                                                                                     documentation ```java\nint modelIndex\n```
+//                                                                                     signature_documentation java int modelIndex
         //noinspection unchecked
         model.onViewAttachedToWindow(viewHolder.objectToBind());
 //      ^^^^^ reference local 38
@@ -610,13 +610,13 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
   public void onViewDetachedFromWindow(ModelGroupHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
-//                                     documentation ```java\n@CallSuper\n@Override\npublic void onViewDetachedFromWindow(unresolved_type holder)\n```
+//                                     signature_documentation java @CallSuper\n@Override\npublic void onViewDetachedFromWindow(unresolved_type holder)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                                      ^^^^^^ definition local 41
 //                                                             display_name holder
-//                                                             documentation ```java\nunresolved_type holder\n```
+//                                                             signature_documentation java unresolved_type holder
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                ^^^^^^ reference local 41
@@ -626,19 +626,19 @@ public void onViewDetachedFromWindow(ModelGroupHolder holder) {
       public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) {
 //                ^^^^^^^ definition local 43
 //                        display_name onModel
-//                        documentation ```java\n@Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
+//                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 44
 //                                         display_name model
-//                                         documentation ```java\nEpoxyModel model\n```
+//                                         signature_documentation java EpoxyModel model
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 45
 //                                                                     display_name viewHolder
-//                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                     signature_documentation java EpoxyViewHolder viewHolder
 //                                                                          ^^^^^^^^^^ definition local 46
 //                                                                                     display_name modelIndex
-//                                                                                     documentation ```java\nint modelIndex\n```
+//                                                                                     signature_documentation java int modelIndex
         //noinspection unchecked
         model.onViewDetachedFromWindow(viewHolder.objectToBind());
 //      ^^^^^ reference local 44
@@ -652,29 +652,29 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
   private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callback) {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                           display_name iterateModels
-//                           documentation ```java\nprivate void iterateModels(unresolved_type holder, IterateModelsCallback callback)\n```
+//                           signature_documentation java private void iterateModels(unresolved_type holder, IterateModelsCallback callback)
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                            ^^^^^^ definition local 47
 //                                                   display_name holder
-//                                                   documentation ```java\nunresolved_type holder\n```
+//                                                   signature_documentation java unresolved_type holder
 //                                                    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
 //                                                                          ^^^^^^^^ definition local 48
 //                                                                                   display_name callback
-//                                                                                   documentation ```java\nIterateModelsCallback callback\n```
+//                                                                                   signature_documentation java IterateModelsCallback callback
     holder.bindGroupIfNeeded(this);
 //  ^^^^^^ reference local 47
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#bindGroupIfNeeded#
     int modelCount = models.size();
 //      ^^^^^^^^^^ definition local 49
 //                 display_name modelCount
-//                 documentation ```java\nint modelCount\n```
+//                 signature_documentation java int modelCount
 //                   ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
     for (int i = 0; i < modelCount; i++) {
 //           ^ definition local 50
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 50
 //                      ^^^^^^^^^^ reference local 49
 //                                  ^ reference local 50
@@ -695,22 +695,22 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba
   private interface IterateModelsCallback {
 //                  ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
 //                                        display_name IterateModelsCallback
-//                                        documentation ```java\nprivate interface IterateModelsCallback\n```
+//                                        signature_documentation java private interface IterateModelsCallback
     void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex);
 //       ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //               display_name onModel
-//               documentation ```java\npublic abstract void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)\n```
+//               signature_documentation java public abstract void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                          ^^^^^ definition local 51
 //                                display_name model
-//                                documentation ```java\nEpoxyModel model\n```
+//                                signature_documentation java EpoxyModel model
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 52
 //                                                            display_name viewHolder
-//                                                            documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                            signature_documentation java EpoxyViewHolder viewHolder
 //                                                                 ^^^^^^^^^^ definition local 53
 //                                                                            display_name modelIndex
-//                                                                            documentation ```java\nint modelIndex\n```
+//                                                                            signature_documentation java int modelIndex
   }
 
   @Override
@@ -718,17 +718,17 @@ private interface IterateModelsCallback {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
 //                       display_name getSpanSize
-//                       documentation ```java\n@Override\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)\n```
+//                       signature_documentation java @Override\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^^^^^^ definition local 54
 //                                          display_name totalSpanCount
-//                                          documentation ```java\nint totalSpanCount\n```
+//                                          signature_documentation java int totalSpanCount
 //                                               ^^^^^^^^ definition local 55
 //                                                        display_name position
-//                                                        documentation ```java\nint position\n```
+//                                                        signature_documentation java int position
 //                                                             ^^^^^^^^^ definition local 56
 //                                                                       display_name itemCount
-//                                                                       documentation ```java\nint itemCount\n```
+//                                                                       signature_documentation java int itemCount
     // Defaults to using the span size of the first model. Override this if you need to customize it
     return models.get(0).spanSize(totalSpanCount, position, itemCount);
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
@@ -744,7 +744,7 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
   protected final int getDefaultLayout() {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getDefaultLayout().
 //                                     display_name getDefaultLayout
-//                                     documentation ```java\n@Override\nprotected final int getDefaultLayout()\n```
+//                                     signature_documentation java @Override\nprotected final int getDefaultLayout()
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     throw new UnsupportedOperationException(
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`(+1).
@@ -757,10 +757,10 @@ public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState().
 //                                           display_name shouldSaveViewState
-//                                           documentation ```java\n@NonNull\npublic EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState)\n```
+//                                           signature_documentation java @NonNull\npublic EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState)
 //                                                   ^^^^^^^^^^^^^^^^^^^ definition local 57
 //                                                                       display_name shouldSaveViewState
-//                                                                       documentation ```java\nboolean shouldSaveViewState\n```
+//                                                                       signature_documentation java boolean shouldSaveViewState
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
     this.shouldSaveViewState = shouldSaveViewState;
@@ -774,7 +774,7 @@ public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) {
   public boolean shouldSaveViewState() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(+1).
 //                                   display_name shouldSaveViewState
-//                                   documentation ```java\n@Override\npublic boolean shouldSaveViewState()\n```
+//                                   signature_documentation java @Override\npublic boolean shouldSaveViewState()
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shouldSaveViewState().
     // By default state is saved if any of the models have saved state enabled.
     // Override this if you need custom behavior.
@@ -800,15 +800,15 @@ public boolean shouldSaveViewState() {
   protected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition) {
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#useViewStubLayoutParams().
 //                                          display_name useViewStubLayoutParams
-//                                          documentation ```java\nprotected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition)\n```
+//                                          signature_documentation java protected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition)
 //                                          documentation  Whether the layout params set on the view stub for the given model should be carried over to\n the model's view. Default is true\n <p>\n Set this to false if you want the layout params on the model's layout resource to be kept.\n\n @param model         The model who's view is being created\n @param modelPosition The position of the model in the models list\n
 //                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^ definition local 58
 //                                                              display_name model
-//                                                              documentation ```java\nEpoxyModel<?> model\n```
+//                                                              signature_documentation java EpoxyModel<?> model
 //                                                                   ^^^^^^^^^^^^^ definition local 59
 //                                                                                 display_name modelPosition
-//                                                                                 documentation ```java\nint modelPosition\n```
+//                                                                                 signature_documentation java int modelPosition
     return true;
   }
 
@@ -818,13 +818,13 @@ protected final ModelGroupHolder createNewHolder(@NonNull ViewParent parent) {
 //                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#createNewHolder().
 //                                                 display_name createNewHolder
-//                                                 documentation ```java\n@Override\nprotected final unresolved_type createNewHolder(unresolved_type parent)\n```
+//                                                 signature_documentation java @Override\nprotected final unresolved_type createNewHolder(unresolved_type parent)
 //                                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#createNewHolder().
 //                                                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                                                     ^^^^^^ definition local 60
 //                                                                            display_name parent
-//                                                                            documentation ```java\n@NonNull\nunresolved_type parent\n```
+//                                                                            signature_documentation java @NonNull\nunresolved_type parent
     return new ModelGroupHolder(parent);
 //                              ^^^^^^ reference local 60
   }
@@ -834,13 +834,13 @@ protected final ModelGroupHolder createNewHolder(@NonNull ViewParent parent) {
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
 //                      display_name equals
-//                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
+//                      signature_documentation java @Override\npublic boolean equals(Object o)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 61
 //                               display_name o
-//                               documentation ```java\nObject o\n```
+//                               signature_documentation java Object o
     if (this == o) {
 //              ^ reference local 61
       return true;
@@ -861,7 +861,7 @@ public boolean equals(Object o) {
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                  ^^^^ definition local 62
 //                       display_name that
-//                       documentation ```java\nEpoxyModelGroup that\n```
+//                       signature_documentation java EpoxyModelGroup that
 //                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                                           ^ reference local 61
 
@@ -877,13 +877,13 @@ public boolean equals(Object o) {
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#hashCode().
 //                    display_name hashCode
-//                    documentation ```java\n@Override\npublic int hashCode()\n```
+//                    signature_documentation java @Override\npublic int hashCode()
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = super.hashCode();
 //      ^^^^^^ definition local 63
 //             display_name result
-//             documentation ```java\nint result\n```
+//             signature_documentation java int result
 //               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#super.
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
     result = 31 * result + models.hashCode();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
index c90952451..c663cb12f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
@@ -41,7 +41,7 @@
 public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
 //                                            display_name EpoxyModelTouchCallback
-//                                            documentation ```java\npublic abstract class EpoxyModelTouchCallback<T extends EpoxyModel>\n```
+//                                            signature_documentation java public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                                            documentation  A wrapper around {@link androidx.recyclerview.widget.ItemTouchHelper.Callback} to enable\n easier touch support when working with Epoxy models.\n <p>\n For simplicity you can use {@link EpoxyTouchHelper} to set up touch handling via this class for\n you instead of using this class directly. However, you may choose to use this class directly with\n your own {@link ItemTouchHelper} if you need extra flexibility or customization.\n
 //                                            relationship is_implementation semanticdb maven . . ItemTouchHelper/Callback#
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
@@ -50,7 +50,7 @@ public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                              display_name T
-//                                              documentation ```java\nT extends EpoxyModel\n```
+//                                              signature_documentation java T extends EpoxyModel
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
     extends EpoxyTouchHelperCallback implements EpoxyDragCallback<T>, EpoxySwipeCallback<T> {
 //          ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#
@@ -62,45 +62,45 @@ public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
   private static final int TOUCH_DEBOUNCE_MILLIS = 300;
 //                         ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#TOUCH_DEBOUNCE_MILLIS.
 //                                               display_name TOUCH_DEBOUNCE_MILLIS
-//                                               documentation ```java\nprivate static final int TOUCH_DEBOUNCE_MILLIS\n```
+//                                               signature_documentation java private static final int TOUCH_DEBOUNCE_MILLIS
 
   @Nullable private final EpoxyController controller;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                        ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#controller.
 //                                                   display_name controller
-//                                                   documentation ```java\n@Nullable\nprivate final EpoxyController controller\n```
+//                                                   signature_documentation java @Nullable\nprivate final EpoxyController controller
   private final Class<T> targetModelClass;
 //              ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#targetModelClass.
 //                                        display_name targetModelClass
-//                                        documentation ```java\nprivate final Class<T> targetModelClass\n```
+//                                        signature_documentation java private final Class<T> targetModelClass
   private EpoxyViewHolder holderBeingDragged;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                        ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingDragged.
 //                                           display_name holderBeingDragged
-//                                           documentation ```java\nprivate EpoxyViewHolder holderBeingDragged\n```
+//                                           signature_documentation java private EpoxyViewHolder holderBeingDragged
   private EpoxyViewHolder holderBeingSwiped;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingSwiped.
 //                                          display_name holderBeingSwiped
-//                                          documentation ```java\nprivate EpoxyViewHolder holderBeingSwiped\n```
+//                                          signature_documentation java private EpoxyViewHolder holderBeingSwiped
 
   public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class<T> targetModelClass) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#`<init>`().
 //                               display_name <init>
-//                               documentation ```java\npublic EpoxyModelTouchCallback(EpoxyController controller, Class<T> targetModelClass)\n```
+//                               signature_documentation java public EpoxyModelTouchCallback(EpoxyController controller, Class<T> targetModelClass)
 //                                ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                         ^^^^^^^^^^ definition local 0
 //                                                                    display_name controller
-//                                                                    documentation ```java\n@Nullable\nEpoxyController controller\n```
+//                                                                    signature_documentation java @Nullable\nEpoxyController controller
 //                                                                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                                                              ^^^^^^^^^^^^^^^^ definition local 1
 //                                                                                               display_name targetModelClass
-//                                                                                               documentation ```java\nClass<T> targetModelClass\n```
+//                                                                                               signature_documentation java Class<T> targetModelClass
     this.controller = controller;
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#controller.
 //                    ^^^^^^^^^^ reference local 0
@@ -114,22 +114,22 @@ public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class<T> ta
   protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHolder) {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                               display_name getMovementFlags
-//                               documentation ```java\n@Override\nprotected int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder)\n```
+//                               signature_documentation java @Override\nprotected int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder)
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(+1).
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                            ^^^^^^^^^^^^ definition local 2
 //                                                         display_name recyclerView
-//                                                         documentation ```java\nunresolved_type recyclerView\n```
+//                                                         signature_documentation java unresolved_type recyclerView
 //                                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                          ^^^^^^^^^^ definition local 3
 //                                                                                     display_name viewHolder
-//                                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                                     signature_documentation java EpoxyViewHolder viewHolder
     EpoxyModel<?> model = viewHolder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 4
 //                      display_name model
-//                      documentation ```java\nEpoxyModel<?> model\n```
+//                      signature_documentation java EpoxyModel<?> model
 //                        ^^^^^^^^^^ reference local 3
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
 
@@ -139,7 +139,7 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
     boolean isOtherCallbackActive =
 //          ^^^^^^^^^^^^^^^^^^^^^ definition local 5
 //                                display_name isOtherCallbackActive
-//                                documentation ```java\nboolean isOtherCallbackActive\n```
+//                                signature_documentation java boolean isOtherCallbackActive
         holderBeingDragged == null
 //      ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingDragged.
             && holderBeingSwiped == null
@@ -169,22 +169,22 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
   protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current,
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                              display_name canDropOver
-//                              documentation ```java\n@Override\nprotected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target)\n```
+//                              signature_documentation java @Override\nprotected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target)
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                           ^^^^^^^^^^^^ definition local 6
 //                                                        display_name recyclerView
-//                                                        documentation ```java\nunresolved_type recyclerView\n```
+//                                                        signature_documentation java unresolved_type recyclerView
 //                                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                         ^^^^^^^ definition local 7
 //                                                                                 display_name current
-//                                                                                 documentation ```java\nEpoxyViewHolder current\n```
+//                                                                                 signature_documentation java EpoxyViewHolder current
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 8
 //                           display_name target
-//                           documentation ```java\nEpoxyViewHolder target\n```
+//                           signature_documentation java EpoxyViewHolder target
     // By default we don't allow dropping on a model that isn't a drag target
     return isTouchableModel(target.getModel());
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
@@ -195,11 +195,11 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current
   protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                  ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                   display_name isTouchableModel
-//                                   documentation ```java\nprotected boolean isTouchableModel(EpoxyModel<?> model)\n```
+//                                   signature_documentation java protected boolean isTouchableModel(EpoxyModel<?> model)
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^ definition local 9
 //                                                       display_name model
-//                                                       documentation ```java\nEpoxyModel<?> model\n```
+//                                                       signature_documentation java EpoxyModel<?> model
     return targetModelClass.isInstance(model);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#targetModelClass.
 //                          ^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#isInstance().
@@ -211,22 +211,22 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
   protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                  ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                         display_name onMove
-//                         documentation ```java\n@Override\nprotected boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target)\n```
+//                         signature_documentation java @Override\nprotected boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target)
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                      ^^^^^^^^^^^^ definition local 10
 //                                                   display_name recyclerView
-//                                                   documentation ```java\nunresolved_type recyclerView\n```
+//                                                   signature_documentation java unresolved_type recyclerView
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                    ^^^^^^^^^^ definition local 11
 //                                                                               display_name viewHolder
-//                                                                               documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                               signature_documentation java EpoxyViewHolder viewHolder
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 12
 //                           display_name target
-//                           documentation ```java\nEpoxyViewHolder target\n```
+//                           signature_documentation java EpoxyViewHolder target
 
     if (controller == null) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#controller.
@@ -238,13 +238,13 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
     int fromPosition = viewHolder.getAdapterPosition();
 //      ^^^^^^^^^^^^ definition local 13
 //                   display_name fromPosition
-//                   documentation ```java\nint fromPosition\n```
+//                   signature_documentation java int fromPosition
 //                     ^^^^^^^^^^ reference local 11
 //                                ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     int toPosition = target.getAdapterPosition();
 //      ^^^^^^^^^^ definition local 14
 //                 display_name toPosition
-//                 documentation ```java\nint toPosition\n```
+//                 signature_documentation java int toPosition
 //                   ^^^^^^ reference local 12
 //                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     controller.moveModel(fromPosition, toPosition);
@@ -257,7 +257,7 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 15
 //                      display_name model
-//                      documentation ```java\nEpoxyModel<?> model\n```
+//                      signature_documentation java EpoxyModel<?> model
 //                        ^^^^^^^^^^ reference local 11
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     if (!isTouchableModel(model)) {
@@ -287,22 +287,22 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
   public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, View itemView) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                         display_name onModelMoved
-//                         documentation ```java\n@Override\npublic void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)\n```
+//                         signature_documentation java @Override\npublic void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                             ^^^^^^^^^^^^ definition local 16
 //                                          display_name fromPosition
-//                                          documentation ```java\nint fromPosition\n```
+//                                          signature_documentation java int fromPosition
 //                                               ^^^^^^^^^^ definition local 17
 //                                                          display_name toPosition
-//                                                          documentation ```java\nint toPosition\n```
+//                                                          signature_documentation java int toPosition
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                                             ^^^^^^^^^^^^^^^ definition local 18
 //                                                                             display_name modelBeingMoved
-//                                                                             documentation ```java\nT modelBeingMoved\n```
+//                                                                             signature_documentation java T modelBeingMoved
 //                                                                              ^^^^ reference semanticdb maven . . View#
 //                                                                                   ^^^^^^^^ definition local 19
 //                                                                                            display_name itemView
-//                                                                                            documentation ```java\nunresolved_type itemView\n```
+//                                                                                            signature_documentation java unresolved_type itemView
 
   }
 
@@ -311,33 +311,33 @@ public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, Vi
   protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //                        display_name onSwiped
-//                        documentation ```java\n@Override\nprotected void onSwiped(EpoxyViewHolder viewHolder, int direction)\n```
+//                        signature_documentation java @Override\nprotected void onSwiped(EpoxyViewHolder viewHolder, int direction)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                        ^^^^^^^^^^ definition local 20
 //                                                   display_name viewHolder
-//                                                   documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                   signature_documentation java EpoxyViewHolder viewHolder
 //                                                        ^^^^^^^^^ definition local 21
 //                                                                  display_name direction
-//                                                                  documentation ```java\nint direction\n```
+//                                                                  signature_documentation java int direction
     EpoxyModel<?> model = viewHolder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 22
 //                      display_name model
-//                      documentation ```java\nEpoxyModel<?> model\n```
+//                      signature_documentation java EpoxyModel<?> model
 //                        ^^^^^^^^^^ reference local 20
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     View view = viewHolder.itemView;
 //  ^^^^ reference semanticdb maven . . View#
 //       ^^^^ definition local 23
 //            display_name view
-//            documentation ```java\nunresolved_type view\n```
+//            signature_documentation java unresolved_type view
 //              ^^^^^^^^^^ reference local 20
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#itemView#
     int position = viewHolder.getAdapterPosition();
 //      ^^^^^^^^ definition local 24
 //               display_name position
-//               documentation ```java\nint position\n```
+//               signature_documentation java int position
 //                 ^^^^^^^^^^ reference local 20
 //                            ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
 
@@ -366,22 +366,22 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
   public void onSwipeCompleted(T model, View itemView, int position, int direction) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                             display_name onSwipeCompleted
-//                             documentation ```java\n@Override\npublic void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)\n```
+//                             signature_documentation java @Override\npublic void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                               ^^^^^ definition local 25
 //                                     display_name model
-//                                     documentation ```java\nT model\n```
+//                                     signature_documentation java T model
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 26
 //                                                    display_name itemView
-//                                                    documentation ```java\nunresolved_type itemView\n```
+//                                                    signature_documentation java unresolved_type itemView
 //                                                         ^^^^^^^^ definition local 27
 //                                                                  display_name position
-//                                                                  documentation ```java\nint position\n```
+//                                                                  signature_documentation java int position
 //                                                                       ^^^^^^^^^ definition local 28
 //                                                                                 display_name direction
-//                                                                                 documentation ```java\nint direction\n```
+//                                                                                 signature_documentation java int direction
 
   }
 
@@ -390,16 +390,16 @@ public void onSwipeCompleted(T model, View itemView, int position, int direction
   protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actionState) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
 //                                 display_name onSelectedChanged
-//                                 documentation ```java\n@Override\nprotected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState)\n```
+//                                 signature_documentation java @Override\nprotected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState)
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                           ^^^^^^^^^^ definition local 29
 //                                                                      display_name viewHolder
-//                                                                      documentation ```java\n@Nullable\nEpoxyViewHolder viewHolder\n```
+//                                                                      signature_documentation java @Nullable\nEpoxyViewHolder viewHolder
 //                                                                           ^^^^^^^^^^^ definition local 30
 //                                                                                       display_name actionState
-//                                                                                       documentation ```java\nint actionState\n```
+//                                                                                       signature_documentation java int actionState
     super.onSelectedChanged(viewHolder, actionState);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
@@ -412,7 +412,7 @@ protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actio
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                  ^^^^^ definition local 31
 //                        display_name model
-//                        documentation ```java\nEpoxyModel<?> model\n```
+//                        signature_documentation java EpoxyModel<?> model
 //                          ^^^^^^^^^^ reference local 29
 //                                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
       if (!isTouchableModel(model)) {
@@ -495,11 +495,11 @@ protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actio
   private void markRecyclerViewHasSelection(RecyclerView recyclerView) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#markRecyclerViewHasSelection().
 //                                          display_name markRecyclerViewHasSelection
-//                                          documentation ```java\nprivate void markRecyclerViewHasSelection(unresolved_type recyclerView)\n```
+//                                          signature_documentation java private void markRecyclerViewHasSelection(unresolved_type recyclerView)
 //                                          ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                       ^^^^^^^^^^^^ definition local 32
 //                                                                    display_name recyclerView
-//                                                                    documentation ```java\nunresolved_type recyclerView\n```
+//                                                                    signature_documentation java unresolved_type recyclerView
     recyclerView.setTag(R.id.epoxy_touch_helper_selection_status, Boolean.TRUE);
 //  ^^^^^^^^^^^^ reference local 32
 //               ^^^^^^ reference semanticdb maven . . RecyclerView#setTag#
@@ -513,11 +513,11 @@ private void markRecyclerViewHasSelection(RecyclerView recyclerView) {
   private boolean recyclerViewHasSelection(RecyclerView recyclerView) {
 //                ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#recyclerViewHasSelection().
 //                                         display_name recyclerViewHasSelection
-//                                         documentation ```java\nprivate boolean recyclerViewHasSelection(unresolved_type recyclerView)\n```
+//                                         signature_documentation java private boolean recyclerViewHasSelection(unresolved_type recyclerView)
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                      ^^^^^^^^^^^^ definition local 33
 //                                                                   display_name recyclerView
-//                                                                   documentation ```java\nunresolved_type recyclerView\n```
+//                                                                   signature_documentation java unresolved_type recyclerView
     return recyclerView.getTag(R.id.epoxy_touch_helper_selection_status) != null;
 //         ^^^^^^^^^^^^ reference local 33
 //                      ^^^^^^ reference semanticdb maven . . RecyclerView#getTag#
@@ -529,11 +529,11 @@ private boolean recyclerViewHasSelection(RecyclerView recyclerView) {
   private void clearRecyclerViewSelectionMarker(RecyclerView recyclerView) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearRecyclerViewSelectionMarker().
 //                                              display_name clearRecyclerViewSelectionMarker
-//                                              documentation ```java\nprivate void clearRecyclerViewSelectionMarker(unresolved_type recyclerView)\n```
+//                                              signature_documentation java private void clearRecyclerViewSelectionMarker(unresolved_type recyclerView)
 //                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                           ^^^^^^^^^^^^ definition local 34
 //                                                                        display_name recyclerView
-//                                                                        documentation ```java\nunresolved_type recyclerView\n```
+//                                                                        signature_documentation java unresolved_type recyclerView
     recyclerView.setTag(R.id.epoxy_touch_helper_selection_status, null);
 //  ^^^^^^^^^^^^ reference local 34
 //               ^^^^^^ reference semanticdb maven . . RecyclerView#setTag#
@@ -547,19 +547,19 @@ private void clearRecyclerViewSelectionMarker(RecyclerView recyclerView) {
   public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                           display_name onSwipeStarted
-//                           documentation ```java\n@Override\npublic void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)\n```
+//                           signature_documentation java @Override\npublic void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                             ^^^^^ definition local 35
 //                                   display_name model
-//                                   documentation ```java\nT model\n```
+//                                   signature_documentation java T model
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^ definition local 36
 //                                                  display_name itemView
-//                                                  documentation ```java\nunresolved_type itemView\n```
+//                                                  signature_documentation java unresolved_type itemView
 //                                                       ^^^^^^^^^^^^^^^ definition local 37
 //                                                                       display_name adapterPosition
-//                                                                       documentation ```java\nint adapterPosition\n```
+//                                                                       signature_documentation java int adapterPosition
 
   }
 
@@ -568,16 +568,16 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) {
   public void onSwipeReleased(T model, View itemView) {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                            display_name onSwipeReleased
-//                            documentation ```java\n@Override\npublic void onSwipeReleased(T model, unresolved_type itemView)\n```
+//                            signature_documentation java @Override\npublic void onSwipeReleased(T model, unresolved_type itemView)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                              ^^^^^ definition local 38
 //                                    display_name model
-//                                    documentation ```java\nT model\n```
+//                                    signature_documentation java T model
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 39
 //                                                   display_name itemView
-//                                                   documentation ```java\nunresolved_type itemView\n```
+//                                                   signature_documentation java unresolved_type itemView
 
   }
 
@@ -586,19 +586,19 @@ public void onSwipeReleased(T model, View itemView) {
   public void onDragStarted(T model, View itemView, int adapterPosition) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                          display_name onDragStarted
-//                          documentation ```java\n@Override\npublic void onDragStarted(T model, unresolved_type itemView, int adapterPosition)\n```
+//                          signature_documentation java @Override\npublic void onDragStarted(T model, unresolved_type itemView, int adapterPosition)
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                            ^^^^^ definition local 40
 //                                  display_name model
-//                                  documentation ```java\nT model\n```
+//                                  signature_documentation java T model
 //                                   ^^^^ reference semanticdb maven . . View#
 //                                        ^^^^^^^^ definition local 41
 //                                                 display_name itemView
-//                                                 documentation ```java\nunresolved_type itemView\n```
+//                                                 signature_documentation java unresolved_type itemView
 //                                                      ^^^^^^^^^^^^^^^ definition local 42
 //                                                                      display_name adapterPosition
-//                                                                      documentation ```java\nint adapterPosition\n```
+//                                                                      signature_documentation java int adapterPosition
 
   }
 
@@ -607,16 +607,16 @@ public void onDragStarted(T model, View itemView, int adapterPosition) {
   public void onDragReleased(T model, View itemView) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                           display_name onDragReleased
-//                           documentation ```java\n@Override\npublic void onDragReleased(T model, unresolved_type itemView)\n```
+//                           signature_documentation java @Override\npublic void onDragReleased(T model, unresolved_type itemView)
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                             ^^^^^ definition local 43
 //                                   display_name model
-//                                   documentation ```java\nT model\n```
+//                                   signature_documentation java T model
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^ definition local 44
 //                                                  display_name itemView
-//                                                  documentation ```java\nunresolved_type itemView\n```
+//                                                  signature_documentation java unresolved_type itemView
 
   }
 
@@ -625,18 +625,18 @@ public void onDragReleased(T model, View itemView) {
   protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHolder) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                         display_name clearView
-//                         documentation ```java\n@Override\nprotected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder)\n```
+//                         signature_documentation java @Override\nprotected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder)
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                            ^^^^^^^^^^^^ definition local 45
 //                                                         display_name recyclerView
-//                                                         documentation ```java\nfinal unresolved_type recyclerView\n```
+//                                                         signature_documentation java final unresolved_type recyclerView
 //                                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                          ^^^^^^^^^^ definition local 46
 //                                                                                     display_name viewHolder
-//                                                                                     documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                                     signature_documentation java EpoxyViewHolder viewHolder
     super.clearView(recyclerView, viewHolder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
@@ -665,7 +665,7 @@ protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHo
       public void run() {
 //                ^^^ definition local 48
 //                    display_name run
-//                    documentation ```java\n@Override\npublic void run()\n```
+//                    signature_documentation java @Override\npublic void run()
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         clearRecyclerViewSelectionMarker(recyclerView);
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearRecyclerViewSelectionMarker().
@@ -680,18 +680,18 @@ public void run() {
   public void clearView(T model, View itemView) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 //                      display_name clearView
-//                      documentation ```java\n@Override\npublic void clearView(T model, unresolved_type itemView)\n```
+//                      signature_documentation java @Override\npublic void clearView(T model, unresolved_type itemView)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                        ^^^^^ definition local 49
 //                              display_name model
-//                              documentation ```java\nT model\n```
+//                              signature_documentation java T model
 //                               ^^^^ reference semanticdb maven . . View#
 //                                    ^^^^^^^^ definition local 50
 //                                             display_name itemView
-//                                             documentation ```java\nunresolved_type itemView\n```
+//                                             signature_documentation java unresolved_type itemView
 
   }
 
@@ -700,34 +700,34 @@ public void clearView(T model, View itemView) {
   protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                           display_name onChildDraw
-//                           documentation ```java\n@Override\nprotected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
+//                           signature_documentation java @Override\nprotected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                           ^^^^^^ reference semanticdb maven . . Canvas#
 //                                  ^ definition local 51
 //                                    display_name c
-//                                    documentation ```java\nunresolved_type c\n```
+//                                    signature_documentation java unresolved_type c
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                  ^^^^^^^^^^^^ definition local 52
 //                                                               display_name recyclerView
-//                                                               documentation ```java\nunresolved_type recyclerView\n```
+//                                                               signature_documentation java unresolved_type recyclerView
 //                                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                ^^^^^^^^^^ definition local 53
 //                                                                                           display_name viewHolder
-//                                                                                           documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                                           signature_documentation java EpoxyViewHolder viewHolder
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 54
 //             display_name dX
-//             documentation ```java\nfloat dX\n```
+//             signature_documentation java float dX
 //                    ^^ definition local 55
 //                       display_name dY
-//                       documentation ```java\nfloat dY\n```
+//                       signature_documentation java float dY
 //                            ^^^^^^^^^^^ definition local 56
 //                                        display_name actionState
-//                                        documentation ```java\nint actionState\n```
+//                                        signature_documentation java int actionState
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 57
 //                                                                   display_name isCurrentlyActive
-//                                                                   documentation ```java\nboolean isCurrentlyActive\n```
+//                                                                   signature_documentation java boolean isCurrentlyActive
     super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
 //        ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
@@ -743,7 +743,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 58
 //                      display_name model
-//                      documentation ```java\nEpoxyModel<?> model\n```
+//                      signature_documentation java EpoxyModel<?> model
 //                        ^^^^^^^^^^ reference local 53
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     if (!isTouchableModel(model)) {
@@ -760,14 +760,14 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //  ^^^^ reference semanticdb maven . . View#
 //       ^^^^^^^^ definition local 59
 //                display_name itemView
-//                documentation ```java\nunresolved_type itemView\n```
+//                signature_documentation java unresolved_type itemView
 //                  ^^^^^^^^^^ reference local 53
 //                             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#itemView#
 
     float swipeProgress;
 //        ^^^^^^^^^^^^^ definition local 60
 //                      display_name swipeProgress
-//                      documentation ```java\nfloat swipeProgress\n```
+//                      signature_documentation java float swipeProgress
     if (Math.abs(dX) > Math.abs(dY)) {
 //      ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
 //           ^^^ reference semanticdb maven jdk 11 java/lang/Math#abs(+2).
@@ -792,7 +792,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
     float clampedProgress = Math.max(-1f, Math.min(1f, swipeProgress));
 //        ^^^^^^^^^^^^^^^ definition local 61
 //                        display_name clampedProgress
-//                        documentation ```java\nfloat clampedProgress\n```
+//                        signature_documentation java float clampedProgress
 //                          ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
 //                               ^^^ reference semanticdb maven jdk 11 java/lang/Math#max(+2).
 //                                        ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
@@ -814,24 +814,24 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
   public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                                   display_name onSwipeProgressChanged
-//                                   documentation ```java\n@Override\npublic void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)\n```
+//                                   signature_documentation java @Override\npublic void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                     ^^^^^ definition local 62
 //                                           display_name model
-//                                           documentation ```java\nT model\n```
+//                                           signature_documentation java T model
 //                                            ^^^^ reference semanticdb maven . . View#
 //                                                 ^^^^^^^^ definition local 63
 //                                                          display_name itemView
-//                                                          documentation ```java\nunresolved_type itemView\n```
+//                                                          signature_documentation java unresolved_type itemView
 //                                                                 ^^^^^^^^^^^^^ definition local 64
 //                                                                               display_name swipeProgress
-//                                                                               documentation ```java\nfloat swipeProgress\n```
+//                                                                               signature_documentation java float swipeProgress
       Canvas canvas) {
 //    ^^^^^^ reference semanticdb maven . . Canvas#
 //           ^^^^^^ definition local 65
 //                  display_name canvas
-//                  documentation ```java\nunresolved_type canvas\n```
+//                  signature_documentation java unresolved_type canvas
 
   }
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
index f7bbda0d8..b0b857803 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
@@ -37,12 +37,12 @@
 public abstract class EpoxyModelWithHolder<T extends EpoxyHolder> extends EpoxyModel<T> {
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#
 //                                         display_name EpoxyModelWithHolder
-//                                         documentation ```java\npublic abstract class EpoxyModelWithHolder<T extends EpoxyHolder>\n```
+//                                         signature_documentation java public abstract class EpoxyModelWithHolder<T extends EpoxyHolder>
 //                                         documentation  A version of {@link com.airbnb.epoxy.EpoxyModel} that allows you to use a view holder pattern\n instead of a specific view when binding to your model.\n
 //                                         relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                           display_name T
-//                                           documentation ```java\nT extends EpoxyHolder\n```
+//                                           signature_documentation java T extends EpoxyHolder
 //                                                   ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
@@ -50,16 +50,16 @@ public abstract class EpoxyModelWithHolder<T extends EpoxyHolder> extends EpoxyM
   public EpoxyModelWithHolder() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#`<init>`().
 //                            display_name <init>
-//                            documentation ```java\npublic EpoxyModelWithHolder()\n```
+//                            signature_documentation java public EpoxyModelWithHolder()
   }
 
   public EpoxyModelWithHolder(long id) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#`<init>`(+1).
 //                            display_name <init>
-//                            documentation ```java\npublic EpoxyModelWithHolder(long id)\n```
+//                            signature_documentation java public EpoxyModelWithHolder(long id)
 //                                 ^^ definition local 0
 //                                    display_name id
-//                                    documentation ```java\nlong id\n```
+//                                    signature_documentation java long id
     super(id);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
 //        ^^ reference local 0
@@ -70,28 +70,28 @@ public EpoxyModelWithHolder(long id) {
 //                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#createNewHolder().
 //                                     display_name createNewHolder
-//                                     documentation ```java\nprotected abstract T createNewHolder(unresolved_type parent)\n```
+//                                     signature_documentation java protected abstract T createNewHolder(unresolved_type parent)
 //                                     documentation This should return a new instance of your {@link com.airbnb.epoxy.EpoxyHolder} class. 
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#createNewHolder().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                                         ^^^^^^ definition local 1
 //                                                                display_name parent
-//                                                                documentation ```java\n@NonNull\nunresolved_type parent\n```
+//                                                                signature_documentation java @NonNull\nunresolved_type parent
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void bind(@NonNull T holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
 //                 display_name bind
-//                 documentation ```java\n@Override\npublic void bind(T holder)\n```
+//                 signature_documentation java @Override\npublic void bind(T holder)
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                            ^^^^^^ definition local 2
 //                                   display_name holder
-//                                   documentation ```java\n@NonNull\nT holder\n```
+//                                   signature_documentation java @NonNull\nT holder
     super.bind(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
@@ -103,20 +103,20 @@ public void bind(@NonNull T holder) {
   public void bind(@NonNull T holder, @NonNull List<Object> payloads) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
 //                 display_name bind
-//                 documentation ```java\n@Override\npublic void bind(T holder, List<Object> payloads)\n```
+//                 signature_documentation java @Override\npublic void bind(T holder, List<Object> payloads)
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                            ^^^^^^ definition local 3
 //                                   display_name holder
-//                                   documentation ```java\n@NonNull\nT holder\n```
+//                                   signature_documentation java @NonNull\nT holder
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                          ^^^^^^^^ definition local 4
 //                                                                   display_name payloads
-//                                                                   documentation ```java\n@NonNull\nList<Object> payloads\n```
+//                                                                   signature_documentation java @NonNull\nList<Object> payloads
     super.bind(holder, payloads);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
@@ -129,19 +129,19 @@ public void bind(@NonNull T holder, @NonNull List<Object> payloads) {
   public void bind(@NonNull T holder, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
 //                 display_name bind
-//                 documentation ```java\n@Override\npublic void bind(T holder, EpoxyModel<?> previouslyBoundModel)\n```
+//                 signature_documentation java @Override\npublic void bind(T holder, EpoxyModel<?> previouslyBoundModel)
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                            ^^^^^^ definition local 5
 //                                   display_name holder
-//                                   documentation ```java\n@NonNull\nT holder\n```
+//                                   signature_documentation java @NonNull\nT holder
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^^^^^^^^^^^^^^^^ definition local 6
 //                                                                                display_name previouslyBoundModel
-//                                                                                documentation ```java\n@NonNull\nEpoxyModel<?> previouslyBoundModel\n```
+//                                                                                signature_documentation java @NonNull\nEpoxyModel<?> previouslyBoundModel
     super.bind(holder, previouslyBoundModel);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
@@ -154,14 +154,14 @@ public void bind(@NonNull T holder, @NonNull EpoxyModel<?> previouslyBoundModel)
   public void unbind(@NonNull T holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
 //                   display_name unbind
-//                   documentation ```java\n@Override\npublic void unbind(T holder)\n```
+//                   signature_documentation java @Override\npublic void unbind(T holder)
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                              ^^^^^^ definition local 7
 //                                     display_name holder
-//                                     documentation ```java\n@NonNull\nT holder\n```
+//                                     signature_documentation java @NonNull\nT holder
     super.unbind(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
@@ -174,17 +174,17 @@ public void unbind(@NonNull T holder) {
   public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged().
 //                                     display_name onVisibilityStateChanged
-//                                     documentation ```java\n@Override\npublic void onVisibilityStateChanged(int visibilityState, T holder)\n```
+//                                     signature_documentation java @Override\npublic void onVisibilityStateChanged(int visibilityState, T holder)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                     ^^^^^^^^^^^^^^^ definition local 8
 //                                                                     display_name visibilityState
-//                                                                     documentation ```java\n@Visibility\nint visibilityState\n```
+//                                                                     signature_documentation java @Visibility\nint visibilityState
 //                                                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                                                                 ^^^^^^ definition local 9
 //                                                                                        display_name holder
-//                                                                                        documentation ```java\n@NonNull\nT holder\n```
+//                                                                                        signature_documentation java @NonNull\nT holder
     super.onVisibilityStateChanged(visibilityState, holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
@@ -197,7 +197,7 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T
   public void onVisibilityChanged(
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
 //                                display_name onVisibilityChanged
-//                                documentation ```java\n@Override\npublic void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T holder)\n```
+//                                signature_documentation java @Override\npublic void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T holder)
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
       @FloatRange(from = 0, to = 100) float percentVisibleHeight,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
@@ -205,29 +205,29 @@ public void onVisibilityChanged(
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 10
 //                                                               display_name percentVisibleHeight
-//                                                               documentation ```java\n@FloatRange(from = 0, to = 100)\nfloat percentVisibleHeight\n```
+//                                                               signature_documentation java @FloatRange(from = 0, to = 100)\nfloat percentVisibleHeight
       @FloatRange(from = 0, to = 100) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                          ^^^^^^^^^^^^^^^^^^^ definition local 11
 //                                                              display_name percentVisibleWidth
-//                                                              documentation ```java\n@FloatRange(from = 0, to = 100)\nfloat percentVisibleWidth\n```
+//                                                              signature_documentation java @FloatRange(from = 0, to = 100)\nfloat percentVisibleWidth
       @Px int visibleHeight, @Px int visibleWidth,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 12
 //                          display_name visibleHeight
-//                          documentation ```java\n@Px\nint visibleHeight\n```
+//                          signature_documentation java @Px\nint visibleHeight
 //                            ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                   ^^^^^^^^^^^^ definition local 13
 //                                                display_name visibleWidth
-//                                                documentation ```java\n@Px\nint visibleWidth\n```
+//                                                signature_documentation java @Px\nint visibleWidth
       @NonNull T holder) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //               ^^^^^^ definition local 14
 //                      display_name holder
-//                      documentation ```java\n@NonNull\nT holder\n```
+//                      signature_documentation java @NonNull\nT holder
     super.onVisibilityChanged(
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
@@ -246,12 +246,12 @@ public void onVisibilityChanged(
   public boolean onFailedToRecycleView(T holder) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView().
 //                                     display_name onFailedToRecycleView
-//                                     documentation ```java\n@Override\npublic boolean onFailedToRecycleView(T holder)\n```
+//                                     signature_documentation java @Override\npublic boolean onFailedToRecycleView(T holder)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                       ^^^^^^ definition local 15
 //                                              display_name holder
-//                                              documentation ```java\nT holder\n```
+//                                              signature_documentation java T holder
     return super.onFailedToRecycleView(holder);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //               ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
@@ -263,13 +263,13 @@ public boolean onFailedToRecycleView(T holder) {
   public void onViewAttachedToWindow(T holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
-//                                   documentation ```java\n@Override\npublic void onViewAttachedToWindow(T holder)\n```
+//                                   signature_documentation java @Override\npublic void onViewAttachedToWindow(T holder)
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
 //                                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                     ^^^^^^ definition local 16
 //                                            display_name holder
-//                                            documentation ```java\nT holder\n```
+//                                            signature_documentation java T holder
     super.onViewAttachedToWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
@@ -281,13 +281,13 @@ public void onViewAttachedToWindow(T holder) {
   public void onViewDetachedFromWindow(T holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
-//                                     documentation ```java\n@Override\npublic void onViewDetachedFromWindow(T holder)\n```
+//                                     signature_documentation java @Override\npublic void onViewDetachedFromWindow(T holder)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                       ^^^^^^ definition local 17
 //                                              display_name holder
-//                                              documentation ```java\nT holder\n```
+//                                              signature_documentation java T holder
     super.onViewDetachedFromWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
index fdbd41a01..b13ebfd1a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
@@ -37,15 +37,15 @@
 public abstract class EpoxyModelWithView<T extends View> extends EpoxyModel<T> {
 //                    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#
 //                                       display_name EpoxyModelWithView
-//                                       documentation ```java\npublic abstract class EpoxyModelWithView<T extends unresolved_type>\n```
+//                                       signature_documentation java public abstract class EpoxyModelWithView<T extends unresolved_type>
 //                                       documentation  A model that allows its view to be built programmatically instead of by inflating a layout\n resource. Just implement {@link #buildView} so the adapter can create a new view for this model\n when needed.\n <p>\n {@link #getViewType()} is used by the adapter to know how to reuse views for this model. This\n means that all models that return the same type should be able to share the same view, and the\n view won't be shared with models of any other type.\n <p>\n If it is left unimplemented then at runtime a unique view type will be created to use for all\n models of that class. The generated view type will be negative so that it cannot collide with\n values from resource files, which are used in normal Epoxy models. If you would like to share\n the same view between models of different classes you can have those classes return the same view\n type. A good way to manually create a view type value is by creating an R.id. value in an ids\n resource file.\n
 //                                       relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#`<init>`().
 //                                       display_name <init>
-//                                       documentation ```java\npublic EpoxyModelWithView()\n```
+//                                       signature_documentation java public EpoxyModelWithView()
 //                                       ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
 //                                         display_name T
-//                                         documentation ```java\nT extends unresolved_type\n```
+//                                         signature_documentation java T extends unresolved_type
 //                                                 ^^^^ reference semanticdb maven . . View#
 //                                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
@@ -61,7 +61,7 @@ public abstract class EpoxyModelWithView<T extends View> extends EpoxyModel<T> {
   protected int getViewType() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getViewType().
 //                          display_name getViewType
-//                          documentation ```java\n@Override\nprotected int getViewType()\n```
+//                          signature_documentation java @Override\nprotected int getViewType()
 //                          documentation  Get the view type associated with this model's view. Any models with the same view type will\n have views recycled between them.\n\n @see androidx.recyclerview.widget.RecyclerView.Adapter#getItemViewType(int)\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
     return 0;
@@ -79,21 +79,21 @@ protected int getViewType() {
 //                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
 //                     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#buildView().
 //                               display_name buildView
-//                               documentation ```java\n@Override\nprotected abstract T buildView(unresolved_type parent)\n```
+//                               signature_documentation java @Override\nprotected abstract T buildView(unresolved_type parent)
 //                               documentation  Create and return a new instance of a view for this model. If no layout params are set on the\n returned view then default layout params will be used.\n\n @param parent The parent ViewGroup that the returned view will be added to.\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
 //                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                        ^^^^^^^^^ reference semanticdb maven . . ViewGroup#
 //                                                  ^^^^^^ definition local 0
 //                                                         display_name parent
-//                                                         documentation ```java\n@NonNull\nunresolved_type parent\n```
+//                                                         signature_documentation java @NonNull\nunresolved_type parent
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   protected final int getDefaultLayout() {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getDefaultLayout().
 //                                     display_name getDefaultLayout
-//                                     documentation ```java\n@Override\nprotected final int getDefaultLayout()\n```
+//                                     signature_documentation java @Override\nprotected final int getDefaultLayout()
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     throw new UnsupportedOperationException(
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`(+1).
@@ -107,12 +107,12 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#layout().
 //                            display_name layout
-//                            documentation ```java\n@Override\npublic EpoxyModel<T> layout(int layoutRes)\n```
+//                            signature_documentation java @Override\npublic EpoxyModel<T> layout(int layoutRes)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout().
 //                             ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                           ^^^^^^^^^ definition local 1
 //                                                     display_name layoutRes
-//                                                     documentation ```java\n@LayoutRes\nint layoutRes\n```
+//                                                     signature_documentation java @LayoutRes\nint layoutRes
     throw new UnsupportedOperationException(
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`(+1).
         "Layout resources are unsupported. Views must be created with `buildView`");
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
index ce50c1114..f316d8703 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
@@ -21,12 +21,12 @@
 public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouchCallback<T> {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                                  display_name EpoxySwipeCallback
-//                                  documentation ```java\npublic interface EpoxySwipeCallback<T extends EpoxyModel>\n```
+//                                  signature_documentation java public interface EpoxySwipeCallback<T extends EpoxyModel>
 //                                  documentation  For use with {@link EpoxyModelTouchCallback}\n
 //                                  relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                  ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                                    display_name T
-//                                    documentation ```java\nT extends EpoxyModel\n```
+//                                    signature_documentation java T extends EpoxyModel
 //                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                                                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
@@ -45,21 +45,21 @@ public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouch
   void onSwipeStarted(T model, View itemView, int adapterPosition);
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                    display_name onSwipeStarted
-//                    documentation ```java\npublic abstract void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)\n```
+//                    signature_documentation java public abstract void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)
 //                    documentation  Called when the view switches from an idle state to a swiped state, as the user begins a swipe\n interaction with it. You can use this callback to modify the view to indicate it is being\n swiped.\n <p>\n This is the first callback made in the lifecycle of a swipe event.\n\n @param model           The model representing the view that is being swiped\n @param itemView        The view that is being swiped\n @param adapterPosition The adapter position of the model\n
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                      ^^^^^ definition local 0
 //                            display_name model
-//                            documentation ```java\nT model\n```
+//                            signature_documentation java T model
 //                             ^^^^ reference semanticdb maven . . View#
 //                                  ^^^^^^^^ definition local 1
 //                                           display_name itemView
-//                                           documentation ```java\nunresolved_type itemView\n```
+//                                           signature_documentation java unresolved_type itemView
 //                                                ^^^^^^^^^^^^^^^ definition local 2
 //                                                                display_name adapterPosition
-//                                                                documentation ```java\nint adapterPosition\n```
+//                                                                signature_documentation java int adapterPosition
 
   /**
    * Once a view has begun swiping with {@link #onSwipeStarted(EpoxyModel, View, int)} it will
@@ -78,26 +78,26 @@ public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouch
   void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                            display_name onSwipeProgressChanged
-//                            documentation ```java\npublic abstract void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)\n```
+//                            signature_documentation java public abstract void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
 //                            documentation  Once a view has begun swiping with {@link #onSwipeStarted(EpoxyModel, View, int)} it will\n receive this callback as the swipe distance changes. This can be called multiple times as the\n swipe interaction progresses.\n\n @param model         The model representing the view that is being swiped\n @param itemView      The view that is being swiped\n @param swipeProgress A float from -1 to 1 representing the percentage that the view has been\n                      swiped relative to its width. This will be positive if the view is being\n                      swiped to the right and negative if it is swiped to the left. For\n                      example,\n @param canvas        The canvas on which RecyclerView is drawing its children. You can draw to\n                      this to support custom swipe animations.\n
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                              ^^^^^ definition local 3
 //                                    display_name model
-//                                    documentation ```java\nT model\n```
+//                                    signature_documentation java T model
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 4
 //                                                   display_name itemView
-//                                                   documentation ```java\nunresolved_type itemView\n```
+//                                                   signature_documentation java unresolved_type itemView
 //                                                          ^^^^^^^^^^^^^ definition local 5
 //                                                                        display_name swipeProgress
-//                                                                        documentation ```java\nfloat swipeProgress\n```
+//                                                                        signature_documentation java float swipeProgress
       Canvas canvas);
 //    ^^^^^^ reference semanticdb maven . . Canvas#
 //           ^^^^^^ definition local 6
 //                  display_name canvas
-//                  documentation ```java\nunresolved_type canvas\n```
+//                  signature_documentation java unresolved_type canvas
 
   /**
    * Called when the user has released their touch on the view. If the displacement passed the swipe
@@ -111,18 +111,18 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
   void onSwipeReleased(T model, View itemView);
 //     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                     display_name onSwipeReleased
-//                     documentation ```java\npublic abstract void onSwipeReleased(T model, unresolved_type itemView)\n```
+//                     signature_documentation java public abstract void onSwipeReleased(T model, unresolved_type itemView)
 //                     documentation  Called when the user has released their touch on the view. If the displacement passed the swipe\n threshold then {@link #onSwipeCompleted(EpoxyModel, View, int, int)} will be called after this\n and the view will be animated off screen. Otherwise the view will animate back to its original\n position.\n\n @param model    The model representing the view that was being swiped\n @param itemView The view that was being swiped\n
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
 //                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                       ^^^^^ definition local 7
 //                             display_name model
-//                             documentation ```java\nT model\n```
+//                             signature_documentation java T model
 //                              ^^^^ reference semanticdb maven . . View#
 //                                   ^^^^^^^^ definition local 8
 //                                            display_name itemView
-//                                            documentation ```java\nunresolved_type itemView\n```
+//                                            signature_documentation java unresolved_type itemView
 
   /**
    * Called after {@link #onSwipeReleased(EpoxyModel, View)} if the swipe surpassed the threshold to
@@ -144,22 +144,22 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
   void onSwipeCompleted(T model, View itemView, int position, int direction);
 //     ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                      display_name onSwipeCompleted
-//                      documentation ```java\npublic abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)\n```
+//                      signature_documentation java public abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)
 //                      documentation  Called after {@link #onSwipeReleased(EpoxyModel, View)} if the swipe surpassed the threshold to\n be considered a full swipe. The view will now be animated off screen.\n <p>\n You MUST use this callback to remove this item from your backing data and request a model\n update.\n <p>\n {@link #clearView(EpoxyModel, View)} will be called after this.\n\n @param model     The model representing the view that was being swiped\n @param itemView  The view that was being swiped\n @param position  The adapter position of the model\n @param direction The direction that the view was swiped. Can be any of {@link\n                  ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n                  ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN} depending on what swipe\n                  directions were enabled.\n
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                        ^^^^^ definition local 9
 //                              display_name model
-//                              documentation ```java\nT model\n```
+//                              signature_documentation java T model
 //                               ^^^^ reference semanticdb maven . . View#
 //                                    ^^^^^^^^ definition local 10
 //                                             display_name itemView
-//                                             documentation ```java\nunresolved_type itemView\n```
+//                                             signature_documentation java unresolved_type itemView
 //                                                  ^^^^^^^^ definition local 11
 //                                                           display_name position
-//                                                           documentation ```java\nint position\n```
+//                                                           signature_documentation java int position
 //                                                                ^^^^^^^^^ definition local 12
 //                                                                          display_name direction
-//                                                                          documentation ```java\nint direction\n```
+//                                                                          signature_documentation java int direction
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
index 2874ce046..433836f03 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
@@ -65,11 +65,11 @@
 public abstract class EpoxyTouchHelper {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#
 //                                     display_name EpoxyTouchHelper
-//                                     documentation ```java\npublic abstract class EpoxyTouchHelper\n```
+//                                     signature_documentation java public abstract class EpoxyTouchHelper
 //                                     documentation  A simple way to set up drag or swipe interactions with Epoxy.\n <p>\n Drag events work with the EpoxyController and automatically update the controller and\n RecyclerView when an item is moved. You just need to implement a callback to update your data to\n reflect the change.\n <p>\n Both swipe and drag events implement a small lifecycle to help you style the views as they are\n moved. You can register callbacks for the lifecycle events you care about.\n <p>\n If you want to set up multiple drag and swipe rules for the same RecyclerView, you can use this\n class multiple times to specify different targets or swipe and drag directions and callbacks.\n <p>\n If you want more control over configuration and handling, you can opt to not use this class and\n instead you can implement {@link EpoxyModelTouchCallback} directly with your own {@link\n ItemTouchHelper}. That class provides an interface that makes it easier to work with Epoxy models\n and simplifies touch callbacks.\n <p>\n If you want even more control you can implement {@link EpoxyTouchHelperCallback}. This is just a\n light layer over the normal RecyclerView touch callbacks, but it converts all view holders to\n Epoxy view holders to remove some boilerplate for you.\n
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#`<init>`().
 //                                     display_name <init>
-//                                     documentation ```java\npublic EpoxyTouchHelper()\n```
+//                                     signature_documentation java public EpoxyTouchHelper()
 
   /**
    * The entry point for setting up drag support.
@@ -82,12 +82,12 @@ public static DragBuilder initDragging(EpoxyController controller) {
 //              ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#
 //                          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#initDragging().
 //                                       display_name initDragging
-//                                       documentation ```java\npublic static DragBuilder initDragging(EpoxyController controller)\n```
+//                                       signature_documentation java public static DragBuilder initDragging(EpoxyController controller)
 //                                       documentation  The entry point for setting up drag support.\n\n @param controller The EpoxyController with the models that will be dragged. The controller will\n                   be updated for you when a model is dragged and moved by a user's touch\n                   interaction.\n
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                       ^^^^^^^^^^ definition local 0
 //                                                                  display_name controller
-//                                                                  documentation ```java\nEpoxyController controller\n```
+//                                                                  signature_documentation java EpoxyController controller
     return new DragBuilder(controller);
 //             ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#`<init>`().
 //                         ^^^^^^^^^^ reference local 0
@@ -96,22 +96,22 @@ public static DragBuilder initDragging(EpoxyController controller) {
   public static class DragBuilder {
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#
 //                                display_name DragBuilder
-//                                documentation ```java\npublic static class DragBuilder\n```
+//                                signature_documentation java public static class DragBuilder
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller.
 //                                           display_name controller
-//                                           documentation ```java\nprivate final EpoxyController controller\n```
+//                                           signature_documentation java private final EpoxyController controller
 
     private DragBuilder(EpoxyController controller) {
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#`<init>`().
 //                      display_name <init>
-//                      documentation ```java\nprivate DragBuilder(EpoxyController controller)\n```
+//                      signature_documentation java private DragBuilder(EpoxyController controller)
 //                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                      ^^^^^^^^^^ definition local 1
 //                                                 display_name controller
-//                                                 documentation ```java\nEpoxyController controller\n```
+//                                                 signature_documentation java EpoxyController controller
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller.
 //                      ^^^^^^^^^^ reference local 1
@@ -126,12 +126,12 @@ public DragBuilder2 withRecyclerView(RecyclerView recyclerView) {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#
 //                      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#withRecyclerView().
 //                                       display_name withRecyclerView
-//                                       documentation ```java\npublic DragBuilder2 withRecyclerView(unresolved_type recyclerView)\n```
+//                                       signature_documentation java public DragBuilder2 withRecyclerView(unresolved_type recyclerView)
 //                                       documentation  The recyclerview that the EpoxyController has its adapter added to. An {@link\n androidx.recyclerview.widget.ItemTouchHelper} will be created and configured for you, and\n attached to this RecyclerView.\n
 //                                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                    ^^^^^^^^^^^^ definition local 2
 //                                                                 display_name recyclerView
-//                                                                 documentation ```java\nunresolved_type recyclerView\n```
+//                                                                 signature_documentation java unresolved_type recyclerView
       return new DragBuilder2(controller, recyclerView);
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#`<init>`().
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller.
@@ -142,31 +142,31 @@ public DragBuilder2 withRecyclerView(RecyclerView recyclerView) {
   public static class DragBuilder2 {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#
 //                                 display_name DragBuilder2
-//                                 documentation ```java\npublic static class DragBuilder2\n```
+//                                 signature_documentation java public static class DragBuilder2
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller.
 //                                           display_name controller
-//                                           documentation ```java\nprivate final EpoxyController controller\n```
+//                                           signature_documentation java private final EpoxyController controller
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#recyclerView.
 //                                          display_name recyclerView
-//                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
+//                                          signature_documentation java private final unresolved_type recyclerView
 
     private DragBuilder2(EpoxyController controller, RecyclerView recyclerView) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\nprivate DragBuilder2(EpoxyController controller, unresolved_type recyclerView)\n```
+//                       signature_documentation java private DragBuilder2(EpoxyController controller, unresolved_type recyclerView)
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 3
 //                                                  display_name controller
-//                                                  documentation ```java\nEpoxyController controller\n```
+//                                                  signature_documentation java EpoxyController controller
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                ^^^^^^^^^^^^ definition local 4
 //                                                                             display_name recyclerView
-//                                                                             documentation ```java\nunresolved_type recyclerView\n```
+//                                                                             signature_documentation java unresolved_type recyclerView
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller.
 //                      ^^^^^^^^^^ reference local 3
@@ -180,7 +180,7 @@ public DragBuilder3 forVerticalList() {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forVerticalList().
 //                                      display_name forVerticalList
-//                                      documentation ```java\npublic DragBuilder3 forVerticalList()\n```
+//                                      signature_documentation java public DragBuilder3 forVerticalList()
 //                                      documentation Enable dragging vertically, up and down. 
       return withDirections(ItemTouchHelper.UP | ItemTouchHelper.DOWN);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
@@ -195,7 +195,7 @@ public DragBuilder3 forHorizontalList() {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forHorizontalList().
 //                                        display_name forHorizontalList
-//                                        documentation ```java\npublic DragBuilder3 forHorizontalList()\n```
+//                                        signature_documentation java public DragBuilder3 forHorizontalList()
 //                                        documentation Enable dragging horizontally, left and right. 
       return withDirections(ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
@@ -210,7 +210,7 @@ public DragBuilder3 forGrid() {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forGrid().
 //                              display_name forGrid
-//                              documentation ```java\npublic DragBuilder3 forGrid()\n```
+//                              signature_documentation java public DragBuilder3 forGrid()
 //                              documentation Enable dragging in all directions. 
       return withDirections(ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
@@ -238,11 +238,11 @@ public DragBuilder3 withDirections(int directionFlags) {
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                      ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
 //                                     display_name withDirections
-//                                     documentation ```java\npublic DragBuilder3 withDirections(int directionFlags)\n```
+//                                     signature_documentation java public DragBuilder3 withDirections(int directionFlags)
 //                                     documentation  Set custom movement flags to dictate which drag directions should be allowed.\n <p>\n Can be any of {@link ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN}, {@link ItemTouchHelper#START}, {@link\n ItemTouchHelper#END}\n <p>\n Flags can be OR'd together to allow multiple directions.\n
 //                                         ^^^^^^^^^^^^^^ definition local 5
 //                                                        display_name directionFlags
-//                                                        documentation ```java\nint directionFlags\n```
+//                                                        signature_documentation java int directionFlags
       return new DragBuilder3(controller, recyclerView, makeMovementFlags(directionFlags, 0));
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller.
@@ -255,38 +255,38 @@ public DragBuilder3 withDirections(int directionFlags) {
   public static class DragBuilder3 {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                                 display_name DragBuilder3
-//                                 documentation ```java\npublic static class DragBuilder3\n```
+//                                 signature_documentation java public static class DragBuilder3
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller.
 //                                           display_name controller
-//                                           documentation ```java\nprivate final EpoxyController controller\n```
+//                                           signature_documentation java private final EpoxyController controller
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#recyclerView.
 //                                          display_name recyclerView
-//                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
+//                                          signature_documentation java private final unresolved_type recyclerView
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#movementFlags.
 //                                  display_name movementFlags
-//                                  documentation ```java\nprivate final int movementFlags\n```
+//                                  signature_documentation java private final int movementFlags
 
     private DragBuilder3(EpoxyController controller, RecyclerView recyclerView, int movementFlags) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\nprivate DragBuilder3(EpoxyController controller, unresolved_type recyclerView, int movementFlags)\n```
+//                       signature_documentation java private DragBuilder3(EpoxyController controller, unresolved_type recyclerView, int movementFlags)
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 6
 //                                                  display_name controller
-//                                                  documentation ```java\nEpoxyController controller\n```
+//                                                  signature_documentation java EpoxyController controller
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                ^^^^^^^^^^^^ definition local 7
 //                                                                             display_name recyclerView
-//                                                                             documentation ```java\nunresolved_type recyclerView\n```
+//                                                                             signature_documentation java unresolved_type recyclerView
 //                                                                                  ^^^^^^^^^^^^^ definition local 8
 //                                                                                                display_name movementFlags
-//                                                                                                documentation ```java\nint movementFlags\n```
+//                                                                                                signature_documentation java int movementFlags
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller.
 //                      ^^^^^^^^^^ reference local 6
@@ -305,26 +305,26 @@ private DragBuilder3(EpoxyController controller, RecyclerView recyclerView, int
     public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelClass) {
 //          ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
 //            display_name U
-//            documentation ```java\nU extends EpoxyModel\n```
+//            signature_documentation java U extends EpoxyModel
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
 //                                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().
 //                                                           display_name withTarget
-//                                                           documentation ```java\npublic <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelClass)\n```
+//                                                           signature_documentation java public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelClass)
 //                                                           documentation  Set the type of Epoxy model that is draggable. This approach works well if you only have one\n draggable type.\n
 //                                                           ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                 ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
 //                                                                    ^^^^^^^^^^^^^^^^ definition local 9
 //                                                                                     display_name targetModelClass
-//                                                                                     documentation ```java\nClass<U> targetModelClass\n```
+//                                                                                     signature_documentation java Class<U> targetModelClass
       List<Class<? extends EpoxyModel>> targetClasses = new ArrayList<>(1);
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^^^^ definition local 10
 //                                                    display_name targetClasses
-//                                                    documentation ```java\nList<Class<? extends EpoxyModel>> targetClasses\n```
+//                                                    signature_documentation java List<Class<? extends EpoxyModel>> targetClasses
 //                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
       targetClasses.add(targetModelClass);
 //    ^^^^^^^^^^^^^ reference local 10
@@ -352,13 +352,13 @@ public DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>... targe
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTargets().
 //                                              display_name withTargets
-//                                              documentation ```java\npublic DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)\n```
+//                                              signature_documentation java public DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)
 //                                              documentation  Specify which Epoxy model types are draggable. Use this if you have more than one type that\n is draggable.\n <p>\n If you only have one draggable type you should use {@link #withTarget(Class)}\n
 //                                              ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                             ^^^^^^^^^^^^^^^^^^ definition local 11
 //                                                                                                display_name targetModelClasses
-//                                                                                                documentation ```java\nClass<? extends EpoxyModel>[] targetModelClasses\n```
+//                                                                                                signature_documentation java Class<? extends EpoxyModel>[] targetModelClasses
       return new DragBuilder4<>(controller, recyclerView, movementFlags, EpoxyModel.class,
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller.
@@ -383,7 +383,7 @@ public DragBuilder4<EpoxyModel> forAllModels() {
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#forAllModels().
 //                                               display_name forAllModels
-//                                               documentation ```java\npublic DragBuilder4<EpoxyModel> forAllModels()\n```
+//                                               signature_documentation java public DragBuilder4<EpoxyModel> forAllModels()
 //                                               documentation  Use this if all models in the controller should be draggable, and if there are multiple types\n of models in the controller.\n <p>\n If you only have one model type you should use {@link #withTarget(Class)}\n
       return withTarget(EpoxyModel.class);
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().
@@ -395,68 +395,68 @@ public DragBuilder4<EpoxyModel> forAllModels() {
   public static class DragBuilder4<U extends EpoxyModel> {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
 //                                 display_name DragBuilder4
-//                                 documentation ```java\npublic static class DragBuilder4<U extends EpoxyModel>\n```
+//                                 signature_documentation java public static class DragBuilder4<U extends EpoxyModel>
 //                                 ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                   display_name U
-//                                   documentation ```java\nU extends EpoxyModel\n```
+//                                   signature_documentation java U extends EpoxyModel
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#controller.
 //                                           display_name controller
-//                                           documentation ```java\nprivate final EpoxyController controller\n```
+//                                           signature_documentation java private final EpoxyController controller
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#recyclerView.
 //                                          display_name recyclerView
-//                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
+//                                          signature_documentation java private final unresolved_type recyclerView
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#movementFlags.
 //                                  display_name movementFlags
-//                                  documentation ```java\nprivate final int movementFlags\n```
+//                                  signature_documentation java private final int movementFlags
     private final Class<U> targetModelClass;
 //                ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClass.
 //                                          display_name targetModelClass
-//                                          documentation ```java\nprivate final Class<U> targetModelClass\n```
+//                                          signature_documentation java private final Class<U> targetModelClass
     private final List<Class<? extends EpoxyModel>> targetModelClasses;
 //                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClasses.
 //                                                                     display_name targetModelClasses
-//                                                                     documentation ```java\nprivate final List<Class<? extends EpoxyModel>> targetModelClasses\n```
+//                                                                     signature_documentation java private final List<Class<? extends EpoxyModel>> targetModelClasses
 
     private DragBuilder4(EpoxyController controller,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\nprivate DragBuilder4(EpoxyController controller, unresolved_type recyclerView, int movementFlags, Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses)\n```
+//                       signature_documentation java private DragBuilder4(EpoxyController controller, unresolved_type recyclerView, int movementFlags, Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses)
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 12
 //                                                  display_name controller
-//                                                  documentation ```java\nEpoxyController controller\n```
+//                                                  signature_documentation java EpoxyController controller
         RecyclerView recyclerView, int movementFlags,
 //      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                   ^^^^^^^^^^^^ definition local 13
 //                                display_name recyclerView
-//                                documentation ```java\nunresolved_type recyclerView\n```
+//                                signature_documentation java unresolved_type recyclerView
 //                                     ^^^^^^^^^^^^^ definition local 14
 //                                                   display_name movementFlags
-//                                                   documentation ```java\nint movementFlags\n```
+//                                                   signature_documentation java int movementFlags
         Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //               ^^^^^^^^^^^^^^^^ definition local 15
 //                                display_name targetModelClass
-//                                documentation ```java\nClass<U> targetModelClass\n```
+//                                signature_documentation java Class<U> targetModelClass
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                   ^^^^^^^^^^^^^^^^^^ definition local 16
 //                                                                                      display_name targetModelClasses
-//                                                                                      documentation ```java\nList<Class<? extends EpoxyModel>> targetModelClasses\n```
+//                                                                                      signature_documentation java List<Class<? extends EpoxyModel>> targetModelClasses
 
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#controller.
@@ -493,18 +493,18 @@ public ItemTouchHelper andCallbacks(final DragCallbacks<U> callbacks) {
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                         ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#andCallbacks().
 //                                      display_name andCallbacks
-//                                      documentation ```java\npublic unresolved_type andCallbacks(DragCallbacks<U> callbacks)\n```
+//                                      signature_documentation java public unresolved_type andCallbacks(DragCallbacks<U> callbacks)
 //                                      documentation  Set callbacks to handle drag actions and lifecycle events.\n <p>\n You MUST implement {@link DragCallbacks#onModelMoved(int, int, EpoxyModel,\n View)} to update your data to reflect an item move.\n <p>\n You can optionally implement the other callbacks to modify the view being dragged. This is\n useful if you want to change things like the view background, size, color, etc\n\n @return An {@link ItemTouchHelper} instance that has been initialized and attached to a\n recyclerview. The touch helper has already been fully set up and can be ignored, but you may\n want to hold a reference to it if you need to later detach the recyclerview to disable touch\n events via setting null on {@link ItemTouchHelper#attachToRecyclerView(RecyclerView)}\n
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#
 //                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                             ^^^^^^^^^ definition local 17
 //                                                                       display_name callbacks
-//                                                                       documentation ```java\nfinal DragCallbacks<U> callbacks\n```
+//                                                                       signature_documentation java final DragCallbacks<U> callbacks
       ItemTouchHelper itemTouchHelper =
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                    ^^^^^^^^^^^^^^^ definition local 18
 //                                    display_name itemTouchHelper
-//                                    documentation ```java\nunresolved_type itemTouchHelper\n```
+//                                    signature_documentation java unresolved_type itemTouchHelper
           new ItemTouchHelper(new EpoxyModelTouchCallback<U>(controller, targetModelClass) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
 //                                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
@@ -516,15 +516,15 @@ public ItemTouchHelper andCallbacks(final DragCallbacks<U> callbacks) {
             public int getMovementFlagsForModel(U model, int adapterPosition) {
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 23
 //                                              display_name getMovementFlagsForModel
-//                                              documentation ```java\n@Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)\n```
+//                                              signature_documentation java @Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)
 //                                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                ^^^^^ definition local 24
 //                                                      display_name model
-//                                                      documentation ```java\nU model\n```
+//                                                      signature_documentation java U model
 //                                                           ^^^^^^^^^^^^^^^ definition local 25
 //                                                                           display_name adapterPosition
-//                                                                           documentation ```java\nint adapterPosition\n```
+//                                                                           signature_documentation java int adapterPosition
               return movementFlags;
 //                   ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#movementFlags.
             }
@@ -534,16 +534,16 @@ public int getMovementFlagsForModel(U model, int adapterPosition) {
             protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                            ^^^^^^^^^^^^^^^^ definition local 26
 //                                             display_name isTouchableModel
-//                                             documentation ```java\n@Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)\n```
+//                                             signature_documentation java @Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 27
 //                                                                 display_name model
-//                                                                 documentation ```java\nEpoxyModel<?> model\n```
+//                                                                 signature_documentation java EpoxyModel<?> model
               boolean isTargetType = targetModelClasses.size() == 1
 //                    ^^^^^^^^^^^^ definition local 28
 //                                 display_name isTargetType
-//                                 documentation ```java\nboolean isTargetType\n```
+//                                 signature_documentation java boolean isTargetType
 //                                   ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClasses.
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
                   ? super.isTouchableModel(model)
@@ -570,20 +570,20 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
             public void onDragStarted(U model, View itemView, int adapterPosition) {
 //                      ^^^^^^^^^^^^^ definition local 30
 //                                    display_name onDragStarted
-//                                    documentation ```java\n@Override\npublic void onDragStarted(U model, unresolved_type itemView, int adapterPosition)\n```
+//                                    signature_documentation java @Override\npublic void onDragStarted(U model, unresolved_type itemView, int adapterPosition)
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                      ^^^^^ definition local 31
 //                                            display_name model
-//                                            documentation ```java\nU model\n```
+//                                            signature_documentation java U model
 //                                             ^^^^ reference semanticdb maven . . View#
 //                                                  ^^^^^^^^ definition local 32
 //                                                           display_name itemView
-//                                                           documentation ```java\nunresolved_type itemView\n```
+//                                                           signature_documentation java unresolved_type itemView
 //                                                                ^^^^^^^^^^^^^^^ definition local 33
 //                                                                                display_name adapterPosition
-//                                                                                documentation ```java\nint adapterPosition\n```
+//                                                                                signature_documentation java int adapterPosition
               callbacks.onDragStarted(model, itemView, adapterPosition);
 //            ^^^^^^^^^ reference local 17
 //                      ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
@@ -597,17 +597,17 @@ public void onDragStarted(U model, View itemView, int adapterPosition) {
             public void onDragReleased(U model, View itemView) {
 //                      ^^^^^^^^^^^^^^ definition local 34
 //                                     display_name onDragReleased
-//                                     documentation ```java\n@Override\npublic void onDragReleased(U model, unresolved_type itemView)\n```
+//                                     signature_documentation java @Override\npublic void onDragReleased(U model, unresolved_type itemView)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                       ^^^^^ definition local 35
 //                                             display_name model
-//                                             documentation ```java\nU model\n```
+//                                             signature_documentation java U model
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 36
 //                                                            display_name itemView
-//                                                            documentation ```java\nunresolved_type itemView\n```
+//                                                            signature_documentation java unresolved_type itemView
               callbacks.onDragReleased(model, itemView);
 //            ^^^^^^^^^ reference local 17
 //                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
@@ -620,24 +620,24 @@ public void onDragReleased(U model, View itemView) {
             public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved,
 //                      ^^^^^^^^^^^^ definition local 37
 //                                   display_name onModelMoved
-//                                   documentation ```java\n@Override\npublic void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, unresolved_type itemView)\n```
+//                                   signature_documentation java @Override\npublic void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, unresolved_type itemView)
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                                       ^^^^^^^^^^^^ definition local 38
 //                                                    display_name fromPosition
-//                                                    documentation ```java\nint fromPosition\n```
+//                                                    signature_documentation java int fromPosition
 //                                                         ^^^^^^^^^^ definition local 39
 //                                                                    display_name toPosition
-//                                                                    documentation ```java\nint toPosition\n```
+//                                                                    signature_documentation java int toPosition
 //                                                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                                       ^^^^^^^^^^^^^^^ definition local 40
 //                                                                                       display_name modelBeingMoved
-//                                                                                       documentation ```java\nU modelBeingMoved\n```
+//                                                                                       signature_documentation java U modelBeingMoved
                 View itemView) {
 //              ^^^^ reference semanticdb maven . . View#
 //                   ^^^^^^^^ definition local 41
 //                            display_name itemView
-//                            documentation ```java\nunresolved_type itemView\n```
+//                            signature_documentation java unresolved_type itemView
               callbacks.onModelMoved(fromPosition, toPosition, modelBeingMoved, itemView);
 //            ^^^^^^^^^ reference local 17
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
@@ -652,7 +652,7 @@ public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved,
             public void clearView(U model, View itemView) {
 //                      ^^^^^^^^^ definition local 42
 //                                display_name clearView
-//                                documentation ```java\n@Override\npublic void clearView(U model, unresolved_type itemView)\n```
+//                                signature_documentation java @Override\npublic void clearView(U model, unresolved_type itemView)
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
@@ -661,11 +661,11 @@ public void clearView(U model, View itemView) {
 //                                ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                  ^^^^^ definition local 43
 //                                        display_name model
-//                                        documentation ```java\nU model\n```
+//                                        signature_documentation java U model
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^^^^^ definition local 44
 //                                                       display_name itemView
-//                                                       documentation ```java\nunresolved_type itemView\n```
+//                                                       signature_documentation java unresolved_type itemView
               callbacks.clearView(model, itemView);
 //            ^^^^^^^^^ reference local 17
 //                      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView().
@@ -687,15 +687,15 @@ public void clearView(U model, View itemView) {
   public abstract static class DragCallbacks<T extends EpoxyModel>
 //                             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#
 //                                           display_name DragCallbacks
-//                                           documentation ```java\npublic abstract static class DragCallbacks<T extends EpoxyModel>\n```
+//                                           signature_documentation java public abstract static class DragCallbacks<T extends EpoxyModel>
 //                                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
 //                             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#`<init>`().
 //                                           display_name <init>
-//                                           documentation ```java\npublic DragCallbacks()\n```
+//                                           signature_documentation java public DragCallbacks()
 //                                           ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                             display_name T
-//                                             documentation ```java\nT extends EpoxyModel\n```
+//                                             signature_documentation java T extends EpoxyModel
 //                                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
       implements EpoxyDragCallback<T> {
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
@@ -706,19 +706,19 @@ public abstract static class DragCallbacks<T extends EpoxyModel>
     public void onDragStarted(T model, View itemView, int adapterPosition) {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
 //                            display_name onDragStarted
-//                            documentation ```java\n@Override\npublic void onDragStarted(T model, unresolved_type itemView, int adapterPosition)\n```
+//                            signature_documentation java @Override\npublic void onDragStarted(T model, unresolved_type itemView, int adapterPosition)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                              ^^^^^ definition local 45
 //                                    display_name model
-//                                    documentation ```java\nT model\n```
+//                                    signature_documentation java T model
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 46
 //                                                   display_name itemView
-//                                                   documentation ```java\nunresolved_type itemView\n```
+//                                                   signature_documentation java unresolved_type itemView
 //                                                        ^^^^^^^^^^^^^^^ definition local 47
 //                                                                        display_name adapterPosition
-//                                                                        documentation ```java\nint adapterPosition\n```
+//                                                                        signature_documentation java int adapterPosition
 
     }
 
@@ -727,16 +727,16 @@ public void onDragStarted(T model, View itemView, int adapterPosition) {
     public void onDragReleased(T model, View itemView) {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
 //                             display_name onDragReleased
-//                             documentation ```java\n@Override\npublic void onDragReleased(T model, unresolved_type itemView)\n```
+//                             signature_documentation java @Override\npublic void onDragReleased(T model, unresolved_type itemView)
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                               ^^^^^ definition local 48
 //                                     display_name model
-//                                     documentation ```java\nT model\n```
+//                                     signature_documentation java T model
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 49
 //                                                    display_name itemView
-//                                                    documentation ```java\nunresolved_type itemView\n```
+//                                                    signature_documentation java unresolved_type itemView
 
     }
 
@@ -745,39 +745,39 @@ public void onDragReleased(T model, View itemView) {
     public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved,
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
 //                                    display_name onModelMoved
-//                                    documentation ```java\n@Override\npublic abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)\n```
+//                                    signature_documentation java @Override\npublic abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                        ^^^^^^^^^^^^ definition local 50
 //                                                     display_name fromPosition
-//                                                     documentation ```java\nint fromPosition\n```
+//                                                     signature_documentation java int fromPosition
 //                                                          ^^^^^^^^^^ definition local 51
 //                                                                     display_name toPosition
-//                                                                     documentation ```java\nint toPosition\n```
+//                                                                     signature_documentation java int toPosition
 //                                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                                                        ^^^^^^^^^^^^^^^ definition local 52
 //                                                                                        display_name modelBeingMoved
-//                                                                                        documentation ```java\nT modelBeingMoved\n```
+//                                                                                        signature_documentation java T modelBeingMoved
         View itemView);
 //      ^^^^ reference semanticdb maven . . View#
 //           ^^^^^^^^ definition local 53
 //                    display_name itemView
-//                    documentation ```java\nunresolved_type itemView\n```
+//                    signature_documentation java unresolved_type itemView
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void clearView(T model, View itemView) {
 //              ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView().
 //                        display_name clearView
-//                        documentation ```java\n@Override\npublic void clearView(T model, unresolved_type itemView)\n```
+//                        signature_documentation java @Override\npublic void clearView(T model, unresolved_type itemView)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                          ^^^^^ definition local 54
 //                                display_name model
-//                                documentation ```java\nT model\n```
+//                                signature_documentation java T model
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^^^^^ definition local 55
 //                                               display_name itemView
-//                                               documentation ```java\nunresolved_type itemView\n```
+//                                               signature_documentation java unresolved_type itemView
 
     }
 
@@ -789,12 +789,12 @@ public void clearView(T model, View itemView) {
     public boolean isDragEnabledForModel(T model) {
 //                 ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#isDragEnabledForModel().
 //                                       display_name isDragEnabledForModel
-//                                       documentation ```java\npublic boolean isDragEnabledForModel(T model)\n```
+//                                       signature_documentation java public boolean isDragEnabledForModel(T model)
 //                                       documentation  Whether the given model should be draggable.\n <p>\n True by default. You may override this to toggle draggability for a model.\n
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                         ^^^^^ definition local 56
 //                                               display_name model
-//                                               documentation ```java\nT model\n```
+//                                               signature_documentation java T model
       return true;
     }
 
@@ -803,15 +803,15 @@ public boolean isDragEnabledForModel(T model) {
     public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel().
 //                                            display_name getMovementFlagsForModel
-//                                            documentation ```java\n@Override\npublic final int getMovementFlagsForModel(T model, int adapterPosition)\n```
+//                                            signature_documentation java @Override\npublic final int getMovementFlagsForModel(T model, int adapterPosition)
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                              ^^^^^ definition local 57
 //                                                    display_name model
-//                                                    documentation ```java\nT model\n```
+//                                                    signature_documentation java T model
 //                                                         ^^^^^^^^^^^^^^^ definition local 58
 //                                                                         display_name adapterPosition
-//                                                                         documentation ```java\nint adapterPosition\n```
+//                                                                         signature_documentation java int adapterPosition
       // No-Op this is not used
       return 0;
     }
@@ -822,18 +822,18 @@ public final int getMovementFlagsForModel(T model, int adapterPosition) {
    * with an Epoxy adapter or controller.
 //                            ^^^^^^^^^^ definition local 19
 //                                       display_name controller
-//                                       documentation ```java\nEpoxyController controller\n```
+//                                       signature_documentation java EpoxyController controller
    */
   public static SwipeBuilder initSwiping(RecyclerView recyclerView) {
 //              ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#initSwiping().
 //                                       display_name initSwiping
-//                                       documentation ```java\npublic static SwipeBuilder initSwiping(unresolved_type recyclerView)\n```
+//                                       signature_documentation java public static SwipeBuilder initSwiping(unresolved_type recyclerView)
 //                                       documentation  The entry point for setting up swipe support for a RecyclerView. The RecyclerView must be set\n with an Epoxy adapter or controller.\n
 //                                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                    ^^^^^^^^^^^^ definition local 59
 //                                                                 display_name recyclerView
-//                                                                 documentation ```java\nunresolved_type recyclerView\n```
+//                                                                 signature_documentation java unresolved_type recyclerView
     return new SwipeBuilder(recyclerView);
 //             ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#`<init>`().
 //                          ^^^^^^^^^^^^ reference local 59
@@ -842,22 +842,22 @@ public static SwipeBuilder initSwiping(RecyclerView recyclerView) {
   public static class SwipeBuilder {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#
 //                                 display_name SwipeBuilder
-//                                 documentation ```java\npublic static class SwipeBuilder\n```
+//                                 signature_documentation java public static class SwipeBuilder
 
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView.
 //                                          display_name recyclerView
-//                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
+//                                          signature_documentation java private final unresolved_type recyclerView
 
     private SwipeBuilder(RecyclerView recyclerView) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\nprivate SwipeBuilder(unresolved_type recyclerView)\n```
+//                       signature_documentation java private SwipeBuilder(unresolved_type recyclerView)
 //                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                    ^^^^^^^^^^^^ definition local 60
 //                                                 display_name recyclerView
-//                                                 documentation ```java\nunresolved_type recyclerView\n```
+//                                                 signature_documentation java unresolved_type recyclerView
       this.recyclerView = recyclerView;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView.
 //                        ^^^^^^^^^^^^ reference local 60
@@ -868,7 +868,7 @@ public SwipeBuilder2 right() {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                       ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#right().
 //                             display_name right
-//                             documentation ```java\npublic SwipeBuilder2 right()\n```
+//                             signature_documentation java public SwipeBuilder2 right()
 //                             documentation Enable swiping right. 
       return withDirections(ItemTouchHelper.RIGHT);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
@@ -881,7 +881,7 @@ public SwipeBuilder2 left() {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#left().
 //                            display_name left
-//                            documentation ```java\npublic SwipeBuilder2 left()\n```
+//                            signature_documentation java public SwipeBuilder2 left()
 //                            documentation Enable swiping left. 
       return withDirections(ItemTouchHelper.LEFT);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
@@ -894,7 +894,7 @@ public SwipeBuilder2 leftAndRight() {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#leftAndRight().
 //                                    display_name leftAndRight
-//                                    documentation ```java\npublic SwipeBuilder2 leftAndRight()\n```
+//                                    signature_documentation java public SwipeBuilder2 leftAndRight()
 //                                    documentation Enable swiping horizontally, left and right. 
       return withDirections(ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
@@ -917,11 +917,11 @@ public SwipeBuilder2 withDirections(int directionFlags) {
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                       ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
 //                                      display_name withDirections
-//                                      documentation ```java\npublic SwipeBuilder2 withDirections(int directionFlags)\n```
+//                                      signature_documentation java public SwipeBuilder2 withDirections(int directionFlags)
 //                                      documentation  Set custom movement flags to dictate which swipe directions should be allowed.\n <p>\n Can be any of {@link ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN}, {@link ItemTouchHelper#START}, {@link\n ItemTouchHelper#END}\n <p>\n Flags can be OR'd together to allow multiple directions.\n
 //                                          ^^^^^^^^^^^^^^ definition local 61
 //                                                         display_name directionFlags
-//                                                         documentation ```java\nint directionFlags\n```
+//                                                         signature_documentation java int directionFlags
       return new SwipeBuilder2(recyclerView, makeMovementFlags(0, directionFlags));
 //               ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#`<init>`().
 //                             ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView.
@@ -933,30 +933,30 @@ public SwipeBuilder2 withDirections(int directionFlags) {
   public static class SwipeBuilder2 {
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                                  display_name SwipeBuilder2
-//                                  documentation ```java\npublic static class SwipeBuilder2\n```
+//                                  signature_documentation java public static class SwipeBuilder2
 
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView.
 //                                          display_name recyclerView
-//                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
+//                                          signature_documentation java private final unresolved_type recyclerView
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#movementFlags.
 //                                  display_name movementFlags
-//                                  documentation ```java\nprivate final int movementFlags\n```
+//                                  signature_documentation java private final int movementFlags
 
     private SwipeBuilder2(RecyclerView recyclerView,
 //          ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#`<init>`().
 //                        display_name <init>
-//                        documentation ```java\nprivate SwipeBuilder2(unresolved_type recyclerView, int movementFlags)\n```
+//                        signature_documentation java private SwipeBuilder2(unresolved_type recyclerView, int movementFlags)
 //                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                     ^^^^^^^^^^^^ definition local 62
 //                                                  display_name recyclerView
-//                                                  documentation ```java\nunresolved_type recyclerView\n```
+//                                                  signature_documentation java unresolved_type recyclerView
         int movementFlags) {
 //          ^^^^^^^^^^^^^ definition local 63
 //                        display_name movementFlags
-//                        documentation ```java\nint movementFlags\n```
+//                        signature_documentation java int movementFlags
       this.recyclerView = recyclerView;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView.
 //                        ^^^^^^^^^^^^ reference local 62
@@ -972,29 +972,29 @@ private SwipeBuilder2(RecyclerView recyclerView,
     public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelClass) {
 //          ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
 //            display_name U
-//            documentation ```java\nU extends EpoxyModel\n```
+//            signature_documentation java U extends EpoxyModel
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
 //                                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().
 //                                                            display_name withTarget
-//                                                            documentation ```java\npublic <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelClass)\n```
+//                                                            signature_documentation java public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelClass)
 //                                                            documentation  Set the type of Epoxy model that is swipable. Use this if you only have one\n swipable type.\n
 //                                                            ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
 //                                                                     ^^^^^^^^^^^^^^^^ definition local 22
 //                                                                                      display_name targetModelClass
-//                                                                                      documentation ```java\nClass<U> targetModelClass\n```
+//                                                                                      signature_documentation java Class<U> targetModelClass
 //                                                                     ^^^^^^^^^^^^^^^^ definition local 64
 //                                                                                      display_name targetModelClass
-//                                                                                      documentation ```java\nClass<U> targetModelClass\n```
+//                                                                                      signature_documentation java Class<U> targetModelClass
       List<Class<? extends EpoxyModel>> targetClasses = new ArrayList<>(1);
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^^^^ definition local 65
 //                                                    display_name targetClasses
-//                                                    documentation ```java\nList<Class<? extends EpoxyModel>> targetClasses\n```
+//                                                    signature_documentation java List<Class<? extends EpoxyModel>> targetClasses
 //                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
       targetClasses.add(targetModelClass);
 //    ^^^^^^^^^^^^^ reference local 65
@@ -1021,14 +1021,14 @@ public SwipeBuilder3<EpoxyModel> withTargets(
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTargets().
 //                                               display_name withTargets
-//                                               documentation ```java\npublic SwipeBuilder3<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)\n```
+//                                               signature_documentation java public SwipeBuilder3<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)
 //                                               documentation  Specify which Epoxy model types are swipable. Use this if you have more than one type that\n is swipable.\n <p>\n If you only have one swipable type you should use {@link #withTarget(Class)}\n
         Class<? extends EpoxyModel>... targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^^^^^^^^^^^^^^ definition local 66
 //                                                        display_name targetModelClasses
-//                                                        documentation ```java\nClass<? extends EpoxyModel>[] targetModelClasses\n```
+//                                                        signature_documentation java Class<? extends EpoxyModel>[] targetModelClasses
       return new SwipeBuilder3<>(recyclerView, movementFlags, EpoxyModel.class,
 //               ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView.
@@ -1052,7 +1052,7 @@ public SwipeBuilder3<EpoxyModel> forAllModels() {
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#forAllModels().
 //                                                display_name forAllModels
-//                                                documentation ```java\npublic SwipeBuilder3<EpoxyModel> forAllModels()\n```
+//                                                signature_documentation java public SwipeBuilder3<EpoxyModel> forAllModels()
 //                                                documentation  Use this if all models in the controller should be swipable, and if there are multiple types\n of models in the controller.\n <p>\n If you only have one model type you should use {@link #withTarget(Class)}\n
       return withTarget(EpoxyModel.class);
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().
@@ -1064,59 +1064,59 @@ public SwipeBuilder3<EpoxyModel> forAllModels() {
   public static class SwipeBuilder3<U extends EpoxyModel> {
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
 //                                  display_name SwipeBuilder3
-//                                  documentation ```java\npublic static class SwipeBuilder3<U extends EpoxyModel>\n```
+//                                  signature_documentation java public static class SwipeBuilder3<U extends EpoxyModel>
 //                                  ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                    display_name U
-//                                    documentation ```java\nU extends EpoxyModel\n```
+//                                    signature_documentation java U extends EpoxyModel
 //                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#recyclerView.
 //                                          display_name recyclerView
-//                                          documentation ```java\nprivate final unresolved_type recyclerView\n```
+//                                          signature_documentation java private final unresolved_type recyclerView
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#movementFlags.
 //                                  display_name movementFlags
-//                                  documentation ```java\nprivate final int movementFlags\n```
+//                                  signature_documentation java private final int movementFlags
     private final Class<U> targetModelClass;
 //                ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClass.
 //                                          display_name targetModelClass
-//                                          documentation ```java\nprivate final Class<U> targetModelClass\n```
+//                                          signature_documentation java private final Class<U> targetModelClass
     private final List<Class<? extends EpoxyModel>> targetModelClasses;
 //                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClasses.
 //                                                                     display_name targetModelClasses
-//                                                                     documentation ```java\nprivate final List<Class<? extends EpoxyModel>> targetModelClasses\n```
+//                                                                     signature_documentation java private final List<Class<? extends EpoxyModel>> targetModelClasses
 
     private SwipeBuilder3(
 //          ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
 //                        display_name <init>
-//                        documentation ```java\nprivate SwipeBuilder3(unresolved_type recyclerView, int movementFlags, Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses)\n```
+//                        signature_documentation java private SwipeBuilder3(unresolved_type recyclerView, int movementFlags, Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses)
         RecyclerView recyclerView, int movementFlags,
 //      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                   ^^^^^^^^^^^^ definition local 67
 //                                display_name recyclerView
-//                                documentation ```java\nunresolved_type recyclerView\n```
+//                                signature_documentation java unresolved_type recyclerView
 //                                     ^^^^^^^^^^^^^ definition local 68
 //                                                   display_name movementFlags
-//                                                   documentation ```java\nint movementFlags\n```
+//                                                   signature_documentation java int movementFlags
         Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //               ^^^^^^^^^^^^^^^^ definition local 69
 //                                display_name targetModelClass
-//                                documentation ```java\nClass<U> targetModelClass\n```
+//                                signature_documentation java Class<U> targetModelClass
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                   ^^^^^^^^^^^^^^^^^^ definition local 70
 //                                                                                      display_name targetModelClasses
-//                                                                                      documentation ```java\nList<Class<? extends EpoxyModel>> targetModelClasses\n```
+//                                                                                      signature_documentation java List<Class<? extends EpoxyModel>> targetModelClasses
 
       this.recyclerView = recyclerView;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#recyclerView.
@@ -1149,18 +1149,18 @@ public ItemTouchHelper andCallbacks(final SwipeCallbacks<U> callbacks) {
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                         ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#andCallbacks().
 //                                      display_name andCallbacks
-//                                      documentation ```java\npublic unresolved_type andCallbacks(SwipeCallbacks<U> callbacks)\n```
+//                                      signature_documentation java public unresolved_type andCallbacks(SwipeCallbacks<U> callbacks)
 //                                      documentation  Set callbacks to handle swipe actions and lifecycle events.\n <p>\n You MUST implement {@link SwipeCallbacks#onSwipeCompleted(EpoxyModel, View, int, int)} to\n remove the swiped item from your data and request a model build.\n <p>\n You can optionally implement the other callbacks to modify the view as it is being swiped.\n\n @return An {@link ItemTouchHelper} instance that has been initialized and attached to a\n recyclerview. The touch helper has already been fully set up and can be ignored, but you may\n want to hold a reference to it if you need to later detach the recyclerview to disable touch\n events via setting null on {@link ItemTouchHelper#attachToRecyclerView(RecyclerView)}\n
 //                                            ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                                              ^^^^^^^^^ definition local 71
 //                                                                        display_name callbacks
-//                                                                        documentation ```java\nfinal SwipeCallbacks<U> callbacks\n```
+//                                                                        signature_documentation java final SwipeCallbacks<U> callbacks
       ItemTouchHelper itemTouchHelper =
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                    ^^^^^^^^^^^^^^^ definition local 72
 //                                    display_name itemTouchHelper
-//                                    documentation ```java\nunresolved_type itemTouchHelper\n```
+//                                    signature_documentation java unresolved_type itemTouchHelper
           new ItemTouchHelper(new EpoxyModelTouchCallback<U>(null, targetModelClass) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
 //                                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
@@ -1171,15 +1171,15 @@ public ItemTouchHelper andCallbacks(final SwipeCallbacks<U> callbacks) {
             public int getMovementFlagsForModel(U model, int adapterPosition) {
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 77
 //                                              display_name getMovementFlagsForModel
-//                                              documentation ```java\n@Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)\n```
+//                                              signature_documentation java @Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)
 //                                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                                ^^^^^ definition local 78
 //                                                      display_name model
-//                                                      documentation ```java\nU model\n```
+//                                                      signature_documentation java U model
 //                                                           ^^^^^^^^^^^^^^^ definition local 79
 //                                                                           display_name adapterPosition
-//                                                                           documentation ```java\nint adapterPosition\n```
+//                                                                           signature_documentation java int adapterPosition
               return movementFlags;
 //                   ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#movementFlags.
             }
@@ -1189,16 +1189,16 @@ public int getMovementFlagsForModel(U model, int adapterPosition) {
             protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                            ^^^^^^^^^^^^^^^^ definition local 80
 //                                             display_name isTouchableModel
-//                                             documentation ```java\n@Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)\n```
+//                                             signature_documentation java @Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 81
 //                                                                 display_name model
-//                                                                 documentation ```java\nEpoxyModel<?> model\n```
+//                                                                 signature_documentation java EpoxyModel<?> model
               boolean isTargetType = targetModelClasses.size() == 1
 //                    ^^^^^^^^^^^^ definition local 82
 //                                 display_name isTargetType
-//                                 documentation ```java\nboolean isTargetType\n```
+//                                 signature_documentation java boolean isTargetType
 //                                   ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClasses.
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
                   ? super.isTouchableModel(model)
@@ -1225,20 +1225,20 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
             public void onSwipeStarted(U model, View itemView, int adapterPosition) {
 //                      ^^^^^^^^^^^^^^ definition local 84
 //                                     display_name onSwipeStarted
-//                                     documentation ```java\n@Override\npublic void onSwipeStarted(U model, unresolved_type itemView, int adapterPosition)\n```
+//                                     signature_documentation java @Override\npublic void onSwipeStarted(U model, unresolved_type itemView, int adapterPosition)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                       ^^^^^ definition local 85
 //                                             display_name model
-//                                             documentation ```java\nU model\n```
+//                                             signature_documentation java U model
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 86
 //                                                            display_name itemView
-//                                                            documentation ```java\nunresolved_type itemView\n```
+//                                                            signature_documentation java unresolved_type itemView
 //                                                                 ^^^^^^^^^^^^^^^ definition local 87
 //                                                                                 display_name adapterPosition
-//                                                                                 documentation ```java\nint adapterPosition\n```
+//                                                                                 signature_documentation java int adapterPosition
               callbacks.onSwipeStarted(model, itemView, adapterPosition);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
@@ -1252,25 +1252,25 @@ public void onSwipeStarted(U model, View itemView, int adapterPosition) {
             public void onSwipeProgressChanged(U model, View itemView, float swipeProgress,
 //                      ^^^^^^^^^^^^^^^^^^^^^^ definition local 88
 //                                             display_name onSwipeProgressChanged
-//                                             documentation ```java\n@Override\npublic void onSwipeProgressChanged(U model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)\n```
+//                                             signature_documentation java @Override\npublic void onSwipeProgressChanged(U model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                               ^^^^^ definition local 89
 //                                                     display_name model
-//                                                     documentation ```java\nU model\n```
+//                                                     signature_documentation java U model
 //                                                      ^^^^ reference semanticdb maven . . View#
 //                                                           ^^^^^^^^ definition local 90
 //                                                                    display_name itemView
-//                                                                    documentation ```java\nunresolved_type itemView\n```
+//                                                                    signature_documentation java unresolved_type itemView
 //                                                                           ^^^^^^^^^^^^^ definition local 91
 //                                                                                         display_name swipeProgress
-//                                                                                         documentation ```java\nfloat swipeProgress\n```
+//                                                                                         signature_documentation java float swipeProgress
                 Canvas canvas) {
 //              ^^^^^^ reference semanticdb maven . . Canvas#
 //                     ^^^^^^ definition local 92
 //                            display_name canvas
-//                            documentation ```java\nunresolved_type canvas\n```
+//                            signature_documentation java unresolved_type canvas
               callbacks.onSwipeProgressChanged(model, itemView, swipeProgress, canvas);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
@@ -1285,23 +1285,23 @@ public void onSwipeProgressChanged(U model, View itemView, float swipeProgress,
             public void onSwipeCompleted(U model, View itemView, int position, int direction) {
 //                      ^^^^^^^^^^^^^^^^ definition local 93
 //                                       display_name onSwipeCompleted
-//                                       documentation ```java\n@Override\npublic void onSwipeCompleted(U model, unresolved_type itemView, int position, int direction)\n```
+//                                       signature_documentation java @Override\npublic void onSwipeCompleted(U model, unresolved_type itemView, int position, int direction)
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                         ^^^^^ definition local 94
 //                                               display_name model
-//                                               documentation ```java\nU model\n```
+//                                               signature_documentation java U model
 //                                                ^^^^ reference semanticdb maven . . View#
 //                                                     ^^^^^^^^ definition local 95
 //                                                              display_name itemView
-//                                                              documentation ```java\nunresolved_type itemView\n```
+//                                                              signature_documentation java unresolved_type itemView
 //                                                                   ^^^^^^^^ definition local 96
 //                                                                            display_name position
-//                                                                            documentation ```java\nint position\n```
+//                                                                            signature_documentation java int position
 //                                                                                 ^^^^^^^^^ definition local 97
 //                                                                                           display_name direction
-//                                                                                           documentation ```java\nint direction\n```
+//                                                                                           signature_documentation java int direction
               callbacks.onSwipeCompleted(model, itemView, position, direction);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
@@ -1316,17 +1316,17 @@ public void onSwipeCompleted(U model, View itemView, int position, int direction
             public void onSwipeReleased(U model, View itemView) {
 //                      ^^^^^^^^^^^^^^^ definition local 98
 //                                      display_name onSwipeReleased
-//                                      documentation ```java\n@Override\npublic void onSwipeReleased(U model, unresolved_type itemView)\n```
+//                                      signature_documentation java @Override\npublic void onSwipeReleased(U model, unresolved_type itemView)
 //                                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                        ^^^^^ definition local 99
 //                                              display_name model
-//                                              documentation ```java\nU model\n```
+//                                              signature_documentation java U model
 //                                               ^^^^ reference semanticdb maven . . View#
 //                                                    ^^^^^^^^ definition local 100
 //                                                             display_name itemView
-//                                                             documentation ```java\nunresolved_type itemView\n```
+//                                                             signature_documentation java unresolved_type itemView
               callbacks.onSwipeReleased(model, itemView);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
@@ -1339,7 +1339,7 @@ public void onSwipeReleased(U model, View itemView) {
             public void clearView(U model, View itemView) {
 //                      ^^^^^^^^^ definition local 101
 //                                display_name clearView
-//                                documentation ```java\n@Override\npublic void clearView(U model, unresolved_type itemView)\n```
+//                                signature_documentation java @Override\npublic void clearView(U model, unresolved_type itemView)
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
@@ -1348,11 +1348,11 @@ public void clearView(U model, View itemView) {
 //                                ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                  ^^^^^ definition local 102
 //                                        display_name model
-//                                        documentation ```java\nU model\n```
+//                                        signature_documentation java U model
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^^^^^ definition local 103
 //                                                       display_name itemView
-//                                                       documentation ```java\nunresolved_type itemView\n```
+//                                                       signature_documentation java unresolved_type itemView
               callbacks.clearView(model, itemView);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView().
@@ -1374,15 +1374,15 @@ public void clearView(U model, View itemView) {
   public abstract static class SwipeCallbacks<T extends EpoxyModel>
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#
 //                                            display_name SwipeCallbacks
-//                                            documentation ```java\npublic abstract static class SwipeCallbacks<T extends EpoxyModel>\n```
+//                                            signature_documentation java public abstract static class SwipeCallbacks<T extends EpoxyModel>
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#`<init>`().
 //                                            display_name <init>
-//                                            documentation ```java\npublic SwipeCallbacks()\n```
+//                                            signature_documentation java public SwipeCallbacks()
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                              display_name T
-//                                              documentation ```java\nT extends EpoxyModel\n```
+//                                              signature_documentation java T extends EpoxyModel
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
       implements EpoxySwipeCallback<T> {
 //               ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
@@ -1393,19 +1393,19 @@ public abstract static class SwipeCallbacks<T extends EpoxyModel>
     public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
 //                             display_name onSwipeStarted
-//                             documentation ```java\n@Override\npublic void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)\n```
+//                             signature_documentation java @Override\npublic void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                               ^^^^^ definition local 104
 //                                     display_name model
-//                                     documentation ```java\nT model\n```
+//                                     signature_documentation java T model
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 105
 //                                                    display_name itemView
-//                                                    documentation ```java\nunresolved_type itemView\n```
+//                                                    signature_documentation java unresolved_type itemView
 //                                                         ^^^^^^^^^^^^^^^ definition local 106
 //                                                                         display_name adapterPosition
-//                                                                         documentation ```java\nint adapterPosition\n```
+//                                                                         signature_documentation java int adapterPosition
 
     }
 
@@ -1414,24 +1414,24 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) {
     public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
 //                                     display_name onSwipeProgressChanged
-//                                     documentation ```java\n@Override\npublic void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)\n```
+//                                     signature_documentation java @Override\npublic void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                       ^^^^^ definition local 107
 //                                             display_name model
-//                                             documentation ```java\nT model\n```
+//                                             signature_documentation java T model
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 108
 //                                                            display_name itemView
-//                                                            documentation ```java\nunresolved_type itemView\n```
+//                                                            signature_documentation java unresolved_type itemView
 //                                                                   ^^^^^^^^^^^^^ definition local 109
 //                                                                                 display_name swipeProgress
-//                                                                                 documentation ```java\nfloat swipeProgress\n```
+//                                                                                 signature_documentation java float swipeProgress
         Canvas canvas) {
 //      ^^^^^^ reference semanticdb maven . . Canvas#
 //             ^^^^^^ definition local 110
 //                    display_name canvas
-//                    documentation ```java\nunresolved_type canvas\n```
+//                    signature_documentation java unresolved_type canvas
 
     }
 
@@ -1440,38 +1440,38 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
     public abstract void onSwipeCompleted(T model, View itemView, int position, int direction);
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
 //                                        display_name onSwipeCompleted
-//                                        documentation ```java\n@Override\npublic abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)\n```
+//                                        signature_documentation java @Override\npublic abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                          ^^^^^ definition local 111
 //                                                display_name model
-//                                                documentation ```java\nT model\n```
+//                                                signature_documentation java T model
 //                                                 ^^^^ reference semanticdb maven . . View#
 //                                                      ^^^^^^^^ definition local 112
 //                                                               display_name itemView
-//                                                               documentation ```java\nunresolved_type itemView\n```
+//                                                               signature_documentation java unresolved_type itemView
 //                                                                    ^^^^^^^^ definition local 113
 //                                                                             display_name position
-//                                                                             documentation ```java\nint position\n```
+//                                                                             signature_documentation java int position
 //                                                                                  ^^^^^^^^^ definition local 114
 //                                                                                            display_name direction
-//                                                                                            documentation ```java\nint direction\n```
+//                                                                                            signature_documentation java int direction
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
     public void onSwipeReleased(T model, View itemView) {
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
 //                              display_name onSwipeReleased
-//                              documentation ```java\n@Override\npublic void onSwipeReleased(T model, unresolved_type itemView)\n```
+//                              signature_documentation java @Override\npublic void onSwipeReleased(T model, unresolved_type itemView)
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                ^^^^^ definition local 115
 //                                      display_name model
-//                                      documentation ```java\nT model\n```
+//                                      signature_documentation java T model
 //                                       ^^^^ reference semanticdb maven . . View#
 //                                            ^^^^^^^^ definition local 116
 //                                                     display_name itemView
-//                                                     documentation ```java\nunresolved_type itemView\n```
+//                                                     signature_documentation java unresolved_type itemView
 
     }
 
@@ -1480,16 +1480,16 @@ public void onSwipeReleased(T model, View itemView) {
     public void clearView(T model, View itemView) {
 //              ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView().
 //                        display_name clearView
-//                        documentation ```java\n@Override\npublic void clearView(T model, unresolved_type itemView)\n```
+//                        signature_documentation java @Override\npublic void clearView(T model, unresolved_type itemView)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                          ^^^^^ definition local 117
 //                                display_name model
-//                                documentation ```java\nT model\n```
+//                                signature_documentation java T model
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^^^^^ definition local 118
 //                                               display_name itemView
-//                                               documentation ```java\nunresolved_type itemView\n```
+//                                               signature_documentation java unresolved_type itemView
 
     }
 
@@ -1501,12 +1501,12 @@ public void clearView(T model, View itemView) {
     public boolean isSwipeEnabledForModel(T model) {
 //                 ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#isSwipeEnabledForModel().
 //                                        display_name isSwipeEnabledForModel
-//                                        documentation ```java\npublic boolean isSwipeEnabledForModel(T model)\n```
+//                                        signature_documentation java public boolean isSwipeEnabledForModel(T model)
 //                                        documentation  Whether the given model should be swipable.\n <p>\n True by default. You may override this to toggle swipabaility for a model.\n
 //                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                          ^^^^^ definition local 119
 //                                                display_name model
-//                                                documentation ```java\nT model\n```
+//                                                signature_documentation java T model
       return true;
     }
 
@@ -1515,15 +1515,15 @@ public boolean isSwipeEnabledForModel(T model) {
     public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel().
 //                                            display_name getMovementFlagsForModel
-//                                            documentation ```java\n@Override\npublic final int getMovementFlagsForModel(T model, int adapterPosition)\n```
+//                                            signature_documentation java @Override\npublic final int getMovementFlagsForModel(T model, int adapterPosition)
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                              ^^^^^ definition local 120
 //                                                    display_name model
-//                                                    documentation ```java\nT model\n```
+//                                                    signature_documentation java T model
 //                                                         ^^^^^^^^^^^^^^^ definition local 121
 //                                                                         display_name adapterPosition
-//                                                                         documentation ```java\nint adapterPosition\n```
+//                                                                         signature_documentation java int adapterPosition
       // Not used
       return 0;
     }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
index f6f1dc692..95ebd2f29 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
@@ -34,12 +34,12 @@
 public abstract class EpoxyTouchHelperCallback extends ItemTouchHelper.Callback {
 //                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#
 //                                             display_name EpoxyTouchHelperCallback
-//                                             documentation ```java\npublic abstract class EpoxyTouchHelperCallback\n```
+//                                             signature_documentation java public abstract class EpoxyTouchHelperCallback
 //                                             documentation  A wrapper around {@link androidx.recyclerview.widget.ItemTouchHelper.Callback} to cast all\n view holders to {@link com.airbnb.epoxy.EpoxyViewHolder} for simpler use with Epoxy.\n
 //                                             relationship is_implementation semanticdb maven . . ItemTouchHelper/Callback#
 //                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#`<init>`().
 //                                             display_name <init>
-//                                             documentation ```java\npublic EpoxyTouchHelperCallback()\n```
+//                                             signature_documentation java public EpoxyTouchHelperCallback()
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper/
 //                                                                     ^^^^^^^^ reference semanticdb maven . . ItemTouchHelper/Callback#
 
@@ -48,16 +48,16 @@ public abstract class EpoxyTouchHelperCallback extends ItemTouchHelper.Callback
   public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHolder) {
 //                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
 //                                  display_name getMovementFlags
-//                                  documentation ```java\n@Override\npublic final int getMovementFlags(unresolved_type recyclerView, unresolved_type viewHolder)\n```
+//                                  signature_documentation java @Override\npublic final int getMovementFlags(unresolved_type recyclerView, unresolved_type viewHolder)
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                               ^^^^^^^^^^^^ definition local 0
 //                                                            display_name recyclerView
-//                                                            documentation ```java\nunresolved_type recyclerView\n```
+//                                                            signature_documentation java unresolved_type recyclerView
 //                                                             ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                        ^^^^^^^^^^ definition local 1
 //                                                                                   display_name viewHolder
-//                                                                                   documentation ```java\nunresolved_type viewHolder\n```
+//                                                                                   signature_documentation java unresolved_type viewHolder
     return getMovementFlags(recyclerView, (EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
 //                          ^^^^^^^^^^^^ reference local 0
@@ -71,37 +71,37 @@ public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHold
   protected abstract int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHolder);
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(+1).
 //                                        display_name getMovementFlags
-//                                        documentation ```java\nprotected abstract int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder)\n```
+//                                        signature_documentation java protected abstract int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder)
 //                                        documentation  @see #getMovementFlags(RecyclerView, ViewHolder)\n
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                     ^^^^^^^^^^^^ definition local 2
 //                                                                  display_name recyclerView
-//                                                                  documentation ```java\nunresolved_type recyclerView\n```
+//                                                                  signature_documentation java unresolved_type recyclerView
 //                                                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                   ^^^^^^^^^^ definition local 3
 //                                                                                              display_name viewHolder
-//                                                                                              documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                                              signature_documentation java EpoxyViewHolder viewHolder
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder, ViewHolder target) {
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                            display_name onMove
-//                            documentation ```java\n@Override\npublic final boolean onMove(unresolved_type recyclerView, unresolved_type viewHolder, unresolved_type target)\n```
+//                            signature_documentation java @Override\npublic final boolean onMove(unresolved_type recyclerView, unresolved_type viewHolder, unresolved_type target)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                         ^^^^^^^^^^^^ definition local 4
 //                                                      display_name recyclerView
-//                                                      documentation ```java\nunresolved_type recyclerView\n```
+//                                                      signature_documentation java unresolved_type recyclerView
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 5
 //                                                                             display_name viewHolder
-//                                                                             documentation ```java\nunresolved_type viewHolder\n```
+//                                                                             signature_documentation java unresolved_type viewHolder
 //                                                                              ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                                         ^^^^^^ definition local 6
 //                                                                                                display_name target
-//                                                                                                documentation ```java\nunresolved_type target\n```
+//                                                                                                signature_documentation java unresolved_type target
     return onMove(recyclerView, (EpoxyViewHolder) viewHolder, (EpoxyViewHolder) target);
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                ^^^^^^^^^^^^ reference local 4
@@ -117,37 +117,37 @@ public final boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder, Vi
   protected abstract boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                           ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
 //                                  display_name onMove
-//                                  documentation ```java\nprotected abstract boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target)\n```
+//                                  signature_documentation java protected abstract boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target)
 //                                  documentation  @see #onMove(RecyclerView, ViewHolder, ViewHolder)\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                               ^^^^^^^^^^^^ definition local 7
 //                                                            display_name recyclerView
-//                                                            documentation ```java\nunresolved_type recyclerView\n```
+//                                                            signature_documentation java unresolved_type recyclerView
 //                                                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                             ^^^^^^^^^^ definition local 8
 //                                                                                        display_name viewHolder
-//                                                                                        documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                                        signature_documentation java EpoxyViewHolder viewHolder
       EpoxyViewHolder target);
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 9
 //                           display_name target
-//                           documentation ```java\nEpoxyViewHolder target\n```
+//                           signature_documentation java EpoxyViewHolder target
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final void onSwiped(ViewHolder viewHolder, int direction) {
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
 //                           display_name onSwiped
-//                           documentation ```java\n@Override\npublic final void onSwiped(unresolved_type viewHolder, int direction)\n```
+//                           signature_documentation java @Override\npublic final void onSwiped(unresolved_type viewHolder, int direction)
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //                           ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                      ^^^^^^^^^^ definition local 10
 //                                                 display_name viewHolder
-//                                                 documentation ```java\nunresolved_type viewHolder\n```
+//                                                 signature_documentation java unresolved_type viewHolder
 //                                                      ^^^^^^^^^ definition local 11
 //                                                                display_name direction
-//                                                                documentation ```java\nint direction\n```
+//                                                                signature_documentation java int direction
     onSwiped((EpoxyViewHolder) viewHolder, direction);
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
 //            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -161,36 +161,36 @@ public final void onSwiped(ViewHolder viewHolder, int direction) {
   protected abstract void onSwiped(EpoxyViewHolder viewHolder, int direction);
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped(+-1).
 //                                 display_name onSwiped
-//                                 documentation ```java\nprotected abstract void onSwiped(EpoxyViewHolder viewHolder, int direction)\n```
+//                                 signature_documentation java protected abstract void onSwiped(EpoxyViewHolder viewHolder, int direction)
 //                                 documentation  @see #onSwiped(ViewHolder, int)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 12
 //                                                            display_name viewHolder
-//                                                            documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                            signature_documentation java EpoxyViewHolder viewHolder
 //                                                                 ^^^^^^^^^ definition local 13
 //                                                                           display_name direction
-//                                                                           documentation ```java\nint direction\n```
+//                                                                           signature_documentation java int direction
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public final boolean canDropOver(RecyclerView recyclerView, ViewHolder current,
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
 //                                 display_name canDropOver
-//                                 documentation ```java\n@Override\npublic final boolean canDropOver(unresolved_type recyclerView, unresolved_type current, unresolved_type target)\n```
+//                                 signature_documentation java @Override\npublic final boolean canDropOver(unresolved_type recyclerView, unresolved_type current, unresolved_type target)
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                                 ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                              ^^^^^^^^^^^^ definition local 14
 //                                                           display_name recyclerView
-//                                                           documentation ```java\nunresolved_type recyclerView\n```
+//                                                           signature_documentation java unresolved_type recyclerView
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                       ^^^^^^^ definition local 15
 //                                                                               display_name current
-//                                                                               documentation ```java\nunresolved_type current\n```
+//                                                                               signature_documentation java unresolved_type current
       ViewHolder target) {
 //    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //               ^^^^^^ definition local 16
 //                      display_name target
-//                      documentation ```java\nunresolved_type target\n```
+//                      signature_documentation java unresolved_type target
     return canDropOver(recyclerView, (EpoxyViewHolder) current, (EpoxyViewHolder) target);
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
 //                     ^^^^^^^^^^^^ reference local 14
@@ -206,22 +206,22 @@ public final boolean canDropOver(RecyclerView recyclerView, ViewHolder current,
   protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current,
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
 //                              display_name canDropOver
-//                              documentation ```java\nprotected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target)\n```
+//                              signature_documentation java protected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target)
 //                              documentation  @see #canDropOver(RecyclerView, ViewHolder, ViewHolder)\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                           ^^^^^^^^^^^^ definition local 17
 //                                                        display_name recyclerView
-//                                                        documentation ```java\nunresolved_type recyclerView\n```
+//                                                        signature_documentation java unresolved_type recyclerView
 //                                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                         ^^^^^^^ definition local 18
 //                                                                                 display_name current
-//                                                                                 documentation ```java\nEpoxyViewHolder current\n```
+//                                                                                 signature_documentation java EpoxyViewHolder current
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 19
 //                           display_name target
-//                           documentation ```java\nEpoxyViewHolder target\n```
+//                           signature_documentation java EpoxyViewHolder target
     return super.canDropOver(recyclerView, current, target);
 //         ^^^^^ reference semanticdb maven . . super#
 //               ^^^^^^^^^^^ reference semanticdb maven . . super#canDropOver#
@@ -235,11 +235,11 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current
   public final float getSwipeThreshold(ViewHolder viewHolder) {
 //                   ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold().
 //                                     display_name getSwipeThreshold
-//                                     documentation ```java\n@Override\npublic final float getSwipeThreshold(unresolved_type viewHolder)\n```
+//                                     signature_documentation java @Override\npublic final float getSwipeThreshold(unresolved_type viewHolder)
 //                                     ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                ^^^^^^^^^^ definition local 20
 //                                                           display_name viewHolder
-//                                                           documentation ```java\nunresolved_type viewHolder\n```
+//                                                           signature_documentation java unresolved_type viewHolder
     return getSwipeThreshold((EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold().
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -252,12 +252,12 @@ public final float getSwipeThreshold(ViewHolder viewHolder) {
   protected float getSwipeThreshold(EpoxyViewHolder viewHolder) {
 //                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold(+-1).
 //                                  display_name getSwipeThreshold
-//                                  documentation ```java\nprotected float getSwipeThreshold(EpoxyViewHolder viewHolder)\n```
+//                                  signature_documentation java protected float getSwipeThreshold(EpoxyViewHolder viewHolder)
 //                                  documentation  @see #getSwipeThreshold(ViewHolder)\n
 //                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                  ^^^^^^^^^^ definition local 21
 //                                                             display_name viewHolder
-//                                                             documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                             signature_documentation java EpoxyViewHolder viewHolder
     return super.getSwipeThreshold(viewHolder);
 //         ^^^^^ reference semanticdb maven . . super#
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . super#getSwipeThreshold#
@@ -269,11 +269,11 @@ protected float getSwipeThreshold(EpoxyViewHolder viewHolder) {
   public final float getMoveThreshold(ViewHolder viewHolder) {
 //                   ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold().
 //                                    display_name getMoveThreshold
-//                                    documentation ```java\n@Override\npublic final float getMoveThreshold(unresolved_type viewHolder)\n```
+//                                    signature_documentation java @Override\npublic final float getMoveThreshold(unresolved_type viewHolder)
 //                                    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                               ^^^^^^^^^^ definition local 22
 //                                                          display_name viewHolder
-//                                                          documentation ```java\nunresolved_type viewHolder\n```
+//                                                          signature_documentation java unresolved_type viewHolder
     return getMoveThreshold((EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold().
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -286,12 +286,12 @@ public final float getMoveThreshold(ViewHolder viewHolder) {
   protected float getMoveThreshold(EpoxyViewHolder viewHolder) {
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold(+-1).
 //                                 display_name getMoveThreshold
-//                                 documentation ```java\nprotected float getMoveThreshold(EpoxyViewHolder viewHolder)\n```
+//                                 signature_documentation java protected float getMoveThreshold(EpoxyViewHolder viewHolder)
 //                                 documentation  @see #getMoveThreshold(ViewHolder)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 23
 //                                                            display_name viewHolder
-//                                                            documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                            signature_documentation java EpoxyViewHolder viewHolder
     return super.getMoveThreshold(viewHolder);
 //         ^^^^^ reference semanticdb maven . . super#
 //               ^^^^^^^^^^^^^^^^ reference semanticdb maven . . super#getMoveThreshold#
@@ -304,22 +304,22 @@ public final ViewHolder chooseDropTarget(ViewHolder selected, List dropTargets,
 //             ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                        ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget().
 //                                         display_name chooseDropTarget
-//                                         documentation ```java\n@Override\npublic final unresolved_type chooseDropTarget(unresolved_type selected, List dropTargets, int curX, int curY)\n```
+//                                         signature_documentation java @Override\npublic final unresolved_type chooseDropTarget(unresolved_type selected, List dropTargets, int curX, int curY)
 //                                         ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                    ^^^^^^^^ definition local 24
 //                                                             display_name selected
-//                                                             documentation ```java\nunresolved_type selected\n```
+//                                                             signature_documentation java unresolved_type selected
 //                                                              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                   ^^^^^^^^^^^ definition local 25
 //                                                                               display_name dropTargets
-//                                                                               documentation ```java\nList dropTargets\n```
+//                                                                               signature_documentation java List dropTargets
 //                                                                                    ^^^^ definition local 26
 //                                                                                         display_name curX
-//                                                                                         documentation ```java\nint curX\n```
+//                                                                                         signature_documentation java int curX
       int curY) {
 //        ^^^^ definition local 27
 //             display_name curY
-//             documentation ```java\nint curY\n```
+//             signature_documentation java int curY
     //noinspection unchecked
     return chooseDropTarget((EpoxyViewHolder) selected, (List<EpoxyViewHolder>) dropTargets, curX,
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
@@ -340,24 +340,24 @@ protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected,
 //          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
 //                                           display_name chooseDropTarget
-//                                           documentation ```java\nprotected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected, List<EpoxyViewHolder> dropTargets, int curX, int curY)\n```
+//                                           signature_documentation java protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected, List<EpoxyViewHolder> dropTargets, int curX, int curY)
 //                                           documentation  @see #chooseDropTarget(ViewHolder, List, int, int)\n
 //                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                           ^^^^^^^^ definition local 28
 //                                                                    display_name selected
-//                                                                    documentation ```java\nEpoxyViewHolder selected\n```
+//                                                                    signature_documentation java EpoxyViewHolder selected
       List<EpoxyViewHolder> dropTargets, int curX, int curY) {
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                          ^^^^^^^^^^^ definition local 29
 //                                      display_name dropTargets
-//                                      documentation ```java\nList<EpoxyViewHolder> dropTargets\n```
+//                                      signature_documentation java List<EpoxyViewHolder> dropTargets
 //                                           ^^^^ definition local 30
 //                                                display_name curX
-//                                                documentation ```java\nint curX\n```
+//                                                signature_documentation java int curX
 //                                                     ^^^^ definition local 31
 //                                                          display_name curY
-//                                                          documentation ```java\nint curY\n```
+//                                                          signature_documentation java int curY
 
     //noinspection unchecked
     return (EpoxyViewHolder) super.chooseDropTarget(selected, (List) dropTargets, curX, curY);
@@ -376,15 +376,15 @@ protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected,
   public final void onSelectedChanged(ViewHolder viewHolder, int actionState) {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
 //                                    display_name onSelectedChanged
-//                                    documentation ```java\n@Override\npublic final void onSelectedChanged(unresolved_type viewHolder, int actionState)\n```
+//                                    signature_documentation java @Override\npublic final void onSelectedChanged(unresolved_type viewHolder, int actionState)
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
 //                                    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                               ^^^^^^^^^^ definition local 32
 //                                                          display_name viewHolder
-//                                                          documentation ```java\nunresolved_type viewHolder\n```
+//                                                          signature_documentation java unresolved_type viewHolder
 //                                                               ^^^^^^^^^^^ definition local 33
 //                                                                           display_name actionState
-//                                                                           documentation ```java\nint actionState\n```
+//                                                                           signature_documentation java int actionState
     onSelectedChanged((EpoxyViewHolder) viewHolder, actionState);
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
 //                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -398,15 +398,15 @@ public final void onSelectedChanged(ViewHolder viewHolder, int actionState) {
   protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged(+-1).
 //                                 display_name onSelectedChanged
-//                                 documentation ```java\nprotected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState)\n```
+//                                 signature_documentation java protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState)
 //                                 documentation  @see #onSelectedChanged(ViewHolder, int)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 34
 //                                                            display_name viewHolder
-//                                                            documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                            signature_documentation java EpoxyViewHolder viewHolder
 //                                                                 ^^^^^^^^^^^ definition local 35
 //                                                                             display_name actionState
-//                                                                             documentation ```java\nint actionState\n```
+//                                                                             signature_documentation java int actionState
     super.onSelectedChanged(viewHolder, actionState);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . super#onSelectedChanged#
@@ -419,32 +419,32 @@ protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) {
   public final void onMoved(RecyclerView recyclerView, ViewHolder viewHolder, int fromPos,
 //                  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
 //                          display_name onMoved
-//                          documentation ```java\n@Override\npublic final void onMoved(unresolved_type recyclerView, unresolved_type viewHolder, int fromPos, unresolved_type target, int toPos, int x, int y)\n```
+//                          signature_documentation java @Override\npublic final void onMoved(unresolved_type recyclerView, unresolved_type viewHolder, int fromPos, unresolved_type target, int toPos, int x, int y)
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                       ^^^^^^^^^^^^ definition local 36
 //                                                    display_name recyclerView
-//                                                    documentation ```java\nunresolved_type recyclerView\n```
+//                                                    signature_documentation java unresolved_type recyclerView
 //                                                     ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                ^^^^^^^^^^ definition local 37
 //                                                                           display_name viewHolder
-//                                                                           documentation ```java\nunresolved_type viewHolder\n```
+//                                                                           signature_documentation java unresolved_type viewHolder
 //                                                                                ^^^^^^^ definition local 38
 //                                                                                        display_name fromPos
-//                                                                                        documentation ```java\nint fromPos\n```
+//                                                                                        signature_documentation java int fromPos
       ViewHolder target, int toPos, int x, int y) {
 //    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //               ^^^^^^ definition local 39
 //                      display_name target
-//                      documentation ```java\nunresolved_type target\n```
+//                      signature_documentation java unresolved_type target
 //                           ^^^^^ definition local 40
 //                                 display_name toPos
-//                                 documentation ```java\nint toPos\n```
+//                                 signature_documentation java int toPos
 //                                      ^ definition local 41
 //                                        display_name x
-//                                        documentation ```java\nint x\n```
+//                                        signature_documentation java int x
 //                                             ^ definition local 42
 //                                               display_name y
-//                                               documentation ```java\nint y\n```
+//                                               signature_documentation java int y
 
     onMoved(recyclerView, (EpoxyViewHolder) viewHolder, fromPos, (EpoxyViewHolder) target, toPos, x,
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
@@ -466,33 +466,33 @@ public final void onMoved(RecyclerView recyclerView, ViewHolder viewHolder, int
   protected void onMoved(RecyclerView recyclerView, EpoxyViewHolder viewHolder, int fromPos,
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
 //                       display_name onMoved
-//                       documentation ```java\nprotected void onMoved(unresolved_type recyclerView, EpoxyViewHolder viewHolder, int fromPos, EpoxyViewHolder target, int toPos, int x, int y)\n```
+//                       signature_documentation java protected void onMoved(unresolved_type recyclerView, EpoxyViewHolder viewHolder, int fromPos, EpoxyViewHolder target, int toPos, int x, int y)
 //                       documentation  @see #onMoved(RecyclerView, ViewHolder, int, ViewHolder, int, int, int)\n
 //                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                    ^^^^^^^^^^^^ definition local 43
 //                                                 display_name recyclerView
-//                                                 documentation ```java\nunresolved_type recyclerView\n```
+//                                                 signature_documentation java unresolved_type recyclerView
 //                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 44
 //                                                                             display_name viewHolder
-//                                                                             documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                             signature_documentation java EpoxyViewHolder viewHolder
 //                                                                                  ^^^^^^^ definition local 45
 //                                                                                          display_name fromPos
-//                                                                                          documentation ```java\nint fromPos\n```
+//                                                                                          signature_documentation java int fromPos
       EpoxyViewHolder target, int toPos, int x, int y) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 46
 //                           display_name target
-//                           documentation ```java\nEpoxyViewHolder target\n```
+//                           signature_documentation java EpoxyViewHolder target
 //                                ^^^^^ definition local 47
 //                                      display_name toPos
-//                                      documentation ```java\nint toPos\n```
+//                                      signature_documentation java int toPos
 //                                           ^ definition local 48
 //                                             display_name x
-//                                             documentation ```java\nint x\n```
+//                                             signature_documentation java int x
 //                                                  ^ definition local 49
 //                                                    display_name y
-//                                                    documentation ```java\nint y\n```
+//                                                    signature_documentation java int y
     super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^ reference semanticdb maven . . super#onMoved#
@@ -510,17 +510,17 @@ protected void onMoved(RecyclerView recyclerView, EpoxyViewHolder viewHolder, in
   public final void clearView(RecyclerView recyclerView, ViewHolder viewHolder) {
 //                  ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                            display_name clearView
-//                            documentation ```java\n@Override\npublic final void clearView(unresolved_type recyclerView, unresolved_type viewHolder)\n```
+//                            signature_documentation java @Override\npublic final void clearView(unresolved_type recyclerView, unresolved_type viewHolder)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 //                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                         ^^^^^^^^^^^^ definition local 50
 //                                                      display_name recyclerView
-//                                                      documentation ```java\nunresolved_type recyclerView\n```
+//                                                      signature_documentation java unresolved_type recyclerView
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 51
 //                                                                             display_name viewHolder
-//                                                                             documentation ```java\nunresolved_type viewHolder\n```
+//                                                                             signature_documentation java unresolved_type viewHolder
     clearView(recyclerView, (EpoxyViewHolder) viewHolder);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //            ^^^^^^^^^^^^ reference local 50
@@ -534,18 +534,18 @@ public final void clearView(RecyclerView recyclerView, ViewHolder viewHolder) {
   protected void clearView(RecyclerView recyclerView, EpoxyViewHolder viewHolder) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                         display_name clearView
-//                         documentation ```java\nprotected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder)\n```
+//                         signature_documentation java protected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder)
 //                         documentation  @see #clearView(RecyclerView, ViewHolder)\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                      ^^^^^^^^^^^^ definition local 52
 //                                                   display_name recyclerView
-//                                                   documentation ```java\nunresolved_type recyclerView\n```
+//                                                   signature_documentation java unresolved_type recyclerView
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                    ^^^^^^^^^^ definition local 53
 //                                                                               display_name viewHolder
-//                                                                               documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                               signature_documentation java EpoxyViewHolder viewHolder
     super.clearView(recyclerView, viewHolder);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^ reference semanticdb maven . . super#clearView#
@@ -558,34 +558,34 @@ protected void clearView(RecyclerView recyclerView, EpoxyViewHolder viewHolder)
   public final void onChildDraw(Canvas c, RecyclerView recyclerView, ViewHolder viewHolder,
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                              display_name onChildDraw
-//                              documentation ```java\n@Override\npublic final void onChildDraw(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
+//                              signature_documentation java @Override\npublic final void onChildDraw(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                              ^^^^^^ reference semanticdb maven . . Canvas#
 //                                     ^ definition local 54
 //                                       display_name c
-//                                       documentation ```java\nunresolved_type c\n```
+//                                       signature_documentation java unresolved_type c
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                     ^^^^^^^^^^^^ definition local 55
 //                                                                  display_name recyclerView
-//                                                                  documentation ```java\nunresolved_type recyclerView\n```
+//                                                                  signature_documentation java unresolved_type recyclerView
 //                                                                   ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                              ^^^^^^^^^^ definition local 56
 //                                                                                         display_name viewHolder
-//                                                                                         documentation ```java\nunresolved_type viewHolder\n```
+//                                                                                         signature_documentation java unresolved_type viewHolder
       float dX,
 //          ^^ definition local 57
 //             display_name dX
-//             documentation ```java\nfloat dX\n```
+//             signature_documentation java float dX
       float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 58
 //             display_name dY
-//             documentation ```java\nfloat dY\n```
+//             signature_documentation java float dY
 //                  ^^^^^^^^^^^ definition local 59
 //                              display_name actionState
-//                              documentation ```java\nint actionState\n```
+//                              signature_documentation java int actionState
 //                                       ^^^^^^^^^^^^^^^^^ definition local 60
 //                                                         display_name isCurrentlyActive
-//                                                         documentation ```java\nboolean isCurrentlyActive\n```
+//                                                         signature_documentation java boolean isCurrentlyActive
 
     onChildDraw(c, recyclerView, (EpoxyViewHolder) viewHolder, dX, dY, actionState,
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
@@ -606,34 +606,34 @@ public final void onChildDraw(Canvas c, RecyclerView recyclerView, ViewHolder vi
   protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                           display_name onChildDraw
-//                           documentation ```java\nprotected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
+//                           signature_documentation java protected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
 //                           documentation  @see #onChildDraw(Canvas, RecyclerView, ViewHolder, float, float, int, boolean)\n
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                           ^^^^^^ reference semanticdb maven . . Canvas#
 //                                  ^ definition local 61
 //                                    display_name c
-//                                    documentation ```java\nunresolved_type c\n```
+//                                    signature_documentation java unresolved_type c
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                  ^^^^^^^^^^^^ definition local 62
 //                                                               display_name recyclerView
-//                                                               documentation ```java\nunresolved_type recyclerView\n```
+//                                                               signature_documentation java unresolved_type recyclerView
 //                                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                ^^^^^^^^^^ definition local 63
 //                                                                                           display_name viewHolder
-//                                                                                           documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                                           signature_documentation java EpoxyViewHolder viewHolder
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 64
 //             display_name dX
-//             documentation ```java\nfloat dX\n```
+//             signature_documentation java float dX
 //                    ^^ definition local 65
 //                       display_name dY
-//                       documentation ```java\nfloat dY\n```
+//                       signature_documentation java float dY
 //                            ^^^^^^^^^^^ definition local 66
 //                                        display_name actionState
-//                                        documentation ```java\nint actionState\n```
+//                                        signature_documentation java int actionState
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 67
 //                                                                   display_name isCurrentlyActive
-//                                                                   documentation ```java\nboolean isCurrentlyActive\n```
+//                                                                   signature_documentation java boolean isCurrentlyActive
     super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^^^ reference semanticdb maven . . super#onChildDraw#
@@ -651,33 +651,33 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
   public final void onChildDrawOver(Canvas c, RecyclerView recyclerView, ViewHolder viewHolder,
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
 //                                  display_name onChildDrawOver
-//                                  documentation ```java\n@Override\npublic final void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
+//                                  signature_documentation java @Override\npublic final void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
 //                                  ^^^^^^ reference semanticdb maven . . Canvas#
 //                                         ^ definition local 68
 //                                           display_name c
-//                                           documentation ```java\nunresolved_type c\n```
+//                                           signature_documentation java unresolved_type c
 //                                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                         ^^^^^^^^^^^^ definition local 69
 //                                                                      display_name recyclerView
-//                                                                      documentation ```java\nunresolved_type recyclerView\n```
+//                                                                      signature_documentation java unresolved_type recyclerView
 //                                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                                  ^^^^^^^^^^ definition local 70
 //                                                                                             display_name viewHolder
-//                                                                                             documentation ```java\nunresolved_type viewHolder\n```
+//                                                                                             signature_documentation java unresolved_type viewHolder
       float dX,
 //          ^^ definition local 71
 //             display_name dX
-//             documentation ```java\nfloat dX\n```
+//             signature_documentation java float dX
       float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 72
 //             display_name dY
-//             documentation ```java\nfloat dY\n```
+//             signature_documentation java float dY
 //                  ^^^^^^^^^^^ definition local 73
 //                              display_name actionState
-//                              documentation ```java\nint actionState\n```
+//                              signature_documentation java int actionState
 //                                       ^^^^^^^^^^^^^^^^^ definition local 74
 //                                                         display_name isCurrentlyActive
-//                                                         documentation ```java\nboolean isCurrentlyActive\n```
+//                                                         signature_documentation java boolean isCurrentlyActive
 
     onChildDrawOver(c, recyclerView, (EpoxyViewHolder) viewHolder, dX, dY, actionState,
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
@@ -698,33 +698,33 @@ public final void onChildDrawOver(Canvas c, RecyclerView recyclerView, ViewHolde
   protected void onChildDrawOver(Canvas c, RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
 //                               display_name onChildDrawOver
-//                               documentation ```java\nprotected void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)\n```
+//                               signature_documentation java protected void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
 //                               documentation  @see #onChildDrawOver(Canvas, RecyclerView, ViewHolder, float, float, int, boolean)\n
 //                               ^^^^^^ reference semanticdb maven . . Canvas#
 //                                      ^ definition local 75
 //                                        display_name c
-//                                        documentation ```java\nunresolved_type c\n```
+//                                        signature_documentation java unresolved_type c
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                      ^^^^^^^^^^^^ definition local 76
 //                                                                   display_name recyclerView
-//                                                                   documentation ```java\nunresolved_type recyclerView\n```
+//                                                                   signature_documentation java unresolved_type recyclerView
 //                                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                    ^^^^^^^^^^ definition local 77
 //                                                                                               display_name viewHolder
-//                                                                                               documentation ```java\nEpoxyViewHolder viewHolder\n```
+//                                                                                               signature_documentation java EpoxyViewHolder viewHolder
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 78
 //             display_name dX
-//             documentation ```java\nfloat dX\n```
+//             signature_documentation java float dX
 //                    ^^ definition local 79
 //                       display_name dY
-//                       documentation ```java\nfloat dY\n```
+//                       signature_documentation java float dY
 //                            ^^^^^^^^^^^ definition local 80
 //                                        display_name actionState
-//                                        documentation ```java\nint actionState\n```
+//                                        signature_documentation java int actionState
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 81
 //                                                                   display_name isCurrentlyActive
-//                                                                   documentation ```java\nboolean isCurrentlyActive\n```
+//                                                                   signature_documentation java boolean isCurrentlyActive
 
     super.onChildDrawOver(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
 //  ^^^^^ reference semanticdb maven . . super#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
index 8e392d608..987e9edaf 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
@@ -54,7 +54,7 @@
 public class EpoxyViewHolder extends RecyclerView.ViewHolder {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                           display_name EpoxyViewHolder
-//                           documentation ```java\n@SuppressWarnings("WeakerAccess")\npublic class EpoxyViewHolder\n```
+//                           signature_documentation java @SuppressWarnings("WeakerAccess")\npublic class EpoxyViewHolder
 //                           relationship is_implementation semanticdb maven . . RecyclerView/ViewHolder#
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
 //                                                ^^^^^^^^^^ reference semanticdb maven . . RecyclerView/ViewHolder#
@@ -63,48 +63,48 @@ public class EpoxyViewHolder extends RecyclerView.ViewHolder {
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyModel.
 //                                                            display_name epoxyModel
-//                                                            documentation ```java\n@SuppressWarnings("rawtypes")\nprivate EpoxyModel epoxyModel\n```
+//                                                            signature_documentation java @SuppressWarnings("rawtypes")\nprivate EpoxyModel epoxyModel
   private List<Object> payloads;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //             ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#payloads.
 //                              display_name payloads
-//                              documentation ```java\nprivate List<Object> payloads\n```
+//                              signature_documentation java private List<Object> payloads
   private EpoxyHolder epoxyHolder;
 //        ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder.
 //                                display_name epoxyHolder
-//                                documentation ```java\nprivate EpoxyHolder epoxyHolder\n```
+//                                signature_documentation java private EpoxyHolder epoxyHolder
   @Nullable ViewHolderState.ViewState initialViewState;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 //                          ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //                                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#initialViewState.
 //                                                     display_name initialViewState
-//                                                     documentation ```java\n@Nullable\nViewState initialViewState\n```
+//                                                     signature_documentation java @Nullable\nViewState initialViewState
 
   // Once the EpoxyHolder is created parent will be set to null.
   private ViewParent parent;
 //        ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                   ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#parent.
 //                          display_name parent
-//                          documentation ```java\nprivate unresolved_type parent\n```
+//                          signature_documentation java private unresolved_type parent
 
   public EpoxyViewHolder(ViewParent parent, View view, boolean saveInitialState) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\npublic EpoxyViewHolder(unresolved_type parent, unresolved_type view, boolean saveInitialState)\n```
+//                       signature_documentation java public EpoxyViewHolder(unresolved_type parent, unresolved_type view, boolean saveInitialState)
 //                       ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                  ^^^^^^ definition local 0
 //                                         display_name parent
-//                                         documentation ```java\nunresolved_type parent\n```
+//                                         signature_documentation java unresolved_type parent
 //                                          ^^^^ reference semanticdb maven . . View#
 //                                               ^^^^ definition local 1
 //                                                    display_name view
-//                                                    documentation ```java\nunresolved_type view\n```
+//                                                    signature_documentation java unresolved_type view
 //                                                             ^^^^^^^^^^^^^^^^ definition local 2
 //                                                                              display_name saveInitialState
-//                                                                              documentation ```java\nboolean saveInitialState\n```
+//                                                                              signature_documentation java boolean saveInitialState
     super(view);
 //        ^^^^ reference local 1
 
@@ -129,7 +129,7 @@ public EpoxyViewHolder(ViewParent parent, View view, boolean saveInitialState) {
   void restoreInitialViewState() {
 //     ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#restoreInitialViewState().
 //                             display_name restoreInitialViewState
-//                             documentation ```java\nvoid restoreInitialViewState()\n```
+//                             signature_documentation java void restoreInitialViewState()
     if (initialViewState != null) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#initialViewState.
       initialViewState.restore(itemView);
@@ -142,26 +142,26 @@ void restoreInitialViewState() {
   public void bind(@SuppressWarnings("rawtypes") EpoxyModel model,
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#bind().
 //                 display_name bind
-//                 documentation ```java\npublic void bind(EpoxyModel model, EpoxyModel<?> previouslyBoundModel, List<Object> payloads, int position)\n```
+//                 signature_documentation java public void bind(EpoxyModel model, EpoxyModel<?> previouslyBoundModel, List<Object> payloads, int position)
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 //                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^ definition local 3
 //                                                                display_name model
-//                                                                documentation ```java\n@SuppressWarnings("rawtypes")\nEpoxyModel model\n```
+//                                                                signature_documentation java @SuppressWarnings("rawtypes")\nEpoxyModel model
       @Nullable EpoxyModel<?> previouslyBoundModel, List<Object> payloads, int position) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 4
 //                                                 display_name previouslyBoundModel
-//                                                 documentation ```java\n@Nullable\nEpoxyModel<?> previouslyBoundModel\n```
+//                                                 signature_documentation java @Nullable\nEpoxyModel<?> previouslyBoundModel
 //                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                               ^^^^^^^^ definition local 5
 //                                                                        display_name payloads
-//                                                                        documentation ```java\nList<Object> payloads\n```
+//                                                                        signature_documentation java List<Object> payloads
 //                                                                             ^^^^^^^^ definition local 6
 //                                                                                      display_name position
-//                                                                                      documentation ```java\nint position\n```
+//                                                                                      signature_documentation java int position
     this.payloads = payloads;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#payloads.
 //                  ^^^^^^^^ reference local 5
@@ -247,7 +247,7 @@ Object objectToBind() {
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#objectToBind().
 //                    display_name objectToBind
-//                    documentation ```java\n@NonNull\nObject objectToBind()\n```
+//                    signature_documentation java @NonNull\nObject objectToBind()
     return epoxyHolder != null ? epoxyHolder : itemView;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder.
 //                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder.
@@ -257,7 +257,7 @@ Object objectToBind() {
   public void unbind() {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#unbind().
 //                   display_name unbind
-//                   documentation ```java\npublic void unbind()\n```
+//                   signature_documentation java public void unbind()
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     // noinspection unchecked
@@ -275,11 +275,11 @@ public void unbind() {
   public void visibilityStateChanged(@Visibility int visibilityState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityStateChanged().
 //                                   display_name visibilityStateChanged
-//                                   documentation ```java\npublic void visibilityStateChanged(int visibilityState)\n```
+//                                   signature_documentation java public void visibilityStateChanged(int visibilityState)
 //                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                   ^^^^^^^^^^^^^^^ definition local 7
 //                                                                   display_name visibilityState
-//                                                                   documentation ```java\n@Visibility\nint visibilityState\n```
+//                                                                   signature_documentation java @Visibility\nint visibilityState
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     // noinspection unchecked
@@ -293,31 +293,31 @@ public void visibilityStateChanged(@Visibility int visibilityState) {
   public void visibilityChanged(
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityChanged().
 //                              display_name visibilityChanged
-//                              documentation ```java\npublic void visibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth)\n```
+//                              signature_documentation java public void visibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth)
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleHeight,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                                ^^^^^^^^^^^^^^^^^^^^ definition local 8
 //                                                                     display_name percentVisibleHeight
-//                                                                     documentation ```java\n@FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleHeight\n```
+//                                                                     signature_documentation java @FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleHeight
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                             ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                                ^^^^^^^^^^^^^^^^^^^ definition local 9
 //                                                                    display_name percentVisibleWidth
-//                                                                    documentation ```java\n@FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleWidth\n```
+//                                                                    signature_documentation java @FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleWidth
       @Px int visibleHeight,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 10
 //                          display_name visibleHeight
-//                          documentation ```java\n@Px\nint visibleHeight\n```
+//                          signature_documentation java @Px\nint visibleHeight
       @Px int visibleWidth
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^ definition local 11
 //                         display_name visibleWidth
-//                         documentation ```java\n@Px\nint visibleWidth\n```
+//                         signature_documentation java @Px\nint visibleWidth
   ) {
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
@@ -338,7 +338,7 @@ public List<Object> getPayloads() {
 //            ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getPayloads().
 //                                display_name getPayloads
-//                                documentation ```java\npublic List<Object> getPayloads()\n```
+//                                signature_documentation java public List<Object> getPayloads()
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     return payloads;
@@ -349,7 +349,7 @@ public EpoxyModel<?> getModel() {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
 //                              display_name getModel
-//                              documentation ```java\npublic EpoxyModel<?> getModel()\n```
+//                              signature_documentation java public EpoxyModel<?> getModel()
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     return epoxyModel;
@@ -360,7 +360,7 @@ public EpoxyHolder getHolder() {
 //       ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                   ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getHolder().
 //                             display_name getHolder
-//                             documentation ```java\npublic EpoxyHolder getHolder()\n```
+//                             signature_documentation java public EpoxyHolder getHolder()
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     return epoxyHolder;
@@ -370,7 +370,7 @@ public EpoxyHolder getHolder() {
   private void assertBound() {
 //             ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
 //                         display_name assertBound
-//                         documentation ```java\nprivate void assertBound()\n```
+//                         signature_documentation java private void assertBound()
     if (epoxyModel == null) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyModel.
       throw new IllegalStateException("This holder is not currently bound.");
@@ -384,7 +384,7 @@ public String toString() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#toString().
 //                       display_name toString
-//                       documentation ```java\n@Override\npublic String toString()\n```
+//                       signature_documentation java @Override\npublic String toString()
     return "EpoxyViewHolder{"
         + "epoxyModel=" + epoxyModel
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyModel.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
index a9646f761..84a0528d1 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
@@ -4,11 +4,11 @@
 public interface GeneratedModel<T> {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#
 //                              display_name GeneratedModel
-//                              documentation ```java\npublic interface GeneratedModel<T>\n```
+//                              signature_documentation java public interface GeneratedModel<T>
 //                              documentation Interface applied to generated models to allow the base adapter to interact with them. 
 //                              ^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
 //                                display_name T
-//                                documentation ```java\nT\n```
+//                                signature_documentation java T
   /**
    * Called on the generated model immediately before the main model onBind method has been called.
    * This let's the generated model handle binding setup of its own
@@ -18,19 +18,19 @@ public interface GeneratedModel<T> {
   void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position);
 //     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePreBind().
 //                   display_name handlePreBind
-//                   documentation ```java\npublic abstract void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position)\n```
+//                   signature_documentation java public abstract void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position)
 //                   documentation  Called on the generated model immediately before the main model onBind method has been called.\n This let's the generated model handle binding setup of its own\n <p>\n The ViewHolder is needed to get the model's adapter position when clicked.\n
 //                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                   ^^^^^^ definition local 0
 //                                          display_name holder
-//                                          documentation ```java\nEpoxyViewHolder holder\n```
+//                                          signature_documentation java EpoxyViewHolder holder
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
 //                                             ^^^^^^^^^^^^ definition local 1
 //                                                          display_name objectToBind
-//                                                          documentation ```java\nT objectToBind\n```
+//                                                          signature_documentation java T objectToBind
 //                                                               ^^^^^^^^ definition local 2
 //                                                                        display_name position
-//                                                                        documentation ```java\nint position\n```
+//                                                                        signature_documentation java int position
   /**
    * Called on the generated model immediately after the main model onBind method has been called.
    * This let's the generated model handle binding of its own and dispatch calls to its onBind
@@ -43,13 +43,13 @@ public interface GeneratedModel<T> {
   void handlePostBind(T objectToBind, int position);
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePostBind().
 //                    display_name handlePostBind
-//                    documentation ```java\npublic abstract void handlePostBind(T objectToBind, int position)\n```
+//                    signature_documentation java public abstract void handlePostBind(T objectToBind, int position)
 //                    documentation  Called on the generated model immediately after the main model onBind method has been called.\n This let's the generated model handle binding of its own and dispatch calls to its onBind\n listener.\n <p>\n We don't want to rely on the main onBind method to dispatch the onBind listener call because\n there are two onBind methods (one for payloads and one for no payloads), and one can call into\n the other. We don't want to dispatch two onBind listener calls in that case.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
 //                      ^^^^^^^^^^^^ definition local 3
 //                                   display_name objectToBind
-//                                   documentation ```java\nT objectToBind\n```
+//                                   signature_documentation java T objectToBind
 //                                        ^^^^^^^^ definition local 4
 //                                                 display_name position
-//                                                 documentation ```java\nint position\n```
+//                                                 signature_documentation java int position
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
index f5f5b46ac..e7af2dc91 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
@@ -29,7 +29,7 @@
 class HandlerExecutor implements Executor {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#
 //                    display_name HandlerExecutor
-//                    documentation ```java\nclass HandlerExecutor\n```
+//                    signature_documentation java class HandlerExecutor
 //                    documentation  An executor that does it's work via posting to a Handler.\n <p>\n A key feature of this is the runnable is executed synchronously if the current thread is the\n same as the handler's thread.\n
 //                    relationship is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#
 //                               ^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/Executor#
@@ -37,16 +37,16 @@ class HandlerExecutor implements Executor {
 //      ^^^^^^^ reference semanticdb maven . . Handler#
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
 //                      display_name handler
-//                      documentation ```java\nfinal unresolved_type handler\n```
+//                      signature_documentation java final unresolved_type handler
 
   HandlerExecutor(Handler handler) {
 //^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#`<init>`().
 //                display_name <init>
-//                documentation ```java\nHandlerExecutor(unresolved_type handler)\n```
+//                signature_documentation java HandlerExecutor(unresolved_type handler)
 //                ^^^^^^^ reference semanticdb maven . . Handler#
 //                        ^^^^^^^ definition local 0
 //                                display_name handler
-//                                documentation ```java\nunresolved_type handler\n```
+//                                signature_documentation java unresolved_type handler
     this.handler = handler;
 //       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
 //                 ^^^^^^^ reference local 0
@@ -57,13 +57,13 @@ class HandlerExecutor implements Executor {
   public void execute(@NonNull Runnable command) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#execute().
 //                    display_name execute
-//                    documentation ```java\n@Override\npublic void execute(Runnable command)\n```
+//                    signature_documentation java @Override\npublic void execute(Runnable command)
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#execute().
 //                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
 //                                      ^^^^^^^ definition local 1
 //                                              display_name command
-//                                              documentation ```java\n@NonNull\nRunnable command\n```
+//                                              signature_documentation java @NonNull\nRunnable command
     // If we're already on the same thread then we can execute this synchronously
     if (Looper.myLooper() == handler.getLooper()) {
 //      ^^^^^^ reference semanticdb maven . . Looper#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
index f6de05754..d082e27eb 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
@@ -20,12 +20,12 @@
 class HiddenEpoxyModel extends EpoxyModel<Space> {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#
 //                     display_name HiddenEpoxyModel
-//                     documentation ```java\nclass HiddenEpoxyModel\n```
+//                     signature_documentation java class HiddenEpoxyModel
 //                     documentation  Used by the {@link EpoxyAdapter} as a placeholder for when {@link EpoxyModel#isShown()} is false.\n Using a zero height and width {@link Space} view, as well as 0 span size, to exclude itself from\n view.\n
 //                     relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
 //                     display_name <init>
-//                     documentation ```java\nHiddenEpoxyModel()\n```
+//                     signature_documentation java HiddenEpoxyModel()
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^ reference semanticdb maven . . Space#
   @Override
@@ -33,7 +33,7 @@ class HiddenEpoxyModel extends EpoxyModel<Space> {
   public int getDefaultLayout() {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getDefaultLayout().
 //                            display_name getDefaultLayout
-//                            documentation ```java\n@Override\npublic int getDefaultLayout()\n```
+//                            signature_documentation java @Override\npublic int getDefaultLayout()
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     return R.layout.view_holder_empty_view;
 //         ^ reference semanticdb maven . . R/
@@ -46,17 +46,17 @@ public int getDefaultLayout() {
   public int getSpanSize(int spanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
 //                       display_name getSpanSize
-//                       documentation ```java\n@Override\npublic int getSpanSize(int spanCount, int position, int itemCount)\n```
+//                       signature_documentation java @Override\npublic int getSpanSize(int spanCount, int position, int itemCount)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^ definition local 0
 //                                     display_name spanCount
-//                                     documentation ```java\nint spanCount\n```
+//                                     signature_documentation java int spanCount
 //                                          ^^^^^^^^ definition local 1
 //                                                   display_name position
-//                                                   documentation ```java\nint position\n```
+//                                                   signature_documentation java int position
 //                                                        ^^^^^^^^^ definition local 2
 //                                                                  display_name itemCount
-//                                                                  documentation ```java\nint itemCount\n```
+//                                                                  signature_documentation java int itemCount
     return 0;
   }
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
index 7424ba0a0..feef94178 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
@@ -11,12 +11,12 @@
 public final class IdUtils {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#
 //                         display_name IdUtils
-//                         documentation ```java\npublic final class IdUtils\n```
+//                         signature_documentation java public final class IdUtils
 //                         documentation  Utilities for generating 64-bit long IDs from types such as {@link CharSequence}.\n
   private IdUtils() {
 //        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#`<init>`().
 //                display_name <init>
-//                documentation ```java\nprivate IdUtils()\n```
+//                signature_documentation java private IdUtils()
   }
 
   /**
@@ -30,11 +30,11 @@ private IdUtils() {
   public static long hashLong64Bit(long value) {
 //                   ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#hashLong64Bit().
 //                                 display_name hashLong64Bit
-//                                 documentation ```java\npublic static long hashLong64Bit(long value)\n```
+//                                 signature_documentation java public static long hashLong64Bit(long value)
 //                                 documentation  Hash a long into 64 bits instead of the normal 32. This uses a xor shift implementation to\n attempt psuedo randomness so object ids have an even spread for less chance of collisions.\n <p>\n From http://stackoverflow.com/a/11554034\n <p>\n http://www.javamex.com/tutorials/random_numbers/xorshift.shtml\n
 //                                      ^^^^^ definition local 0
 //                                            display_name value
-//                                            documentation ```java\nlong value\n```
+//                                            signature_documentation java long value
     value ^= (value << 21);
 //  ^^^^^ reference local 0
 //            ^^^^^ reference local 0
@@ -60,13 +60,13 @@ public static long hashLong64Bit(long value) {
   public static long hashString64Bit(@Nullable CharSequence str) {
 //                   ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                   display_name hashString64Bit
-//                                   documentation ```java\npublic static long hashString64Bit(CharSequence str)\n```
+//                                   signature_documentation java public static long hashString64Bit(CharSequence str)
 //                                   documentation  Hash a string into 64 bits instead of the normal 32. This allows us to better use strings as a\n model id with less chance of collisions. This uses the FNV-1a algorithm for a good mix of speed\n and distribution.\n <p>\n Performance comparisons found at http://stackoverflow.com/a/1660613\n <p>\n Hash implementation from http://www.isthe.com/chongo/tech/comp/fnv/index.html#FNV-1a\n
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                          ^^^ definition local 1
 //                                                              display_name str
-//                                                              documentation ```java\n@Nullable\nCharSequence str\n```
+//                                                              signature_documentation java @Nullable\nCharSequence str
     if (str == null) {
 //      ^^^ reference local 1
       return 0;
@@ -75,17 +75,17 @@ public static long hashString64Bit(@Nullable CharSequence str) {
     long result = 0xcbf29ce484222325L;
 //       ^^^^^^ definition local 2
 //              display_name result
-//              documentation ```java\nlong result\n```
+//              signature_documentation java long result
     final int len = str.length();
 //            ^^^ definition local 3
 //                display_name len
-//                documentation ```java\nfinal int len\n```
+//                signature_documentation java final int len
 //                  ^^^ reference local 1
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     for (int i = 0; i < len; i++) {
 //           ^ definition local 4
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 4
 //                      ^^^ reference local 3
 //                           ^ reference local 4
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
index 2c966da30..cdf924f76 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
@@ -3,7 +3,7 @@
 public class IllegalEpoxyUsage extends RuntimeException {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IllegalEpoxyUsage#
 //                             display_name IllegalEpoxyUsage
-//                             documentation ```java\npublic class IllegalEpoxyUsage\n```
+//                             signature_documentation java public class IllegalEpoxyUsage
 //                             relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/Exception#
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/RuntimeException#
@@ -12,11 +12,11 @@ public class IllegalEpoxyUsage extends RuntimeException {
   public IllegalEpoxyUsage(String message) {
 //       ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IllegalEpoxyUsage#`<init>`().
 //                         display_name <init>
-//                         documentation ```java\npublic IllegalEpoxyUsage(String message)\n```
+//                         signature_documentation java public IllegalEpoxyUsage(String message)
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                ^^^^^^^ definition local 0
 //                                        display_name message
-//                                        documentation ```java\nString message\n```
+//                                        signature_documentation java String message
     super(message);
 //  ^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+1).
 //        ^^^^^^^ reference local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
index cb7da2e45..74d376cb8 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
@@ -11,7 +11,7 @@
 class ImmutableModelException extends RuntimeException {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#
 //                            display_name ImmutableModelException
-//                            documentation ```java\nclass ImmutableModelException\n```
+//                            signature_documentation java class ImmutableModelException
 //                            documentation  Thrown if a model is changed after it is added to an {@link com.airbnb.epoxy.EpoxyController}.\n
 //                            relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                            relationship is_implementation semanticdb maven jdk 11 java/lang/Exception#
@@ -22,7 +22,7 @@ class ImmutableModelException extends RuntimeException {
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#MODEL_CANNOT_BE_CHANGED_MESSAGE.
 //                                                            display_name MODEL_CANNOT_BE_CHANGED_MESSAGE
-//                                                            documentation ```java\nprivate static final String MODEL_CANNOT_BE_CHANGED_MESSAGE\n```
+//                                                            signature_documentation java private static final String MODEL_CANNOT_BE_CHANGED_MESSAGE
       "Epoxy attribute fields on a model cannot be changed once the model is added to a "
           + "controller. Check that these fields are not updated, or that the assigned objects "
           + "are not mutated, outside of the buildModels method. The only exception is if "
@@ -34,14 +34,14 @@ class ImmutableModelException extends RuntimeException {
   ImmutableModelException(EpoxyModel model, int modelPosition) {
 //^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`().
 //                        display_name <init>
-//                        documentation ```java\nImmutableModelException(EpoxyModel model, int modelPosition)\n```
+//                        signature_documentation java ImmutableModelException(EpoxyModel model, int modelPosition)
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 0
 //                                         display_name model
-//                                         documentation ```java\nEpoxyModel model\n```
+//                                         signature_documentation java EpoxyModel model
 //                                              ^^^^^^^^^^^^^ definition local 1
 //                                                            display_name modelPosition
-//                                                            documentation ```java\nint modelPosition\n```
+//                                                            signature_documentation java int modelPosition
     this(model, "", modelPosition);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
 //       ^^^^^ reference local 0
@@ -51,19 +51,19 @@ class ImmutableModelException extends RuntimeException {
   ImmutableModelException(EpoxyModel model,
 //^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
 //                        display_name <init>
-//                        documentation ```java\nImmutableModelException(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition)\n```
+//                        signature_documentation java ImmutableModelException(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition)
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 2
 //                                         display_name model
-//                                         documentation ```java\nEpoxyModel model\n```
+//                                         signature_documentation java EpoxyModel model
       String descriptionOfWhenChangeHappened, int modelPosition) {
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 3
 //                                           display_name descriptionOfWhenChangeHappened
-//                                           documentation ```java\nString descriptionOfWhenChangeHappened\n```
+//                                           signature_documentation java String descriptionOfWhenChangeHappened
 //                                                ^^^^^^^^^^^^^ definition local 4
 //                                                              display_name modelPosition
-//                                                              documentation ```java\nint modelPosition\n```
+//                                                              signature_documentation java int modelPosition
     super(buildMessage(model, descriptionOfWhenChangeHappened, modelPosition));
 //  ^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+1).
 //        ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#buildMessage().
@@ -78,19 +78,19 @@ private static String buildMessage(EpoxyModel model,
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#buildMessage().
 //                                   display_name buildMessage
-//                                   documentation ```java\n@NonNull\nprivate static String buildMessage(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition)\n```
+//                                   signature_documentation java @NonNull\nprivate static String buildMessage(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition)
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 5
 //                                                    display_name model
-//                                                    documentation ```java\nEpoxyModel model\n```
+//                                                    signature_documentation java EpoxyModel model
       String descriptionOfWhenChangeHappened, int modelPosition) {
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 6
 //                                           display_name descriptionOfWhenChangeHappened
-//                                           documentation ```java\nString descriptionOfWhenChangeHappened\n```
+//                                           signature_documentation java String descriptionOfWhenChangeHappened
 //                                                ^^^^^^^^^^^^^ definition local 7
 //                                                              display_name modelPosition
-//                                                              documentation ```java\nint modelPosition\n```
+//                                                              signature_documentation java int modelPosition
     return new StringBuilder(descriptionOfWhenChangeHappened)
 //             ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/StringBuilder#`<init>`(+2).
 //                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local 6
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
index 9d63dad3c..9814c2e09 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
@@ -28,10 +28,10 @@
 public class ListenersUtils {
 //           ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#
 //                          display_name ListenersUtils
-//                          documentation ```java\npublic class ListenersUtils\n```
+//                          signature_documentation java public class ListenersUtils
 //           ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#`<init>`().
 //                          display_name <init>
-//                          documentation ```java\npublic ListenersUtils()\n```
+//                          signature_documentation java public ListenersUtils()
 
   @Nullable
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
@@ -39,16 +39,16 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
 //                                                  display_name getEpoxyHolderForChildView
-//                                                  documentation ```java\n@Nullable\nstatic EpoxyViewHolder getEpoxyHolderForChildView(unresolved_type v)\n```
+//                                                  signature_documentation java @Nullable\nstatic EpoxyViewHolder getEpoxyHolderForChildView(unresolved_type v)
 //                                                  ^^^^ reference semanticdb maven . . View#
 //                                                       ^ definition local 0
 //                                                         display_name v
-//                                                         documentation ```java\nunresolved_type v\n```
+//                                                         signature_documentation java unresolved_type v
     RecyclerView recyclerView = findParentRecyclerView(v);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //               ^^^^^^^^^^^^ definition local 1
 //                            display_name recyclerView
-//                            documentation ```java\nunresolved_type recyclerView\n```
+//                            signature_documentation java unresolved_type recyclerView
 //                              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
 //                                                     ^ reference local 0
     if (recyclerView == null) {
@@ -60,7 +60,7 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
 //  ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //             ^^^^^^^^^^ definition local 2
 //                        display_name viewHolder
-//                        documentation ```java\nunresolved_type viewHolder\n```
+//                        signature_documentation java unresolved_type viewHolder
 //                          ^^^^^^^^^^^^ reference local 1
 //                                       ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#findContainingViewHolder#
 //                                                                ^ reference local 0
@@ -86,12 +86,12 @@ private static RecyclerView findParentRecyclerView(@Nullable View v) {
 //               ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
 //                                                   display_name findParentRecyclerView
-//                                                   documentation ```java\n@Nullable\nprivate static unresolved_type findParentRecyclerView(unresolved_type v)\n```
+//                                                   signature_documentation java @Nullable\nprivate static unresolved_type findParentRecyclerView(unresolved_type v)
 //                                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                             ^^^^ reference semanticdb maven . . View#
 //                                                                  ^ definition local 3
 //                                                                    display_name v
-//                                                                    documentation ```java\n@Nullable\nunresolved_type v\n```
+//                                                                    signature_documentation java @Nullable\nunresolved_type v
     if (v == null) {
 //      ^ reference local 3
       return null;
@@ -101,7 +101,7 @@ private static RecyclerView findParentRecyclerView(@Nullable View v) {
 //  ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //             ^^^^^^ definition local 4
 //                    display_name parent
-//                    documentation ```java\nunresolved_type parent\n```
+//                    signature_documentation java unresolved_type parent
 //                      ^ reference local 3
 //                        ^^^^^^^^^ reference semanticdb maven . . View#getParent#
     if (parent instanceof RecyclerView) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
index 85bc8eee6..ad2b5815b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
@@ -14,7 +14,7 @@
 class MainThreadExecutor extends HandlerExecutor {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                       display_name MainThreadExecutor
-//                       documentation ```java\nclass MainThreadExecutor\n```
+//                       signature_documentation java class MainThreadExecutor
 //                       relationship is_implementation semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#
 //                       relationship is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#
 //                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#
@@ -22,22 +22,22 @@ class MainThreadExecutor extends HandlerExecutor {
 //             ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
 //                                         display_name INSTANCE
-//                                         documentation ```java\nstatic final MainThreadExecutor INSTANCE\n```
+//                                         signature_documentation java static final MainThreadExecutor INSTANCE
 //                                               ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
   static final MainThreadExecutor ASYNC_INSTANCE = new MainThreadExecutor(true);
 //             ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#ASYNC_INSTANCE.
 //                                               display_name ASYNC_INSTANCE
-//                                               documentation ```java\nstatic final MainThreadExecutor ASYNC_INSTANCE\n```
+//                                               signature_documentation java static final MainThreadExecutor ASYNC_INSTANCE
 //                                                     ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
 
   MainThreadExecutor(boolean async) {
 //^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
 //                   display_name <init>
-//                   documentation ```java\nMainThreadExecutor(boolean async)\n```
+//                   signature_documentation java MainThreadExecutor(boolean async)
 //                           ^^^^^ definition local 0
 //                                 display_name async
-//                                 documentation ```java\nboolean async\n```
+//                                 signature_documentation java boolean async
     super(async ? AYSNC_MAIN_THREAD_HANDLER : MAIN_THREAD_HANDLER);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#`<init>`().
 //        ^^^^^ reference local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
index f039dce1b..20a40b844 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
@@ -46,7 +46,7 @@
 class ModelList extends ArrayList<EpoxyModel<?>> {
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#
 //              display_name ModelList
-//              documentation ```java\nclass ModelList\n```
+//              signature_documentation java class ModelList
 //              documentation  Used by our {@link EpoxyAdapter} to track models. It simply wraps ArrayList and notifies an\n observer when remove or insertion operations are done on the list. This allows us to optimize\n diffing since we have a knowledge of what changed in the list.\n
 //              relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //              relationship is_implementation semanticdb maven jdk 11 java/lang/Cloneable#
@@ -63,10 +63,10 @@ class ModelList extends ArrayList<EpoxyModel<?>> {
   ModelList(int expectedModelCount) {
 //^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`().
 //          display_name <init>
-//          documentation ```java\nModelList(int expectedModelCount)\n```
+//          signature_documentation java ModelList(int expectedModelCount)
 //              ^^^^^^^^^^^^^^^^^^ definition local 0
 //                                 display_name expectedModelCount
-//                                 documentation ```java\nint expectedModelCount\n```
+//                                 signature_documentation java int expectedModelCount
     super(expectedModelCount);
 //  ^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
 //        ^^^^^^^^^^^^^^^^^^ reference local 0
@@ -75,50 +75,50 @@ class ModelList extends ArrayList<EpoxyModel<?>> {
   ModelList() {
 //^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`(+1).
 //          display_name <init>
-//          documentation ```java\nModelList()\n```
+//          signature_documentation java ModelList()
 
   }
 
   interface ModelListObserver {
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                            display_name ModelListObserver
-//                            documentation ```java\ninterface ModelListObserver\n```
+//                            signature_documentation java interface ModelListObserver
     void onItemRangeInserted(int positionStart, int itemCount);
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
 //                           display_name onItemRangeInserted
-//                           documentation ```java\npublic abstract void onItemRangeInserted(int positionStart, int itemCount)\n```
+//                           signature_documentation java public abstract void onItemRangeInserted(int positionStart, int itemCount)
 //                               ^^^^^^^^^^^^^ definition local 1
 //                                             display_name positionStart
-//                                             documentation ```java\nint positionStart\n```
+//                                             signature_documentation java int positionStart
 //                                                  ^^^^^^^^^ definition local 2
 //                                                            display_name itemCount
-//                                                            documentation ```java\nint itemCount\n```
+//                                                            signature_documentation java int itemCount
     void onItemRangeRemoved(int positionStart, int itemCount);
 //       ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
 //                          display_name onItemRangeRemoved
-//                          documentation ```java\npublic abstract void onItemRangeRemoved(int positionStart, int itemCount)\n```
+//                          signature_documentation java public abstract void onItemRangeRemoved(int positionStart, int itemCount)
 //                              ^^^^^^^^^^^^^ definition local 3
 //                                            display_name positionStart
-//                                            documentation ```java\nint positionStart\n```
+//                                            signature_documentation java int positionStart
 //                                                 ^^^^^^^^^ definition local 4
 //                                                           display_name itemCount
-//                                                           documentation ```java\nint itemCount\n```
+//                                                           signature_documentation java int itemCount
   }
 
   private boolean notificationsPaused;
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
 //                                    display_name notificationsPaused
-//                                    documentation ```java\nprivate boolean notificationsPaused\n```
+//                                    signature_documentation java private boolean notificationsPaused
   private ModelListObserver observer;
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
 //                                   display_name observer
-//                                   documentation ```java\nprivate ModelListObserver observer\n```
+//                                   signature_documentation java private ModelListObserver observer
 
   void pauseNotifications() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#pauseNotifications().
 //                        display_name pauseNotifications
-//                        documentation ```java\nvoid pauseNotifications()\n```
+//                        signature_documentation java void pauseNotifications()
     if (notificationsPaused) {
 //      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
       throw new IllegalStateException("Notifications already paused");
@@ -131,7 +131,7 @@ void pauseNotifications() {
   void resumeNotifications() {
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#resumeNotifications().
 //                         display_name resumeNotifications
-//                         documentation ```java\nvoid resumeNotifications()\n```
+//                         signature_documentation java void resumeNotifications()
     if (!notificationsPaused) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
       throw new IllegalStateException("Notifications already resumed");
@@ -144,11 +144,11 @@ void resumeNotifications() {
   void setObserver(ModelListObserver observer) {
 //     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#setObserver().
 //                 display_name setObserver
-//                 documentation ```java\nvoid setObserver(ModelListObserver observer)\n```
+//                 signature_documentation java void setObserver(ModelListObserver observer)
 //                 ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                                   ^^^^^^^^ definition local 5
 //                                            display_name observer
-//                                            documentation ```java\nModelListObserver observer\n```
+//                                            signature_documentation java ModelListObserver observer
     this.observer = observer;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
 //                  ^^^^^^^^ reference local 5
@@ -157,13 +157,13 @@ void setObserver(ModelListObserver observer) {
   private void notifyInsertion(int positionStart, int itemCount) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                             display_name notifyInsertion
-//                             documentation ```java\nprivate void notifyInsertion(int positionStart, int itemCount)\n```
+//                             signature_documentation java private void notifyInsertion(int positionStart, int itemCount)
 //                                 ^^^^^^^^^^^^^ definition local 6
 //                                               display_name positionStart
-//                                               documentation ```java\nint positionStart\n```
+//                                               signature_documentation java int positionStart
 //                                                    ^^^^^^^^^ definition local 7
 //                                                              display_name itemCount
-//                                                              documentation ```java\nint itemCount\n```
+//                                                              signature_documentation java int itemCount
     if (!notificationsPaused && observer != null) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
 //                              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
@@ -178,13 +178,13 @@ private void notifyInsertion(int positionStart, int itemCount) {
   private void notifyRemoval(int positionStart, int itemCount) {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notifyRemoval().
 //                           display_name notifyRemoval
-//                           documentation ```java\nprivate void notifyRemoval(int positionStart, int itemCount)\n```
+//                           signature_documentation java private void notifyRemoval(int positionStart, int itemCount)
 //                               ^^^^^^^^^^^^^ definition local 8
 //                                             display_name positionStart
-//                                             documentation ```java\nint positionStart\n```
+//                                             signature_documentation java int positionStart
 //                                                  ^^^^^^^^^ definition local 9
 //                                                            display_name itemCount
-//                                                            documentation ```java\nint itemCount\n```
+//                                                            signature_documentation java int itemCount
     if (!notificationsPaused && observer != null) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
 //                              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
@@ -202,22 +202,22 @@ public EpoxyModel<?> set(int index, EpoxyModel<?> element) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#set().
 //                         display_name set
-//                         documentation ```java\n@Override\npublic EpoxyModel<?> set(int index, EpoxyModel<?> element)\n```
+//                         signature_documentation java @Override\npublic EpoxyModel<?> set(int index, EpoxyModel<?> element)
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#set().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#set().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#set().
 //                             ^^^^^ definition local 10
 //                                   display_name index
-//                                   documentation ```java\nint index\n```
+//                                   signature_documentation java int index
 //                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^ definition local 11
 //                                                          display_name element
-//                                                          documentation ```java\nEpoxyModel<?> element\n```
+//                                                          signature_documentation java EpoxyModel<?> element
     EpoxyModel<?> previousModel = super.set(index, element);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^^^^^^^^^ definition local 12
 //                              display_name previousModel
-//                              documentation ```java\nEpoxyModel<?> previousModel\n```
+//                              signature_documentation java EpoxyModel<?> previousModel
 //                                ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#super.
 //                                      ^^^ reference semanticdb maven jdk 11 java/util/ArrayList#set().
 //                                          ^^^^^ reference local 10
@@ -245,7 +245,7 @@ public EpoxyModel<?> set(int index, EpoxyModel<?> element) {
   public boolean add(EpoxyModel<?> epoxyModel) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#add().
 //                   display_name add
-//                   documentation ```java\n@Override\npublic boolean add(EpoxyModel<?> epoxyModel)\n```
+//                   signature_documentation java @Override\npublic boolean add(EpoxyModel<?> epoxyModel)
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#add().
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add().
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#add().
@@ -254,7 +254,7 @@ public boolean add(EpoxyModel<?> epoxyModel) {
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                 ^^^^^^^^^^ definition local 13
 //                                            display_name epoxyModel
-//                                            documentation ```java\nEpoxyModel<?> epoxyModel\n```
+//                                            signature_documentation java EpoxyModel<?> epoxyModel
     notifyInsertion(size(), 1);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                  ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
@@ -269,17 +269,17 @@ public boolean add(EpoxyModel<?> epoxyModel) {
   public void add(int index, EpoxyModel<?> element) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#add(+1).
 //                display_name add
-//                documentation ```java\n@Override\npublic void add(int index, EpoxyModel<?> element)\n```
+//                signature_documentation java @Override\npublic void add(int index, EpoxyModel<?> element)
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add(+1).
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#add(+1).
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#add(+1).
 //                    ^^^^^ definition local 14
 //                          display_name index
-//                          documentation ```java\nint index\n```
+//                          signature_documentation java int index
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^^^ definition local 15
 //                                                 display_name element
-//                                                 documentation ```java\nEpoxyModel<?> element\n```
+//                                                 signature_documentation java EpoxyModel<?> element
     notifyInsertion(index, 1);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                  ^^^^^ reference local 14
@@ -295,7 +295,7 @@ public void add(int index, EpoxyModel<?> element) {
   public boolean addAll(Collection<? extends EpoxyModel<?>> c) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#addAll().
 //                      display_name addAll
-//                      documentation ```java\n@Override\npublic boolean addAll(Collection<? extends EpoxyModel<?>> c)\n```
+//                      signature_documentation java @Override\npublic boolean addAll(Collection<? extends EpoxyModel<?>> c)
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#addAll().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#addAll().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#addAll().
@@ -304,7 +304,7 @@ public boolean addAll(Collection<? extends EpoxyModel<?>> c) {
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^ definition local 16
 //                                                            display_name c
-//                                                            documentation ```java\nCollection<? extends EpoxyModel<?>> c\n```
+//                                                            signature_documentation java Collection<? extends EpoxyModel<?>> c
     notifyInsertion(size(), c.size());
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                  ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
@@ -321,18 +321,18 @@ public boolean addAll(Collection<? extends EpoxyModel<?>> c) {
   public boolean addAll(int index, Collection<? extends EpoxyModel<?>> c) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                      display_name addAll
-//                      documentation ```java\n@Override\npublic boolean addAll(int index, Collection<? extends EpoxyModel<?>> c)\n```
+//                      signature_documentation java @Override\npublic boolean addAll(int index, Collection<? extends EpoxyModel<?>> c)
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#addAll().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#addAll(+1).
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#addAll(+1).
 //                          ^^^^^ definition local 17
 //                                display_name index
-//                                documentation ```java\nint index\n```
+//                                signature_documentation java int index
 //                                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ definition local 18
 //                                                                       display_name c
-//                                                                       documentation ```java\nCollection<? extends EpoxyModel<?>> c\n```
+//                                                                       signature_documentation java Collection<? extends EpoxyModel<?>> c
     notifyInsertion(index, c.size());
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                  ^^^^^ reference local 17
@@ -351,13 +351,13 @@ public EpoxyModel<?> remove(int index) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#remove().
 //                            display_name remove
-//                            documentation ```java\n@Override\npublic EpoxyModel<?> remove(int index)\n```
+//                            signature_documentation java @Override\npublic EpoxyModel<?> remove(int index)
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#remove().
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#remove().
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#remove(+1).
 //                                ^^^^^ definition local 19
 //                                      display_name index
-//                                      documentation ```java\nint index\n```
+//                                      signature_documentation java int index
     notifyRemoval(index, 1);
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyRemoval().
 //                ^^^^^ reference local 19
@@ -372,7 +372,7 @@ public EpoxyModel<?> remove(int index) {
   public boolean remove(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#remove(+1).
 //                      display_name remove
-//                      documentation ```java\n@Override\npublic boolean remove(Object o)\n```
+//                      signature_documentation java @Override\npublic boolean remove(Object o)
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#remove().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#remove(+1).
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#remove().
@@ -380,11 +380,11 @@ public boolean remove(Object o) {
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 20
 //                               display_name o
-//                               documentation ```java\nObject o\n```
+//                               signature_documentation java Object o
     int index = indexOf(o);
 //      ^^^^^ definition local 21
 //            display_name index
-//            documentation ```java\nint index\n```
+//            signature_documentation java int index
 //              ^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#indexOf().
 //                      ^ reference local 20
 
@@ -408,7 +408,7 @@ public boolean remove(Object o) {
   public void clear() {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#clear().
 //                  display_name clear
-//                  documentation ```java\n@Override\npublic void clear()\n```
+//                  signature_documentation java @Override\npublic void clear()
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#clear().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#clear().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#clear().
@@ -430,15 +430,15 @@ public void clear() {
   protected void removeRange(int fromIndex, int toIndex) {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#removeRange().
 //                           display_name removeRange
-//                           documentation ```java\n@Override\nprotected void removeRange(int fromIndex, int toIndex)\n```
+//                           signature_documentation java @Override\nprotected void removeRange(int fromIndex, int toIndex)
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#removeRange().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#removeRange().
 //                               ^^^^^^^^^ definition local 22
 //                                         display_name fromIndex
-//                                         documentation ```java\nint fromIndex\n```
+//                                         signature_documentation java int fromIndex
 //                                              ^^^^^^^ definition local 23
 //                                                      display_name toIndex
-//                                                      documentation ```java\nint toIndex\n```
+//                                                      signature_documentation java int toIndex
     if (fromIndex == toIndex) {
 //      ^^^^^^^^^ reference local 22
 //                   ^^^^^^^ reference local 23
@@ -462,7 +462,7 @@ protected void removeRange(int fromIndex, int toIndex) {
   public boolean removeAll(Collection<?> collection) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#removeAll().
 //                         display_name removeAll
-//                         documentation ```java\n@Override\npublic boolean removeAll(Collection<?> collection)\n```
+//                         signature_documentation java @Override\npublic boolean removeAll(Collection<?> collection)
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#removeAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#removeAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#removeAll().
@@ -470,19 +470,19 @@ public boolean removeAll(Collection<?> collection) {
 //                         ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                       ^^^^^^^^^^ definition local 24
 //                                                  display_name collection
-//                                                  documentation ```java\nCollection<?> collection\n```
+//                                                  signature_documentation java Collection<?> collection
     // Using this implementation from the Android ArrayList since the Java 1.8 ArrayList
     // doesn't call through to remove. Calling through to remove lets us leverage the notification
     // done there
     boolean result = false;
 //          ^^^^^^ definition local 25
 //                 display_name result
-//                 documentation ```java\nboolean result\n```
+//                 signature_documentation java boolean result
     Iterator<?> it = iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //              ^^ definition local 26
 //                 display_name it
-//                 documentation ```java\nIterator<?> it\n```
+//                 signature_documentation java Iterator<?> it
 //                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
     while (it.hasNext()) {
 //         ^^ reference local 26
@@ -508,7 +508,7 @@ public boolean removeAll(Collection<?> collection) {
   public boolean retainAll(Collection<?> collection) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#retainAll().
 //                         display_name retainAll
-//                         documentation ```java\n@Override\npublic boolean retainAll(Collection<?> collection)\n```
+//                         signature_documentation java @Override\npublic boolean retainAll(Collection<?> collection)
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#retainAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#retainAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#retainAll().
@@ -516,19 +516,19 @@ public boolean retainAll(Collection<?> collection) {
 //                         ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                       ^^^^^^^^^^ definition local 27
 //                                                  display_name collection
-//                                                  documentation ```java\nCollection<?> collection\n```
+//                                                  signature_documentation java Collection<?> collection
     // Using this implementation from the Android ArrayList since the Java 1.8 ArrayList
     // doesn't call through to remove. Calling through to remove lets us leverage the notification
     // done there
     boolean result = false;
 //          ^^^^^^ definition local 28
 //                 display_name result
-//                 documentation ```java\nboolean result\n```
+//                 signature_documentation java boolean result
     Iterator<?> it = iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //              ^^ definition local 29
 //                 display_name it
-//                 documentation ```java\nIterator<?> it\n```
+//                 signature_documentation java Iterator<?> it
 //                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
     while (it.hasNext()) {
 //         ^^ reference local 29
@@ -558,7 +558,7 @@ public Iterator<EpoxyModel<?>> iterator() {
 //                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
 //                                        display_name iterator
-//                                        documentation ```java\n@NonNull\n@Override\npublic Iterator<EpoxyModel<?>> iterator()\n```
+//                                        signature_documentation java @NonNull\n@Override\npublic Iterator<EpoxyModel<?>> iterator()
 //                                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
 //                                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#iterator().
 //                                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#iterator().
@@ -578,32 +578,32 @@ public Iterator<EpoxyModel<?>> iterator() {
   private class Itr implements Iterator<EpoxyModel<?>> {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#
 //                  display_name Itr
-//                  documentation ```java\nprivate class Itr\n```
+//                  signature_documentation java private class Itr
 //                  documentation  An Iterator implementation that calls through to the parent list's methods for modification.\n Some implementations, like the Android ArrayList.ArrayListIterator class, modify the list data\n directly instead of calling into the parent list's methods. We need the implementation to call\n the parent methods so that the proper notifications are done.\n
 //                  relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#`<init>`().
 //                  display_name <init>
-//                  documentation ```java\nprivate Itr()\n```
+//                  signature_documentation java private Itr()
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
     int cursor;       // index of next element to return
 //      ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
 //             display_name cursor
-//             documentation ```java\nint cursor\n```
+//             signature_documentation java int cursor
     int lastRet = -1; // index of last element returned; -1 if no such
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#lastRet.
 //              display_name lastRet
-//              documentation ```java\nint lastRet\n```
+//              signature_documentation java int lastRet
     int expectedModCount = modCount;
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#expectedModCount.
 //                       display_name expectedModCount
-//                       documentation ```java\nint expectedModCount\n```
+//                       signature_documentation java int expectedModCount
 //                         ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 
     public boolean hasNext() {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#hasNext().
 //                         display_name hasNext
-//                         documentation ```java\npublic boolean hasNext()\n```
+//                         signature_documentation java public boolean hasNext()
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
       return cursor != size();
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -616,14 +616,14 @@ public EpoxyModel<?> next() {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#next().
 //                            display_name next
-//                            documentation ```java\n@SuppressWarnings("unchecked")\npublic EpoxyModel<?> next()\n```
+//                            signature_documentation java @SuppressWarnings("unchecked")\npublic EpoxyModel<?> next()
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
       int i = cursor;
 //        ^ definition local 30
 //          display_name i
-//          documentation ```java\nint i\n```
+//          signature_documentation java int i
 //            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
       cursor = i + 1;
 //    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -641,7 +641,7 @@ public EpoxyModel<?> next() {
     public void remove() {
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#remove().
 //                     display_name remove
-//                     documentation ```java\npublic void remove()\n```
+//                     signature_documentation java public void remove()
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
       if (lastRet < 0) {
 //        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#lastRet.
@@ -669,7 +669,7 @@ public void remove() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
 //                                       ^^ definition local 31
 //                                          display_name ex
-//                                          documentation ```java\nIndexOutOfBoundsException ex\n```
+//                                          signature_documentation java IndexOutOfBoundsException ex
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
       }
@@ -678,7 +678,7 @@ public void remove() {
     final void checkForComodification() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
 //                                    display_name checkForComodification
-//                                    documentation ```java\nfinal void checkForComodification()\n```
+//                                    signature_documentation java final void checkForComodification()
       if (modCount != expectedModCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#expectedModCount.
@@ -697,7 +697,7 @@ public ListIterator<EpoxyModel<?>> listIterator() {
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#listIterator().
 //                                                display_name listIterator
-//                                                documentation ```java\n@NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator()\n```
+//                                                signature_documentation java @NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator()
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator().
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#listIterator(+1).
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#listIterator().
@@ -714,13 +714,13 @@ public ListIterator<EpoxyModel<?>> listIterator(int index) {
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#listIterator(+1).
 //                                                display_name listIterator
-//                                                documentation ```java\n@NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator(int index)\n```
+//                                                signature_documentation java @NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator(int index)
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator(+1).
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#listIterator().
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#listIterator(+1).
 //                                                    ^^^^^ definition local 32
 //                                                          display_name index
-//                                                          documentation ```java\nint index\n```
+//                                                          signature_documentation java int index
     return new ListItr(index);
 //             ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#`<init>`().
 //                     ^^^^^ reference local 32
@@ -735,7 +735,7 @@ public ListIterator<EpoxyModel<?>> listIterator(int index) {
   private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#
 //                      display_name ListItr
-//                      documentation ```java\nprivate class ListItr\n```
+//                      signature_documentation java private class ListItr
 //                      documentation  A ListIterator implementation that calls through to the parent list's methods for modification.\n Some implementations may modify the list data directly instead of calling into the parent\n list's methods. We need the implementation to call the parent methods so that the proper\n notifications are done.\n
 //                      relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#
 //                      relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
@@ -746,10 +746,10 @@ private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
     ListItr(int index) {
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#`<init>`().
 //          display_name <init>
-//          documentation ```java\nListItr(int index)\n```
+//          signature_documentation java ListItr(int index)
 //              ^^^^^ definition local 33
 //                    display_name index
-//                    documentation ```java\nint index\n```
+//                    signature_documentation java int index
       cursor = index;
 //    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
 //             ^^^^^ reference local 33
@@ -758,7 +758,7 @@ private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
     public boolean hasPrevious() {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#hasPrevious().
 //                             display_name hasPrevious
-//                             documentation ```java\npublic boolean hasPrevious()\n```
+//                             signature_documentation java public boolean hasPrevious()
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasPrevious().
       return cursor != 0;
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -767,7 +767,7 @@ public boolean hasPrevious() {
     public int nextIndex() {
 //             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#nextIndex().
 //                       display_name nextIndex
-//                       documentation ```java\npublic int nextIndex()\n```
+//                       signature_documentation java public int nextIndex()
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#nextIndex().
       return cursor;
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -776,7 +776,7 @@ public int nextIndex() {
     public int previousIndex() {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#previousIndex().
 //                           display_name previousIndex
-//                           documentation ```java\npublic int previousIndex()\n```
+//                           signature_documentation java public int previousIndex()
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
       return cursor - 1;
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -788,14 +788,14 @@ public EpoxyModel<?> previous() {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#previous().
 //                                display_name previous
-//                                documentation ```java\n@SuppressWarnings("unchecked")\npublic EpoxyModel<?> previous()\n```
+//                                signature_documentation java @SuppressWarnings("unchecked")\npublic EpoxyModel<?> previous()
 //                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previous().
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
       int i = cursor - 1;
 //        ^ definition local 34
 //          display_name i
-//          documentation ```java\nint i\n```
+//          signature_documentation java int i
 //            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
       if (i < 0) {
 //        ^ reference local 34
@@ -819,12 +819,12 @@ public EpoxyModel<?> previous() {
     public void set(EpoxyModel<?> e) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#set().
 //                  display_name set
-//                  documentation ```java\npublic void set(EpoxyModel<?> e)\n```
+//                  signature_documentation java public void set(EpoxyModel<?> e)
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#set().
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^ definition local 35
 //                                  display_name e
-//                                  documentation ```java\nEpoxyModel<?> e\n```
+//                                  signature_documentation java EpoxyModel<?> e
       if (lastRet < 0) {
 //        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#lastRet.
         throw new IllegalStateException();
@@ -844,7 +844,7 @@ public void set(EpoxyModel<?> e) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
 //                                       ^^ definition local 36
 //                                          display_name ex
-//                                          documentation ```java\nIndexOutOfBoundsException ex\n```
+//                                          signature_documentation java IndexOutOfBoundsException ex
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
       }
@@ -853,12 +853,12 @@ public void set(EpoxyModel<?> e) {
     public void add(EpoxyModel<?> e) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#add().
 //                  display_name add
-//                  documentation ```java\npublic void add(EpoxyModel<?> e)\n```
+//                  signature_documentation java public void add(EpoxyModel<?> e)
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#add().
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^ definition local 37
 //                                  display_name e
-//                                  documentation ```java\nEpoxyModel<?> e\n```
+//                                  signature_documentation java EpoxyModel<?> e
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
 
@@ -866,7 +866,7 @@ public void add(EpoxyModel<?> e) {
         int i = cursor;
 //          ^ definition local 38
 //            display_name i
-//            documentation ```java\nint i\n```
+//            signature_documentation java int i
 //              ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
         ModelList.this.add(i, e);
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
@@ -886,7 +886,7 @@ public void add(EpoxyModel<?> e) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
 //                                       ^^ definition local 39
 //                                          display_name ex
-//                                          documentation ```java\nIndexOutOfBoundsException ex\n```
+//                                          signature_documentation java IndexOutOfBoundsException ex
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
       }
@@ -902,16 +902,16 @@ public List<EpoxyModel<?>> subList(int start, int end) {
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#subList().
 //                                   display_name subList
-//                                   documentation ```java\n@NonNull\n@Override\npublic List<EpoxyModel<?>> subList(int start, int end)\n```
+//                                   signature_documentation java @NonNull\n@Override\npublic List<EpoxyModel<?>> subList(int start, int end)
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#subList().
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#subList().
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#subList().
 //                                       ^^^^^ definition local 40
 //                                             display_name start
-//                                             documentation ```java\nint start\n```
+//                                             signature_documentation java int start
 //                                                  ^^^ definition local 41
 //                                                      display_name end
-//                                                      documentation ```java\nint end\n```
+//                                                      signature_documentation java int end
     if (start >= 0 && end <= size()) {
 //      ^^^^^ reference local 40
 //                    ^^^ reference local 41
@@ -940,7 +940,7 @@ public List<EpoxyModel<?>> subList(int start, int end) {
   private static class SubList extends AbstractList<EpoxyModel<?>> {
 //                     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#
 //                             display_name SubList
-//                             documentation ```java\nprivate static class SubList\n```
+//                             signature_documentation java private static class SubList
 //                             documentation  A SubList implementation from Android's AbstractList class. It's copied here to make sure the\n implementation doesn't change, since some implementations, like the Java 1.8 ArrayList.SubList\n class, modify the list data directly instead of calling into the parent list's methods. We need\n the implementation to call the parent methods so that the proper notifications are done.\n
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/Iterable#
 //                             relationship is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#
@@ -953,20 +953,20 @@ private static class SubList extends AbstractList<EpoxyModel<?>> {
 //                ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
 //                          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                   display_name fullList
-//                                   documentation ```java\nprivate final ModelList fullList\n```
+//                                   signature_documentation java private final ModelList fullList
     private int offset;
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#offset.
 //                     display_name offset
-//                     documentation ```java\nprivate int offset\n```
+//                     signature_documentation java private int offset
     private int size;
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#size.
 //                   display_name size
-//                   documentation ```java\nprivate int size\n```
+//                   signature_documentation java private int size
 
     private static final class SubListIterator implements ListIterator<EpoxyModel<?>> {
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#
 //                                             display_name SubListIterator
-//                                             documentation ```java\nprivate static final class SubListIterator\n```
+//                                             signature_documentation java private static final class SubListIterator
 //                                             relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //                                             relationship is_implementation semanticdb maven jdk 11 java/util/ListIterator#
 //                                                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
@@ -975,41 +975,41 @@ private static final class SubListIterator implements ListIterator<EpoxyModel<?>
 //                  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#
 //                          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#subList.
 //                                  display_name subList
-//                                  documentation ```java\nprivate final SubList subList\n```
+//                                  signature_documentation java private final SubList subList
       private final ListIterator<EpoxyModel<?>> iterator;
 //                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //                                                       display_name iterator
-//                                                       documentation ```java\nprivate final ListIterator<EpoxyModel<?>> iterator\n```
+//                                                       signature_documentation java private final ListIterator<EpoxyModel<?>> iterator
       private int start;
 //                ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#start.
 //                      display_name start
-//                      documentation ```java\nprivate int start\n```
+//                      signature_documentation java private int start
       private int end;
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#end.
 //                    display_name end
-//                    documentation ```java\nprivate int end\n```
+//                    signature_documentation java private int end
 
       SubListIterator(ListIterator<EpoxyModel<?>> it, SubList list, int offset, int length) {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#`<init>`().
 //                    display_name <init>
-//                    documentation ```java\nSubListIterator(ListIterator<EpoxyModel<?>> it, SubList list, int offset, int length)\n```
+//                    signature_documentation java SubListIterator(ListIterator<EpoxyModel<?>> it, SubList list, int offset, int length)
 //                    ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^ definition local 42
 //                                                   display_name it
-//                                                   documentation ```java\nListIterator<EpoxyModel<?>> it\n```
+//                                                   signature_documentation java ListIterator<EpoxyModel<?>> it
 //                                                    ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#
 //                                                            ^^^^ definition local 43
 //                                                                 display_name list
-//                                                                 documentation ```java\nSubList list\n```
+//                                                                 signature_documentation java SubList list
 //                                                                      ^^^^^^ definition local 44
 //                                                                             display_name offset
-//                                                                             documentation ```java\nint offset\n```
+//                                                                             signature_documentation java int offset
 //                                                                                  ^^^^^^ definition local 45
 //                                                                                         display_name length
-//                                                                                         documentation ```java\nint length\n```
+//                                                                                         signature_documentation java int length
         iterator = it;
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //                 ^^ reference local 42
@@ -1028,12 +1028,12 @@ private static final class SubListIterator implements ListIterator<EpoxyModel<?>
       public void add(EpoxyModel<?> object) {
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#add().
 //                    display_name add
-//                    documentation ```java\npublic void add(EpoxyModel<?> object)\n```
+//                    signature_documentation java public void add(EpoxyModel<?> object)
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#add().
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^ definition local 46
 //                                         display_name object
-//                                         documentation ```java\nEpoxyModel<?> object\n```
+//                                         signature_documentation java EpoxyModel<?> object
         iterator.add(object);
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //               ^^^ reference semanticdb maven jdk 11 java/util/ListIterator#add().
@@ -1048,7 +1048,7 @@ public void add(EpoxyModel<?> object) {
       public boolean hasNext() {
 //                   ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#hasNext().
 //                           display_name hasNext
-//                           documentation ```java\npublic boolean hasNext()\n```
+//                           signature_documentation java public boolean hasNext()
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasNext().
         return iterator.nextIndex() < end;
@@ -1060,7 +1060,7 @@ public boolean hasNext() {
       public boolean hasPrevious() {
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#hasPrevious().
 //                               display_name hasPrevious
-//                               documentation ```java\npublic boolean hasPrevious()\n```
+//                               signature_documentation java public boolean hasPrevious()
 //                               relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasPrevious().
         return iterator.previousIndex() >= start;
 //             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -1072,7 +1072,7 @@ public EpoxyModel<?> next() {
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                         ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#next().
 //                              display_name next
-//                              documentation ```java\npublic EpoxyModel<?> next()\n```
+//                              signature_documentation java public EpoxyModel<?> next()
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#next().
         if (iterator.nextIndex() < end) {
@@ -1090,7 +1090,7 @@ public EpoxyModel<?> next() {
       public int nextIndex() {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#nextIndex().
 //                         display_name nextIndex
-//                         documentation ```java\npublic int nextIndex()\n```
+//                         signature_documentation java public int nextIndex()
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#nextIndex().
         return iterator.nextIndex() - start;
 //             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -1102,7 +1102,7 @@ public EpoxyModel<?> previous() {
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#previous().
 //                                  display_name previous
-//                                  documentation ```java\npublic EpoxyModel<?> previous()\n```
+//                                  signature_documentation java public EpoxyModel<?> previous()
 //                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previous().
         if (iterator.previousIndex() >= start) {
 //          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -1119,12 +1119,12 @@ public EpoxyModel<?> previous() {
       public int previousIndex() {
 //               ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#previousIndex().
 //                             display_name previousIndex
-//                             documentation ```java\npublic int previousIndex()\n```
+//                             signature_documentation java public int previousIndex()
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         int previous = iterator.previousIndex();
 //          ^^^^^^^^ definition local 47
 //                   display_name previous
-//                   documentation ```java\nint previous\n```
+//                   signature_documentation java int previous
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //                              ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         if (previous >= start) {
@@ -1140,7 +1140,7 @@ public int previousIndex() {
       public void remove() {
 //                ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#remove().
 //                       display_name remove
-//                       documentation ```java\npublic void remove()\n```
+//                       signature_documentation java public void remove()
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#remove().
         iterator.remove();
@@ -1156,12 +1156,12 @@ public void remove() {
       public void set(EpoxyModel<?> object) {
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#set().
 //                    display_name set
-//                    documentation ```java\npublic void set(EpoxyModel<?> object)\n```
+//                    signature_documentation java public void set(EpoxyModel<?> object)
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#set().
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^ definition local 48
 //                                         display_name object
-//                                         documentation ```java\nEpoxyModel<?> object\n```
+//                                         signature_documentation java EpoxyModel<?> object
         iterator.set(object);
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //               ^^^ reference semanticdb maven jdk 11 java/util/ListIterator#set().
@@ -1172,17 +1172,17 @@ public void set(EpoxyModel<?> object) {
     SubList(ModelList list, int start, int end) {
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#`<init>`().
 //          display_name <init>
-//          documentation ```java\nSubList(ModelList list, int start, int end)\n```
+//          signature_documentation java SubList(ModelList list, int start, int end)
 //          ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
 //                    ^^^^ definition local 49
 //                         display_name list
-//                         documentation ```java\nModelList list\n```
+//                         signature_documentation java ModelList list
 //                              ^^^^^ definition local 50
 //                                    display_name start
-//                                    documentation ```java\nint start\n```
+//                                    signature_documentation java int start
 //                                         ^^^ definition local 51
 //                                             display_name end
-//                                             documentation ```java\nint end\n```
+//                                             signature_documentation java int end
       fullList = list;
 //    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //               ^^^^ reference local 49
@@ -1204,16 +1204,16 @@ public void set(EpoxyModel<?> object) {
     public void add(int location, EpoxyModel<?> object) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#add().
 //                  display_name add
-//                  documentation ```java\n@Override\npublic void add(int location, EpoxyModel<?> object)\n```
+//                  signature_documentation java @Override\npublic void add(int location, EpoxyModel<?> object)
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add(+1).
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#add(+1).
 //                      ^^^^^^^^ definition local 52
 //                               display_name location
-//                               documentation ```java\nint location\n```
+//                               signature_documentation java int location
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^ definition local 53
 //                                                     display_name object
-//                                                     documentation ```java\nEpoxyModel<?> object\n```
+//                                                     signature_documentation java EpoxyModel<?> object
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1249,17 +1249,17 @@ public void add(int location, EpoxyModel<?> object) {
     public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collection) {
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll().
 //                        display_name addAll
-//                        documentation ```java\n@Override\npublic boolean addAll(int location, Collection<? extends EpoxyModel<?>> collection)\n```
+//                        signature_documentation java @Override\npublic boolean addAll(int location, Collection<? extends EpoxyModel<?>> collection)
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#addAll().
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#addAll(+1).
 //                            ^^^^^^^^ definition local 54
 //                                     display_name location
-//                                     documentation ```java\nint location\n```
+//                                     signature_documentation java int location
 //                                      ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^^^^^^^^^^ definition local 55
 //                                                                                     display_name collection
-//                                                                                     documentation ```java\nCollection<? extends EpoxyModel<?>> collection\n```
+//                                                                                     signature_documentation java Collection<? extends EpoxyModel<?>> collection
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1271,7 +1271,7 @@ public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collecti
           boolean result = fullList.addAll(location + offset, collection);
 //                ^^^^^^ definition local 56
 //                       display_name result
-//                       documentation ```java\nboolean result\n```
+//                       signature_documentation java boolean result
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                                         ^^^^^^^^ reference local 54
@@ -1303,7 +1303,7 @@ public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collecti
     public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll(+1).
 //                        display_name addAll
-//                        documentation ```java\n@Override\npublic boolean addAll(Collection<? extends EpoxyModel<?>> collection)\n```
+//                        signature_documentation java @Override\npublic boolean addAll(Collection<? extends EpoxyModel<?>> collection)
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#addAll().
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#addAll().
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#addAll().
@@ -1312,7 +1312,7 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^^^^^^^^^^ definition local 57
 //                                                                                display_name collection
-//                                                                                documentation ```java\n@NonNull\nCollection<? extends EpoxyModel<?>> collection\n```
+//                                                                                signature_documentation java @NonNull\nCollection<? extends EpoxyModel<?>> collection
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1320,7 +1320,7 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
         boolean result = fullList.addAll(offset + size, collection);
 //              ^^^^^^ definition local 58
 //                     display_name result
-//                     documentation ```java\nboolean result\n```
+//                     signature_documentation java boolean result
 //                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                                       ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#offset.
@@ -1350,12 +1350,12 @@ public EpoxyModel<?> get(int location) {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#get().
 //                           display_name get
-//                           documentation ```java\n@Override\npublic EpoxyModel<?> get(int location)\n```
+//                           signature_documentation java @Override\npublic EpoxyModel<?> get(int location)
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#get().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#get().
 //                               ^^^^^^^^ definition local 59
 //                                        display_name location
-//                                        documentation ```java\nint location\n```
+//                                        signature_documentation java int location
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1386,7 +1386,7 @@ public Iterator<EpoxyModel<?>> iterator() {
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#iterator().
 //                                          display_name iterator
-//                                          documentation ```java\n@NonNull\n@Override\npublic Iterator<EpoxyModel<?>> iterator()\n```
+//                                          signature_documentation java @NonNull\n@Override\npublic Iterator<EpoxyModel<?>> iterator()
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#iterator().
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#iterator().
@@ -1405,12 +1405,12 @@ public ListIterator<EpoxyModel<?>> listIterator(int location) {
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#listIterator().
 //                                                  display_name listIterator
-//                                                  documentation ```java\n@NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator(int location)\n```
+//                                                  signature_documentation java @NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator(int location)
 //                                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator(+1).
 //                                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#listIterator(+1).
 //                                                      ^^^^^^^^ definition local 60
 //                                                               display_name location
-//                                                               documentation ```java\nint location\n```
+//                                                               signature_documentation java int location
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1441,12 +1441,12 @@ public EpoxyModel<?> remove(int location) {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#remove().
 //                              display_name remove
-//                              documentation ```java\n@Override\npublic EpoxyModel<?> remove(int location)\n```
+//                              signature_documentation java @Override\npublic EpoxyModel<?> remove(int location)
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#remove().
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#remove(+1).
 //                                  ^^^^^^^^ definition local 61
 //                                           display_name location
-//                                           documentation ```java\nint location\n```
+//                                           signature_documentation java int location
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1459,7 +1459,7 @@ public EpoxyModel<?> remove(int location) {
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^ definition local 62
 //                             display_name result
-//                             documentation ```java\nEpoxyModel<?> result\n```
+//                             signature_documentation java EpoxyModel<?> result
 //                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#remove().
 //                                               ^^^^^^^^ reference local 61
@@ -1485,14 +1485,14 @@ public EpoxyModel<?> remove(int location) {
     protected void removeRange(int start, int end) {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#removeRange().
 //                             display_name removeRange
-//                             documentation ```java\n@Override\nprotected void removeRange(int start, int end)\n```
+//                             signature_documentation java @Override\nprotected void removeRange(int start, int end)
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#removeRange().
 //                                 ^^^^^ definition local 63
 //                                       display_name start
-//                                       documentation ```java\nint start\n```
+//                                       signature_documentation java int start
 //                                            ^^^ definition local 64
 //                                                display_name end
-//                                                documentation ```java\nint end\n```
+//                                                signature_documentation java int end
       if (start != end) {
 //        ^^^^^ reference local 63
 //                 ^^^ reference local 64
@@ -1528,16 +1528,16 @@ public EpoxyModel<?> set(int location, EpoxyModel<?> object) {
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#set().
 //                           display_name set
-//                           documentation ```java\n@Override\npublic EpoxyModel<?> set(int location, EpoxyModel<?> object)\n```
+//                           signature_documentation java @Override\npublic EpoxyModel<?> set(int location, EpoxyModel<?> object)
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#set().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#set().
 //                               ^^^^^^^^ definition local 65
 //                                        display_name location
-//                                        documentation ```java\nint location\n```
+//                                        signature_documentation java int location
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                       ^^^^^^ definition local 66
 //                                                              display_name object
-//                                                              documentation ```java\nEpoxyModel<?> object\n```
+//                                                              signature_documentation java EpoxyModel<?> object
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1565,7 +1565,7 @@ public EpoxyModel<?> set(int location, EpoxyModel<?> object) {
     public int size() {
 //             ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#size().
 //                  display_name size
-//                  documentation ```java\n@Override\npublic int size()\n```
+//                  signature_documentation java @Override\npublic int size()
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#size().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#size().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#size().
@@ -1583,10 +1583,10 @@ public int size() {
     void sizeChanged(boolean increment) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#sizeChanged().
 //                   display_name sizeChanged
-//                   documentation ```java\nvoid sizeChanged(boolean increment)\n```
+//                   signature_documentation java void sizeChanged(boolean increment)
 //                           ^^^^^^^^^ definition local 67
 //                                     display_name increment
-//                                     documentation ```java\nboolean increment\n```
+//                                     signature_documentation java boolean increment
       if (increment) {
 //        ^^^^^^^^^ reference local 67
         size++;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
index 8f381b7d6..943a6e491 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
@@ -4,28 +4,28 @@
 class ModelState {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#
 //               display_name ModelState
-//               documentation ```java\nclass ModelState\n```
+//               signature_documentation java class ModelState
 //               documentation Helper to store relevant information about a model that we need to determine if it changed. 
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#`<init>`().
 //               display_name <init>
-//               documentation ```java\nModelState()\n```
+//               signature_documentation java ModelState()
   long id;
 //     ^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#id.
 //        display_name id
-//        documentation ```java\nlong id\n```
+//        signature_documentation java long id
   int hashCode;
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#hashCode.
 //             display_name hashCode
-//             documentation ```java\nint hashCode\n```
+//             signature_documentation java int hashCode
   int position;
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#position.
 //             display_name position
-//             documentation ```java\nint position\n```
+//             signature_documentation java int position
   EpoxyModel<?> model;
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#model.
 //                    display_name model
-//                    documentation ```java\nEpoxyModel<?> model\n```
+//                    signature_documentation java EpoxyModel<?> model
 
   /**
    * A link to the item with the same id in the other list when diffing two lists. This will be null
@@ -36,7 +36,7 @@ class ModelState {
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
 //                display_name pair
-//                documentation ```java\nModelState pair\n```
+//                signature_documentation java ModelState pair
 //                documentation  A link to the item with the same id in the other list when diffing two lists. This will be null\n if the item doesn't exist, in the case of insertions or removals. This is an optimization to\n prevent having to look up the matching pair in a hash map every time.\n
 
   /**
@@ -50,29 +50,29 @@ class ModelState {
   int lastMoveOp;
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#lastMoveOp.
 //               display_name lastMoveOp
-//               documentation ```java\nint lastMoveOp\n```
+//               signature_documentation java int lastMoveOp
 //               documentation  How many movement operations have been applied to this item in order to update its position. As\n we find more item movements we need to update the position of affected items in the list in\n order to correctly calculate the next movement. Instead of iterating through all items in the\n list every time a movement operation happens we keep track of how many of these operations have\n been applied to an item, and apply all new operations in order when we need to get this item's\n up to date position.\n
 
   static ModelState build(EpoxyModel<?> model, int position, boolean immutableModel) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#build().
 //                        display_name build
-//                        documentation ```java\nstatic ModelState build(EpoxyModel<?> model, int position, boolean immutableModel)\n```
+//                        signature_documentation java static ModelState build(EpoxyModel<?> model, int position, boolean immutableModel)
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^ definition local 0
 //                                            display_name model
-//                                            documentation ```java\nEpoxyModel<?> model\n```
+//                                            signature_documentation java EpoxyModel<?> model
 //                                                 ^^^^^^^^ definition local 1
 //                                                          display_name position
-//                                                          documentation ```java\nint position\n```
+//                                                          signature_documentation java int position
 //                                                                   ^^^^^^^^^^^^^^ definition local 2
 //                                                                                  display_name immutableModel
-//                                                                                  documentation ```java\nboolean immutableModel\n```
+//                                                                                  signature_documentation java boolean immutableModel
     ModelState state = new ModelState();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^ definition local 3
 //                   display_name state
-//                   documentation ```java\nModelState state\n```
+//                   signature_documentation java ModelState state
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#`<init>`().
 
     state.lastMoveOp = 0;
@@ -116,7 +116,7 @@ static ModelState build(EpoxyModel<?> model, int position, boolean immutableMode
   void pairWithSelf() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#pairWithSelf().
 //                  display_name pairWithSelf
-//                  documentation ```java\nvoid pairWithSelf()\n```
+//                  signature_documentation java void pairWithSelf()
 //                  documentation  Used for an item inserted into the new list when we need to track moves that effect the\n inserted item in the old list.\n
     if (pair != null) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
@@ -157,7 +157,7 @@ public String toString() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#toString().
 //                       display_name toString
-//                       documentation ```java\n@Override\npublic String toString()\n```
+//                       signature_documentation java @Override\npublic String toString()
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return "ModelState{"
         + "id=" + id
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
index e42276478..d14dd044e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
@@ -7,12 +7,12 @@
 class NoOpControllerHelper extends ControllerHelper<EpoxyController> {
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#
 //                         display_name NoOpControllerHelper
-//                         documentation ```java\nclass NoOpControllerHelper\n```
+//                         signature_documentation java class NoOpControllerHelper
 //                         documentation  A {@link ControllerHelper} implementation for adapters with no {@link\n com.airbnb.epoxy.AutoModel} usage.\n
 //                         relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#`<init>`().
 //                         display_name <init>
-//                         documentation ```java\nNoOpControllerHelper()\n```
+//                         signature_documentation java NoOpControllerHelper()
 //                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
@@ -21,7 +21,7 @@ class NoOpControllerHelper extends ControllerHelper<EpoxyController> {
   public void resetAutoModels() {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#resetAutoModels().
 //                            display_name resetAutoModels
-//                            documentation ```java\n@Override\npublic void resetAutoModels()\n```
+//                            signature_documentation java @Override\npublic void resetAutoModels()
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ControllerHelper#resetAutoModels().
     // No - Op
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
index 1517b1441..b23649abf 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
@@ -3,23 +3,23 @@
 class NoOpTimer implements Timer {
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#
 //              display_name NoOpTimer
-//              documentation ```java\nclass NoOpTimer\n```
+//              signature_documentation java class NoOpTimer
 //              relationship is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#`<init>`().
 //              display_name <init>
-//              documentation ```java\nNoOpTimer()\n```
+//              signature_documentation java NoOpTimer()
 //                         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public void start(String sectionName) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#start().
 //                  display_name start
-//                  documentation ```java\n@Override\npublic void start(String sectionName)\n```
+//                  signature_documentation java @Override\npublic void start(String sectionName)
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#start().
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                         ^^^^^^^^^^^ definition local 0
 //                                     display_name sectionName
-//                                     documentation ```java\nString sectionName\n```
+//                                     signature_documentation java String sectionName
 
   }
 
@@ -28,7 +28,7 @@ public void start(String sectionName) {
   public void stop() {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#stop().
 //                 display_name stop
-//                 documentation ```java\n@Override\npublic void stop()\n```
+//                 signature_documentation java @Override\npublic void stop()
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#stop().
 
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
index b0a051f21..10053f3d3 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
@@ -17,23 +17,23 @@
 class NotifyBlocker extends AdapterDataObserver {
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#
 //                  display_name NotifyBlocker
-//                  documentation ```java\nclass NotifyBlocker\n```
+//                  signature_documentation java class NotifyBlocker
 //                  documentation  We don't allow any data change notifications except the ones done though diffing. Forcing\n changes to happen through diffing reduces the chance for developer error when implementing an\n adapter.\n <p>\n This observer throws upon any changes done outside of diffing.\n
 //                  relationship is_implementation semanticdb maven . . AdapterDataObserver#
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#`<init>`().
 //                  display_name <init>
-//                  documentation ```java\nNotifyBlocker()\n```
+//                  signature_documentation java NotifyBlocker()
 //                          ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . AdapterDataObserver#
 
   private boolean changesAllowed;
 //                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
 //                               display_name changesAllowed
-//                               documentation ```java\nprivate boolean changesAllowed\n```
+//                               signature_documentation java private boolean changesAllowed
 
   void allowChanges() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#allowChanges().
 //                  display_name allowChanges
-//                  documentation ```java\nvoid allowChanges()\n```
+//                  signature_documentation java void allowChanges()
     changesAllowed = true;
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
   }
@@ -41,7 +41,7 @@ void allowChanges() {
   void blockChanges() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#blockChanges().
 //                  display_name blockChanges
-//                  documentation ```java\nvoid blockChanges()\n```
+//                  signature_documentation java void blockChanges()
     changesAllowed = false;
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
   }
@@ -51,7 +51,7 @@ void blockChanges() {
   public void onChanged() {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
 //                      display_name onChanged
-//                      documentation ```java\n@Override\npublic void onChanged()\n```
+//                      signature_documentation java @Override\npublic void onChanged()
     if (!changesAllowed) {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
       throw new IllegalStateException(
@@ -65,13 +65,13 @@ public void onChanged() {
   public void onItemRangeChanged(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged().
 //                               display_name onItemRangeChanged
-//                               documentation ```java\n@Override\npublic void onItemRangeChanged(int positionStart, int itemCount)\n```
+//                               signature_documentation java @Override\npublic void onItemRangeChanged(int positionStart, int itemCount)
 //                                   ^^^^^^^^^^^^^ definition local 0
 //                                                 display_name positionStart
-//                                                 documentation ```java\nint positionStart\n```
+//                                                 signature_documentation java int positionStart
 //                                                      ^^^^^^^^^ definition local 1
 //                                                                display_name itemCount
-//                                                                documentation ```java\nint itemCount\n```
+//                                                                signature_documentation java int itemCount
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
@@ -81,17 +81,17 @@ public void onItemRangeChanged(int positionStart, int itemCount) {
   public void onItemRangeChanged(int positionStart, int itemCount, Object payload) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(+1).
 //                               display_name onItemRangeChanged
-//                               documentation ```java\n@Override\npublic void onItemRangeChanged(int positionStart, int itemCount, Object payload)\n```
+//                               signature_documentation java @Override\npublic void onItemRangeChanged(int positionStart, int itemCount, Object payload)
 //                                   ^^^^^^^^^^^^^ definition local 2
 //                                                 display_name positionStart
-//                                                 documentation ```java\nint positionStart\n```
+//                                                 signature_documentation java int positionStart
 //                                                      ^^^^^^^^^ definition local 3
 //                                                                display_name itemCount
-//                                                                documentation ```java\nint itemCount\n```
+//                                                                signature_documentation java int itemCount
 //                                                                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                        ^^^^^^^ definition local 4
 //                                                                                display_name payload
-//                                                                                documentation ```java\nObject payload\n```
+//                                                                                signature_documentation java Object payload
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
@@ -101,13 +101,13 @@ public void onItemRangeChanged(int positionStart, int itemCount, Object payload)
   public void onItemRangeInserted(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeInserted().
 //                                display_name onItemRangeInserted
-//                                documentation ```java\n@Override\npublic void onItemRangeInserted(int positionStart, int itemCount)\n```
+//                                signature_documentation java @Override\npublic void onItemRangeInserted(int positionStart, int itemCount)
 //                                    ^^^^^^^^^^^^^ definition local 5
 //                                                  display_name positionStart
-//                                                  documentation ```java\nint positionStart\n```
+//                                                  signature_documentation java int positionStart
 //                                                       ^^^^^^^^^ definition local 6
 //                                                                 display_name itemCount
-//                                                                 documentation ```java\nint itemCount\n```
+//                                                                 signature_documentation java int itemCount
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
@@ -117,13 +117,13 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
   public void onItemRangeRemoved(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeRemoved().
 //                               display_name onItemRangeRemoved
-//                               documentation ```java\n@Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)\n```
+//                               signature_documentation java @Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)
 //                                   ^^^^^^^^^^^^^ definition local 7
 //                                                 display_name positionStart
-//                                                 documentation ```java\nint positionStart\n```
+//                                                 signature_documentation java int positionStart
 //                                                      ^^^^^^^^^ definition local 8
 //                                                                display_name itemCount
-//                                                                documentation ```java\nint itemCount\n```
+//                                                                signature_documentation java int itemCount
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
@@ -133,16 +133,16 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
   public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeMoved().
 //                             display_name onItemRangeMoved
-//                             documentation ```java\n@Override\npublic void onItemRangeMoved(int fromPosition, int toPosition, int itemCount)\n```
+//                             signature_documentation java @Override\npublic void onItemRangeMoved(int fromPosition, int toPosition, int itemCount)
 //                                 ^^^^^^^^^^^^ definition local 9
 //                                              display_name fromPosition
-//                                              documentation ```java\nint fromPosition\n```
+//                                              signature_documentation java int fromPosition
 //                                                   ^^^^^^^^^^ definition local 10
 //                                                              display_name toPosition
-//                                                              documentation ```java\nint toPosition\n```
+//                                                              signature_documentation java int toPosition
 //                                                                   ^^^^^^^^^ definition local 11
 //                                                                             display_name itemCount
-//                                                                             documentation ```java\nint itemCount\n```
+//                                                                             signature_documentation java int itemCount
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
index c935876a4..4c10f6d26 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
@@ -4,15 +4,15 @@
 public interface OnModelBoundListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#
 //                                    display_name OnModelBoundListener
-//                                    documentation ```java\npublic interface OnModelBoundListener<T extends EpoxyModel<?>, V>\n```
+//                                    signature_documentation java public interface OnModelBoundListener<T extends EpoxyModel<?>, V>
 //                                    documentation Used to register an onBind callback with a generated model. 
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[T]
 //                                      display_name T
-//                                      documentation ```java\nT extends EpoxyModel<?>\n```
+//                                      signature_documentation java T extends EpoxyModel<?>
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[V]
 //                                                               display_name V
-//                                                               documentation ```java\nV\n```
+//                                                               signature_documentation java V
   /**
    * This will be called immediately after a model was bound, with the model and view that were
    * bound together.
@@ -24,17 +24,17 @@ public interface OnModelBoundListener<T extends EpoxyModel<?>, V> {
   void onModelBound(T model, V view, int position);
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#onModelBound().
 //                  display_name onModelBound
-//                  documentation ```java\npublic abstract void onModelBound(T model, V view, int position)\n```
+//                  signature_documentation java public abstract void onModelBound(T model, V view, int position)
 //                  documentation  This will be called immediately after a model was bound, with the model and view that were\n bound together.\n\n @param model    The model being bound\n @param view     The view that is being bound to the model\n @param position The adapter position of the model\n
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[T]
 //                    ^^^^^ definition local 0
 //                          display_name model
-//                          documentation ```java\nT model\n```
+//                          signature_documentation java T model
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[V]
 //                             ^^^^ definition local 1
 //                                  display_name view
-//                                  documentation ```java\nV view\n```
+//                                  signature_documentation java V view
 //                                       ^^^^^^^^ definition local 2
 //                                                display_name position
-//                                                documentation ```java\nint position\n```
+//                                                signature_documentation java int position
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
index ff8b22b6b..e400f6280 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
@@ -12,7 +12,7 @@
 public interface OnModelBuildFinishedListener {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                            display_name OnModelBuildFinishedListener
-//                                            documentation ```java\npublic interface OnModelBuildFinishedListener\n```
+//                                            signature_documentation java public interface OnModelBuildFinishedListener
 //                                            documentation  Used with {@link EpoxyController#addModelBuildListener(OnModelBuildFinishedListener)} to be\n alerted to new model changes.\n
   /**
    * Called after {@link EpoxyController#buildModels()} has run and changes have been notified to
@@ -21,11 +21,11 @@ public interface OnModelBuildFinishedListener {
   void onModelBuildFinished(@NonNull DiffResult result);
 //     ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished().
 //                          display_name onModelBuildFinished
-//                          documentation ```java\npublic abstract void onModelBuildFinished(DiffResult result)\n```
+//                          signature_documentation java public abstract void onModelBuildFinished(DiffResult result)
 //                          documentation  Called after {@link EpoxyController#buildModels()} has run and changes have been notified to\n the adapter. This will be called even if no changes existed.\n
 //                           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                                              ^^^^^^ definition local 0
 //                                                     display_name result
-//                                                     documentation ```java\n@NonNull\nDiffResult result\n```
+//                                                     signature_documentation java @NonNull\nDiffResult result
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
index 6e7036c69..039ac7adf 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
@@ -8,14 +8,14 @@
 public interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#
 //                                            display_name OnModelCheckedChangeListener
-//                                            documentation ```java\npublic interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V>\n```
+//                                            signature_documentation java public interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V>
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[T]
 //                                              display_name T
-//                                              documentation ```java\nT extends EpoxyModel<?>\n```
+//                                              signature_documentation java T extends EpoxyModel<?>
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[V]
 //                                                                       display_name V
-//                                                                       documentation ```java\nV\n```
+//                                                                       signature_documentation java V
   /**
    * Called when the view bound to the model is checked.
    *
@@ -29,25 +29,25 @@ public interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V> {
   void onChecked(T model, V parentView,
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked().
 //               display_name onChecked
-//               documentation ```java\npublic abstract void onChecked(T model, V parentView, unresolved_type checkedView, boolean isChecked, int position)\n```
+//               signature_documentation java public abstract void onChecked(T model, V parentView, unresolved_type checkedView, boolean isChecked, int position)
 //               documentation  Called when the view bound to the model is checked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param checkedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param isChecked   The new value for isChecked property.\n @param position    The position of the model in the adapter.\n
 //               ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[T]
 //                 ^^^^^ definition local 0
 //                       display_name model
-//                       documentation ```java\nT model\n```
+//                       signature_documentation java T model
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[V]
 //                          ^^^^^^^^^^ definition local 1
 //                                     display_name parentView
-//                                     documentation ```java\nV parentView\n```
+//                                     signature_documentation java V parentView
       CompoundButton checkedView, boolean isChecked, int position);
 //    ^^^^^^^^^^^^^^ reference semanticdb maven . . CompoundButton#
 //                   ^^^^^^^^^^^ definition local 2
 //                               display_name checkedView
-//                               documentation ```java\nunresolved_type checkedView\n```
+//                               signature_documentation java unresolved_type checkedView
 //                                        ^^^^^^^^^ definition local 3
 //                                                  display_name isChecked
-//                                                  documentation ```java\nboolean isChecked\n```
+//                                                  signature_documentation java boolean isChecked
 //                                                       ^^^^^^^^ definition local 4
 //                                                                display_name position
-//                                                                documentation ```java\nint position\n```
+//                                                                signature_documentation java int position
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
index 1120614e6..b52c9fcf8 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
@@ -9,15 +9,15 @@
 public interface OnModelClickListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#
 //                                    display_name OnModelClickListener
-//                                    documentation ```java\npublic interface OnModelClickListener<T extends EpoxyModel<?>, V>\n```
+//                                    signature_documentation java public interface OnModelClickListener<T extends EpoxyModel<?>, V>
 //                                    documentation Used to register a click listener on a generated model. 
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[T]
 //                                      display_name T
-//                                      documentation ```java\nT extends EpoxyModel<?>\n```
+//                                      signature_documentation java T extends EpoxyModel<?>
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[V]
 //                                                               display_name V
-//                                                               documentation ```java\nV\n```
+//                                                               signature_documentation java V
   /**
    * Called when the view bound to the model is clicked.
    *
@@ -30,21 +30,21 @@ public interface OnModelClickListener<T extends EpoxyModel<?>, V> {
   void onClick(T model, V parentView, View clickedView, int position);
 //     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#onClick().
 //             display_name onClick
-//             documentation ```java\npublic abstract void onClick(T model, V parentView, unresolved_type clickedView, int position)\n```
+//             signature_documentation java public abstract void onClick(T model, V parentView, unresolved_type clickedView, int position)
 //             documentation  Called when the view bound to the model is clicked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param clickedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param position    The position of the model in the adapter.\n
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[T]
 //               ^^^^^ definition local 0
 //                     display_name model
-//                     documentation ```java\nT model\n```
+//                     signature_documentation java T model
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[V]
 //                        ^^^^^^^^^^ definition local 1
 //                                   display_name parentView
-//                                   documentation ```java\nV parentView\n```
+//                                   signature_documentation java V parentView
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^^^^ definition local 2
 //                                                     display_name clickedView
-//                                                     documentation ```java\nunresolved_type clickedView\n```
+//                                                     signature_documentation java unresolved_type clickedView
 //                                                          ^^^^^^^^ definition local 3
 //                                                                   display_name position
-//                                                                   documentation ```java\nint position\n```
+//                                                                   signature_documentation java int position
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
index 80d34c463..89c77b687 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
@@ -8,14 +8,14 @@
 public interface OnModelLongClickListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#
 //                                        display_name OnModelLongClickListener
-//                                        documentation ```java\npublic interface OnModelLongClickListener<T extends EpoxyModel<?>, V>\n```
+//                                        signature_documentation java public interface OnModelLongClickListener<T extends EpoxyModel<?>, V>
 //                                        ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[T]
 //                                          display_name T
-//                                          documentation ```java\nT extends EpoxyModel<?>\n```
+//                                          signature_documentation java T extends EpoxyModel<?>
 //                                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                 ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[V]
 //                                                                   display_name V
-//                                                                   documentation ```java\nV\n```
+//                                                                   signature_documentation java V
   /**
    * Called when the view bound to the model is clicked.
    *
@@ -28,21 +28,21 @@ public interface OnModelLongClickListener<T extends EpoxyModel<?>, V> {
   boolean onLongClick(T model, V parentView, View clickedView, int position);
 //        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#onLongClick().
 //                    display_name onLongClick
-//                    documentation ```java\npublic abstract boolean onLongClick(T model, V parentView, unresolved_type clickedView, int position)\n```
+//                    signature_documentation java public abstract boolean onLongClick(T model, V parentView, unresolved_type clickedView, int position)
 //                    documentation  Called when the view bound to the model is clicked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param clickedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param position    The position of the model in the adapter.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[T]
 //                      ^^^^^ definition local 0
 //                            display_name model
-//                            documentation ```java\nT model\n```
+//                            signature_documentation java T model
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[V]
 //                               ^^^^^^^^^^ definition local 1
 //                                          display_name parentView
-//                                          documentation ```java\nV parentView\n```
+//                                          signature_documentation java V parentView
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^ definition local 2
 //                                                            display_name clickedView
-//                                                            documentation ```java\nunresolved_type clickedView\n```
+//                                                            signature_documentation java unresolved_type clickedView
 //                                                                 ^^^^^^^^ definition local 3
 //                                                                          display_name position
-//                                                                          documentation ```java\nint position\n```
+//                                                                          signature_documentation java int position
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
index 7b29a9539..37605d00c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
@@ -4,15 +4,15 @@
 public interface OnModelUnboundListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#
 //                                      display_name OnModelUnboundListener
-//                                      documentation ```java\npublic interface OnModelUnboundListener<T extends EpoxyModel<?>, V>\n```
+//                                      signature_documentation java public interface OnModelUnboundListener<T extends EpoxyModel<?>, V>
 //                                      documentation Used to register an onUnbind callback with a generated model. 
 //                                      ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[T]
 //                                        display_name T
-//                                        documentation ```java\nT extends EpoxyModel<?>\n```
+//                                        signature_documentation java T extends EpoxyModel<?>
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[V]
 //                                                                 display_name V
-//                                                                 documentation ```java\nV\n```
+//                                                                 signature_documentation java V
   /**
    * This will be called immediately after a model is unbound from a view, with the view and model
    * that were unbound.
@@ -20,14 +20,14 @@ public interface OnModelUnboundListener<T extends EpoxyModel<?>, V> {
   void onModelUnbound(T model, V view);
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound().
 //                    display_name onModelUnbound
-//                    documentation ```java\npublic abstract void onModelUnbound(T model, V view)\n```
+//                    signature_documentation java public abstract void onModelUnbound(T model, V view)
 //                    documentation  This will be called immediately after a model is unbound from a view, with the view and model\n that were unbound.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[T]
 //                      ^^^^^ definition local 0
 //                            display_name model
-//                            documentation ```java\nT model\n```
+//                            signature_documentation java T model
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[V]
 //                               ^^^^ definition local 1
 //                                    display_name view
-//                                    documentation ```java\nV view\n```
+//                                    signature_documentation java V view
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
index 99c4cc7c1..224e4a5c0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
@@ -13,16 +13,16 @@
 public interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#
 //                                                display_name OnModelVisibilityChangedListener
-//                                                documentation ```java\npublic interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V>\n```
+//                                                signature_documentation java public interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V>
 //                                                documentation Used to register an onVisibilityChanged callback with a generated model. 
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[T]
 //                                                  display_name T
-//                                                  documentation ```java\nT extends EpoxyModel<V>\n```
+//                                                  signature_documentation java T extends EpoxyModel<V>
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
 //                                                                         ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
 //                                                                           display_name V
-//                                                                           documentation ```java\nV\n```
+//                                                                           signature_documentation java V
 
   /**
    * This will be called once the view visible part changes.
@@ -42,37 +42,37 @@ public interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V> {
   void onVisibilityChanged(T model, V view,
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
 //                         display_name onVisibilityChanged
-//                         documentation ```java\npublic abstract void onVisibilityChanged(T model, V view, float percentVisibleHeight, float percentVisibleWidth, int heightVisible, int widthVisible)\n```
+//                         signature_documentation java public abstract void onVisibilityChanged(T model, V view, float percentVisibleHeight, float percentVisibleWidth, int heightVisible, int widthVisible)
 //                         documentation  This will be called once the view visible part changes.\n <p>\n OnModelVisibilityChangedListener should be used with particular care since they will be\n dispatched on every frame while scrolling. No heavy work should be done inside the\n implementation. Using {@link OnModelVisibilityStateChangedListener} is recommended whenever\n possible.\n <p>\n @param model                The model being bound\n @param view                 The view that is being bound to the model\n @param percentVisibleHeight The percentage of height visible (0-100)\n @param percentVisibleWidth  The percentage of width visible (0-100)\n @param heightVisible        The visible height in pixel\n @param widthVisible         The visible width in pixel\n
 //                         ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[T]
 //                           ^^^^^ definition local 0
 //                                 display_name model
-//                                 documentation ```java\nT model\n```
+//                                 signature_documentation java T model
 //                                  ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
 //                                    ^^^^ definition local 1
 //                                         display_name view
-//                                         documentation ```java\nV view\n```
+//                                         signature_documentation java V view
       @FloatRange(from = 0, to = 100) float percentVisibleHeight,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 2
 //                                                               display_name percentVisibleHeight
-//                                                               documentation ```java\n@FloatRange(from = 0, to = 100)\nfloat percentVisibleHeight\n```
+//                                                               signature_documentation java @FloatRange(from = 0, to = 100)\nfloat percentVisibleHeight
       @FloatRange(from = 0, to = 100) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
 //                          ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#to().
 //                                          ^^^^^^^^^^^^^^^^^^^ definition local 3
 //                                                              display_name percentVisibleWidth
-//                                                              documentation ```java\n@FloatRange(from = 0, to = 100)\nfloat percentVisibleWidth\n```
+//                                                              signature_documentation java @FloatRange(from = 0, to = 100)\nfloat percentVisibleWidth
       @Px int heightVisible, @Px int widthVisible);
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 4
 //                          display_name heightVisible
-//                          documentation ```java\n@Px\nint heightVisible\n```
+//                          signature_documentation java @Px\nint heightVisible
 //                            ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                   ^^^^^^^^^^^^ definition local 5
 //                                                display_name widthVisible
-//                                                documentation ```java\n@Px\nint widthVisible\n```
+//                                                signature_documentation java @Px\nint widthVisible
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
index 76738e0ee..cbed93c9c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
@@ -11,16 +11,16 @@
 public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#
 //                                                     display_name OnModelVisibilityStateChangedListener
-//                                                     documentation ```java\npublic interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>, V>\n```
+//                                                     signature_documentation java public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>, V>
 //                                                     documentation Used to register an onVisibilityChanged callback with a generated model. 
 //                                                     ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T]
 //                                                       display_name T
-//                                                       documentation ```java\nT extends EpoxyModel<V>\n```
+//                                                       signature_documentation java T extends EpoxyModel<V>
 //                                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
 //                                                                              ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
 //                                                                                display_name V
-//                                                                                documentation ```java\nV\n```
+//                                                                                signature_documentation java V
 
   /**
    * This will be called once the visibility changed.
@@ -34,18 +34,18 @@ public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>,
   void onVisibilityStateChanged(T model, V view, @Visibility int visibilityState);
 //     ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged().
 //                              display_name onVisibilityStateChanged
-//                              documentation ```java\npublic abstract void onVisibilityStateChanged(T model, V view, int visibilityState)\n```
+//                              signature_documentation java public abstract void onVisibilityStateChanged(T model, V view, int visibilityState)
 //                              documentation  This will be called once the visibility changed.\n <p>\n @param model           The model being bound\n @param view            The view that is being bound to the model\n @param visibilityState The new visibility\n <p>\n @see VisibilityState\n
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T]
 //                                ^^^^^ definition local 0
 //                                      display_name model
-//                                      documentation ```java\nT model\n```
+//                                      signature_documentation java T model
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
 //                                         ^^^^ definition local 1
 //                                              display_name view
-//                                              documentation ```java\nV view\n```
+//                                              signature_documentation java V view
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                               ^^^^^^^^^^^^^^^ definition local 2
 //                                                                               display_name visibilityState
-//                                                                               documentation ```java\n@Visibility\nint visibilityState\n```
+//                                                                               signature_documentation java @Visibility\nint visibilityState
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
index 6755151d9..2f5e9bde2 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
@@ -22,40 +22,40 @@
 public class QuantityStringResAttribute {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
 //                                      display_name QuantityStringResAttribute
-//                                      documentation ```java\npublic class QuantityStringResAttribute\n```
+//                                      signature_documentation java public class QuantityStringResAttribute
   @PluralsRes private final int id;
 // ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                              ^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
 //                                 display_name id
-//                                 documentation ```java\n@PluralsRes\nprivate final int id\n```
+//                                 signature_documentation java @PluralsRes\nprivate final int id
   private final int quantity;
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
 //                           display_name quantity
-//                           documentation ```java\nprivate final int quantity\n```
+//                           signature_documentation java private final int quantity
   @Nullable private final Object[] formatArgs;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
 //                                            display_name formatArgs
-//                                            documentation ```java\n@Nullable\nprivate final Object[] formatArgs\n```
+//                                            signature_documentation java @Nullable\nprivate final Object[] formatArgs
 
   public QuantityStringResAttribute(@PluralsRes int id, int quantity,
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
 //                                  display_name <init>
-//                                  documentation ```java\npublic QuantityStringResAttribute(int id, int quantity, Object[] formatArgs)\n```
+//                                  signature_documentation java public QuantityStringResAttribute(int id, int quantity, Object[] formatArgs)
 //                                   ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                                                  ^^ definition local 0
 //                                                     display_name id
-//                                                     documentation ```java\n@PluralsRes\nint id\n```
+//                                                     signature_documentation java @PluralsRes\nint id
 //                                                          ^^^^^^^^ definition local 1
 //                                                                   display_name quantity
-//                                                                   documentation ```java\nint quantity\n```
+//                                                                   signature_documentation java int quantity
       @Nullable Object[] formatArgs) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                       ^^^^^^^^^^ definition local 2
 //                                  display_name formatArgs
-//                                  documentation ```java\n@Nullable\nObject[] formatArgs\n```
+//                                  signature_documentation java @Nullable\nObject[] formatArgs
     this.quantity = quantity;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
 //                  ^^^^^^^^ reference local 1
@@ -70,13 +70,13 @@ public QuantityStringResAttribute(@PluralsRes int id, int quantity,
   public QuantityStringResAttribute(int id, int quantity) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`(+1).
 //                                  display_name <init>
-//                                  documentation ```java\npublic QuantityStringResAttribute(int id, int quantity)\n```
+//                                  signature_documentation java public QuantityStringResAttribute(int id, int quantity)
 //                                      ^^ definition local 3
 //                                         display_name id
-//                                         documentation ```java\nint id\n```
+//                                         signature_documentation java int id
 //                                              ^^^^^^^^ definition local 4
 //                                                       display_name quantity
-//                                                       documentation ```java\nint quantity\n```
+//                                                       signature_documentation java int quantity
     this(id, quantity, null);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
 //       ^^ reference local 3
@@ -88,7 +88,7 @@ public QuantityStringResAttribute(int id, int quantity) {
   public int getId() {
 //           ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getId().
 //                 display_name getId
-//                 documentation ```java\n@PluralsRes\npublic int getId()\n```
+//                 signature_documentation java @PluralsRes\npublic int getId()
     return id;
 //         ^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
   }
@@ -96,7 +96,7 @@ public int getId() {
   public int getQuantity() {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getQuantity().
 //                       display_name getQuantity
-//                       documentation ```java\npublic int getQuantity()\n```
+//                       signature_documentation java public int getQuantity()
     return quantity;
 //         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
   }
@@ -107,7 +107,7 @@ public Object[] getFormatArgs() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getFormatArgs().
 //                              display_name getFormatArgs
-//                              documentation ```java\n@Nullable\npublic Object[] getFormatArgs()\n```
+//                              signature_documentation java @Nullable\npublic Object[] getFormatArgs()
     return formatArgs;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
   }
@@ -116,11 +116,11 @@ public CharSequence toString(Context context) {
 //       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#toString().
 //                             display_name toString
-//                             documentation ```java\npublic CharSequence toString(unresolved_type context)\n```
+//                             signature_documentation java public CharSequence toString(unresolved_type context)
 //                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                     ^^^^^^^ definition local 5
 //                                             display_name context
-//                                             documentation ```java\nunresolved_type context\n```
+//                                             signature_documentation java unresolved_type context
     if (formatArgs == null || formatArgs.length == 0) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
@@ -147,12 +147,12 @@ public CharSequence toString(Context context) {
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#equals().
 //                      display_name equals
-//                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
+//                      signature_documentation java @Override\npublic boolean equals(Object o)
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 6
 //                               display_name o
-//                               documentation ```java\nObject o\n```
+//                               signature_documentation java Object o
     if (this == o) {
 //              ^ reference local 6
       return true;
@@ -167,7 +167,7 @@ public boolean equals(Object o) {
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
 //                             ^^^^ definition local 7
 //                                  display_name that
-//                                  documentation ```java\nQuantityStringResAttribute that\n```
+//                                  signature_documentation java QuantityStringResAttribute that
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
 //                                                                 ^ reference local 6
 
@@ -197,12 +197,12 @@ public boolean equals(Object o) {
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#hashCode().
 //                    display_name hashCode
-//                    documentation ```java\n@Override\npublic int hashCode()\n```
+//                    signature_documentation java @Override\npublic int hashCode()
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = id;
 //      ^^^^^^ definition local 8
 //             display_name result
-//             documentation ```java\nint result\n```
+//             signature_documentation java int result
 //               ^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
     result = 31 * result + quantity;
 //  ^^^^^^ reference local 8
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
index a708b8201..38ec567d0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
@@ -17,7 +17,7 @@
 public class SimpleEpoxyAdapter extends EpoxyAdapter {
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#
 //                              display_name SimpleEpoxyAdapter
-//                              documentation ```java\npublic class SimpleEpoxyAdapter\n```
+//                              signature_documentation java public class SimpleEpoxyAdapter
 //                              documentation  A non-abstract version of {@link com.airbnb.epoxy.EpoxyAdapter} that exposes all methods and\n models as public. Use this if you don't want to create your own adapter subclass and instead want\n to modify the adapter from elsewhere, such as from an activity.\n
 //                              relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                              relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -25,7 +25,7 @@ public class SimpleEpoxyAdapter extends EpoxyAdapter {
 //                              relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#`<init>`().
 //                              display_name <init>
-//                              documentation ```java\npublic SimpleEpoxyAdapter()\n```
+//                              signature_documentation java public SimpleEpoxyAdapter()
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#
 
   public List<EpoxyModel<?>> getModels() {
@@ -33,7 +33,7 @@ public List<EpoxyModel<?>> getModels() {
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModels().
 //                                     display_name getModels
-//                                     documentation ```java\npublic List<EpoxyModel<?>> getModels()\n```
+//                                     signature_documentation java public List<EpoxyModel<?>> getModels()
     return models;
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
   }
@@ -43,7 +43,7 @@ public List<EpoxyModel<?>> getModels() {
   public void enableDiffing() {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#enableDiffing().
 //                          display_name enableDiffing
-//                          documentation ```java\n@Override\npublic void enableDiffing()\n```
+//                          signature_documentation java @Override\npublic void enableDiffing()
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#enableDiffing().
     super.enableDiffing();
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -55,7 +55,7 @@ public void enableDiffing() {
   public void notifyModelsChanged() {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelsChanged().
 //                                display_name notifyModelsChanged
-//                                documentation ```java\n@Override\npublic void notifyModelsChanged()\n```
+//                                signature_documentation java @Override\npublic void notifyModelsChanged()
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelsChanged().
     super.notifyModelsChanged();
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -68,7 +68,7 @@ public BoundViewHolders getBoundViewHolders() {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getBoundViewHolders().
 //                                            display_name getBoundViewHolders
-//                                            documentation ```java\n@Override\npublic BoundViewHolders getBoundViewHolders()\n```
+//                                            signature_documentation java @Override\npublic BoundViewHolders getBoundViewHolders()
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
     return super.getBoundViewHolders();
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -80,12 +80,12 @@ public BoundViewHolders getBoundViewHolders() {
   public void notifyModelChanged(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged().
 //                               display_name notifyModelChanged
-//                               documentation ```java\n@Override\npublic void notifyModelChanged(EpoxyModel<?> model)\n```
+//                               signature_documentation java @Override\npublic void notifyModelChanged(EpoxyModel<?> model)
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^ definition local 0
 //                                                   display_name model
-//                                                   documentation ```java\nEpoxyModel<?> model\n```
+//                                                   signature_documentation java EpoxyModel<?> model
     super.notifyModelChanged(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
@@ -97,12 +97,12 @@ public void notifyModelChanged(EpoxyModel<?> model) {
   public void addModels(EpoxyModel<?>... modelsToAdd) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels().
 //                      display_name addModels
-//                      documentation ```java\n@Override\npublic void addModels(EpoxyModel<?>[] modelsToAdd)\n```
+//                      signature_documentation java @Override\npublic void addModels(EpoxyModel<?>[] modelsToAdd)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^^^^^^^ definition local 1
 //                                                   display_name modelsToAdd
-//                                                   documentation ```java\nEpoxyModel<?>[] modelsToAdd\n```
+//                                                   signature_documentation java EpoxyModel<?>[] modelsToAdd
     super.addModels(modelsToAdd);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
@@ -114,13 +114,13 @@ public void addModels(EpoxyModel<?>... modelsToAdd) {
   public void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1).
 //                      display_name addModels
-//                      documentation ```java\n@Override\npublic void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd)\n```
+//                      signature_documentation java @Override\npublic void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
 //                      ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^^^^^^^ definition local 2
 //                                                                      display_name modelsToAdd
-//                                                                      documentation ```java\nCollection<? extends EpoxyModel<?>> modelsToAdd\n```
+//                                                                      signature_documentation java Collection<? extends EpoxyModel<?>> modelsToAdd
     super.addModels(modelsToAdd);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
@@ -132,16 +132,16 @@ public void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
   public void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore().
 //                              display_name insertModelBefore
-//                              documentation ```java\n@Override\npublic void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore)\n```
+//                              signature_documentation java @Override\npublic void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore)
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^^^^^^^^^ definition local 3
 //                                                          display_name modelToInsert
-//                                                          documentation ```java\nEpoxyModel<?> modelToInsert\n```
+//                                                          signature_documentation java EpoxyModel<?> modelToInsert
 //                                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                         ^^^^^^^^^^^^^^^^^^^ definition local 4
 //                                                                                             display_name modelToInsertBefore
-//                                                                                             documentation ```java\nEpoxyModel<?> modelToInsertBefore\n```
+//                                                                                             signature_documentation java EpoxyModel<?> modelToInsertBefore
     super.insertModelBefore(modelToInsert, modelToInsertBefore);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
@@ -154,16 +154,16 @@ public void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelTo
   public void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter().
 //                             display_name insertModelAfter
-//                             documentation ```java\n@Override\npublic void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter)\n```
+//                             signature_documentation java @Override\npublic void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter)
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^^^^^ definition local 5
 //                                                         display_name modelToInsert
-//                                                         documentation ```java\nEpoxyModel<?> modelToInsert\n```
+//                                                         signature_documentation java EpoxyModel<?> modelToInsert
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                        ^^^^^^^^^^^^^^^^^^ definition local 6
 //                                                                                           display_name modelToInsertAfter
-//                                                                                           documentation ```java\nEpoxyModel<?> modelToInsertAfter\n```
+//                                                                                           signature_documentation java EpoxyModel<?> modelToInsertAfter
     super.insertModelAfter(modelToInsert, modelToInsertAfter);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
@@ -176,12 +176,12 @@ public void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToI
   public void removeModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel().
 //                        display_name removeModel
-//                        documentation ```java\n@Override\npublic void removeModel(EpoxyModel<?> model)\n```
+//                        signature_documentation java @Override\npublic void removeModel(EpoxyModel<?> model)
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^ definition local 7
 //                                            display_name model
-//                                            documentation ```java\nEpoxyModel<?> model\n```
+//                                            signature_documentation java EpoxyModel<?> model
     super.removeModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
@@ -193,7 +193,7 @@ public void removeModel(EpoxyModel<?> model) {
   public void removeAllModels() {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllModels().
 //                            display_name removeAllModels
-//                            documentation ```java\n@Override\npublic void removeAllModels()\n```
+//                            signature_documentation java @Override\npublic void removeAllModels()
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllModels().
     super.removeAllModels();
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -205,12 +205,12 @@ public void removeAllModels() {
   public void removeAllAfterModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel().
 //                                display_name removeAllAfterModel
-//                                documentation ```java\n@Override\npublic void removeAllAfterModel(EpoxyModel<?> model)\n```
+//                                signature_documentation java @Override\npublic void removeAllAfterModel(EpoxyModel<?> model)
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 8
 //                                                    display_name model
-//                                                    documentation ```java\nEpoxyModel<?> model\n```
+//                                                    signature_documentation java EpoxyModel<?> model
     super.removeAllAfterModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
@@ -222,15 +222,15 @@ public void removeAllAfterModel(EpoxyModel<?> model) {
   public void showModel(EpoxyModel<?> model, boolean show) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel().
 //                      display_name showModel
-//                      documentation ```java\n@Override\npublic void showModel(EpoxyModel<?> model, boolean show)\n```
+//                      signature_documentation java @Override\npublic void showModel(EpoxyModel<?> model, boolean show)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 9
 //                                          display_name model
-//                                          documentation ```java\nEpoxyModel<?> model\n```
+//                                          signature_documentation java EpoxyModel<?> model
 //                                                   ^^^^ definition local 10
 //                                                        display_name show
-//                                                        documentation ```java\nboolean show\n```
+//                                                        signature_documentation java boolean show
     super.showModel(model, show);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
@@ -243,12 +243,12 @@ public void showModel(EpoxyModel<?> model, boolean show) {
   public void showModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1).
 //                      display_name showModel
-//                      documentation ```java\n@Override\npublic void showModel(EpoxyModel<?> model)\n```
+//                      signature_documentation java @Override\npublic void showModel(EpoxyModel<?> model)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 11
 //                                          display_name model
-//                                          documentation ```java\nEpoxyModel<?> model\n```
+//                                          signature_documentation java EpoxyModel<?> model
     super.showModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
@@ -260,12 +260,12 @@ public void showModel(EpoxyModel<?> model) {
   public void showModels(EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels().
 //                       display_name showModels
-//                       documentation ```java\n@Override\npublic void showModels(EpoxyModel<?>[] models)\n```
+//                       signature_documentation java @Override\npublic void showModels(EpoxyModel<?>[] models)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^ definition local 12
 //                                               display_name models
-//                                               documentation ```java\nEpoxyModel<?>[] models\n```
+//                                               signature_documentation java EpoxyModel<?>[] models
     super.showModels(models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
@@ -277,15 +277,15 @@ public void showModels(EpoxyModel<?>... models) {
   public void showModels(boolean show, EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1).
 //                       display_name showModels
-//                       documentation ```java\n@Override\npublic void showModels(boolean show, EpoxyModel<?>[] models)\n```
+//                       signature_documentation java @Override\npublic void showModels(boolean show, EpoxyModel<?>[] models)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
 //                               ^^^^ definition local 13
 //                                    display_name show
-//                                    documentation ```java\nboolean show\n```
+//                                    signature_documentation java boolean show
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                      ^^^^^^ definition local 14
 //                                                             display_name models
-//                                                             documentation ```java\nEpoxyModel<?>[] models\n```
+//                                                             signature_documentation java EpoxyModel<?>[] models
     super.showModels(show, models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
@@ -298,13 +298,13 @@ public void showModels(boolean show, EpoxyModel<?>... models) {
   public void showModels(Iterable<EpoxyModel<?>> epoxyModels) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2).
 //                       display_name showModels
-//                       documentation ```java\n@Override\npublic void showModels(Iterable<EpoxyModel<?>> epoxyModels)\n```
+//                       signature_documentation java @Override\npublic void showModels(Iterable<EpoxyModel<?>> epoxyModels)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^ definition local 15
 //                                                           display_name epoxyModels
-//                                                           documentation ```java\nIterable<EpoxyModel<?>> epoxyModels\n```
+//                                                           signature_documentation java Iterable<EpoxyModel<?>> epoxyModels
     super.showModels(epoxyModels);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
@@ -316,16 +316,16 @@ public void showModels(Iterable<EpoxyModel<?>> epoxyModels) {
   public void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3).
 //                       display_name showModels
-//                       documentation ```java\n@Override\npublic void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show)\n```
+//                       signature_documentation java @Override\npublic void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^ definition local 16
 //                                                           display_name epoxyModels
-//                                                           documentation ```java\nIterable<EpoxyModel<?>> epoxyModels\n```
+//                                                           signature_documentation java Iterable<EpoxyModel<?>> epoxyModels
 //                                                                    ^^^^ definition local 17
 //                                                                         display_name show
-//                                                                         documentation ```java\nboolean show\n```
+//                                                                         signature_documentation java boolean show
     super.showModels(epoxyModels, show);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
@@ -338,12 +338,12 @@ public void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show) {
   public void hideModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel().
 //                      display_name hideModel
-//                      documentation ```java\n@Override\npublic void hideModel(EpoxyModel<?> model)\n```
+//                      signature_documentation java @Override\npublic void hideModel(EpoxyModel<?> model)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 18
 //                                          display_name model
-//                                          documentation ```java\nEpoxyModel<?> model\n```
+//                                          signature_documentation java EpoxyModel<?> model
     super.hideModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
@@ -355,13 +355,13 @@ public void hideModel(EpoxyModel<?> model) {
   public void hideModels(Iterable<EpoxyModel<?>> epoxyModels) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels().
 //                       display_name hideModels
-//                       documentation ```java\n@Override\npublic void hideModels(Iterable<EpoxyModel<?>> epoxyModels)\n```
+//                       signature_documentation java @Override\npublic void hideModels(Iterable<EpoxyModel<?>> epoxyModels)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^^^^^^^ definition local 19
 //                                                           display_name epoxyModels
-//                                                           documentation ```java\nIterable<EpoxyModel<?>> epoxyModels\n```
+//                                                           signature_documentation java Iterable<EpoxyModel<?>> epoxyModels
     super.hideModels(epoxyModels);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
@@ -373,12 +373,12 @@ public void hideModels(Iterable<EpoxyModel<?>> epoxyModels) {
   public void hideModels(EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1).
 //                       display_name hideModels
-//                       documentation ```java\n@Override\npublic void hideModels(EpoxyModel<?>[] models)\n```
+//                       signature_documentation java @Override\npublic void hideModels(EpoxyModel<?>[] models)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^ definition local 20
 //                                               display_name models
-//                                               documentation ```java\nEpoxyModel<?>[] models\n```
+//                                               signature_documentation java EpoxyModel<?>[] models
     super.hideModels(models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
@@ -390,12 +390,12 @@ public void hideModels(EpoxyModel<?>... models) {
   public void hideAllAfterModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel().
 //                              display_name hideAllAfterModel
-//                              documentation ```java\n@Override\npublic void hideAllAfterModel(EpoxyModel<?> model)\n```
+//                              signature_documentation java @Override\npublic void hideAllAfterModel(EpoxyModel<?> model)
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^ definition local 21
 //                                                  display_name model
-//                                                  documentation ```java\nEpoxyModel<?> model\n```
+//                                                  signature_documentation java EpoxyModel<?> model
     super.hideAllAfterModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
@@ -409,12 +409,12 @@ public List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter().
 //                                             display_name getAllModelsAfter
-//                                             documentation ```java\n@Override\npublic List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model)\n```
+//                                             signature_documentation java @Override\npublic List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model)
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 22
 //                                                                 display_name model
-//                                                                 documentation ```java\nEpoxyModel<?> model\n```
+//                                                                 signature_documentation java EpoxyModel<?> model
     return super.getAllModelsAfter(model);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
@@ -426,12 +426,12 @@ public List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
   public int getModelPosition(EpoxyModel<?> model) {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition().
 //                            display_name getModelPosition
-//                            documentation ```java\n@Override\npublic int getModelPosition(EpoxyModel<?> model)\n```
+//                            signature_documentation java @Override\npublic int getModelPosition(EpoxyModel<?> model)
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^ definition local 23
 //                                                display_name model
-//                                                documentation ```java\nEpoxyModel<?> model\n```
+//                                                signature_documentation java EpoxyModel<?> model
     return super.getModelPosition(model);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //               ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
index 84dc4185c..754106881 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
@@ -12,25 +12,25 @@
 public class SimpleEpoxyController extends EpoxyController {
 //           ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#
 //                                 display_name SimpleEpoxyController
-//                                 documentation ```java\npublic class SimpleEpoxyController\n```
+//                                 signature_documentation java public class SimpleEpoxyController
 //                                 documentation  A small wrapper around {@link com.airbnb.epoxy.EpoxyController} that lets you set a list of\n models directly.\n
 //                                 relationship is_implementation semanticdb maven . . ModelCollector#
 //                                 relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                 relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //           ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#`<init>`().
 //                                 display_name <init>
-//                                 documentation ```java\npublic SimpleEpoxyController()\n```
+//                                 signature_documentation java public SimpleEpoxyController()
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   private List<? extends EpoxyModel<?>> currentModels;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#currentModels.
 //                                                    display_name currentModels
-//                                                    documentation ```java\nprivate List<? extends EpoxyModel<?>> currentModels\n```
+//                                                    signature_documentation java private List<? extends EpoxyModel<?>> currentModels
   private boolean insideSetModels;
 //                ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#insideSetModels.
 //                                display_name insideSetModels
-//                                documentation ```java\nprivate boolean insideSetModels\n```
+//                                signature_documentation java private boolean insideSetModels
 
   /**
    * Set the models to add to this controller. Clears any previous models and adds this new list
@@ -39,13 +39,13 @@ public class SimpleEpoxyController extends EpoxyController {
   public void setModels(List<? extends EpoxyModel<?>> models) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#setModels().
 //                      display_name setModels
-//                      documentation ```java\npublic void setModels(List<? extends EpoxyModel<?>> models)\n```
+//                      signature_documentation java public void setModels(List<? extends EpoxyModel<?>> models)
 //                      documentation  Set the models to add to this controller. Clears any previous models and adds this new list\n .\n
 //                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                    ^^^^^^ definition local 0
 //                                                           display_name models
-//                                                           documentation ```java\nList<? extends EpoxyModel<?>> models\n```
+//                                                           signature_documentation java List<? extends EpoxyModel<?>> models
     currentModels = models;
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#currentModels.
 //                  ^^^^^^ reference local 0
@@ -62,7 +62,7 @@ public void setModels(List<? extends EpoxyModel<?>> models) {
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
-//                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
+//                                    signature_documentation java @Override\npublic final void requestModelBuild()
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!insideSetModels) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#insideSetModels.
@@ -80,7 +80,7 @@ public final void requestModelBuild() {
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#buildModels().
 //                                 display_name buildModels
-//                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
+//                                 signature_documentation java @Override\nprotected final void buildModels()
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
index a0010ce77..47628cb17 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
@@ -27,7 +27,7 @@
 public class SimpleEpoxyModel extends EpoxyModel<View> {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                            display_name SimpleEpoxyModel
-//                            documentation ```java\npublic class SimpleEpoxyModel\n```
+//                            signature_documentation java public class SimpleEpoxyModel
 //                            documentation  Helper class for cases where you don't need to do anything special when binding the view. This\n allows you to just provide the layout instead of needing to create a separate {@link EpoxyModel}\n subclass. This is useful for static layouts. You can also specify an onClick listener and the\n span size.\n
 //                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -36,26 +36,26 @@ public class SimpleEpoxyModel extends EpoxyModel<View> {
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#layoutRes.
 //                                       display_name layoutRes
-//                                       documentation ```java\n@LayoutRes\nprivate final int layoutRes\n```
+//                                       signature_documentation java @LayoutRes\nprivate final int layoutRes
   private View.OnClickListener onClickListener;
 //        ^^^^ reference semanticdb maven . . View/
 //             ^^^^^^^^^^^^^^^ reference semanticdb maven . . View/OnClickListener#
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClickListener.
 //                                             display_name onClickListener
-//                                             documentation ```java\nprivate unresolved_type onClickListener\n```
+//                                             signature_documentation java private unresolved_type onClickListener
   private int spanCount = 1;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
 //                      display_name spanCount
-//                      documentation ```java\nprivate int spanCount\n```
+//                      signature_documentation java private int spanCount
 
   public SimpleEpoxyModel(@LayoutRes int layoutRes) {
 //       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#`<init>`().
 //                        display_name <init>
-//                        documentation ```java\npublic SimpleEpoxyModel(int layoutRes)\n```
+//                        signature_documentation java public SimpleEpoxyModel(int layoutRes)
 //                         ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                       ^^^^^^^^^ definition local 0
 //                                                 display_name layoutRes
-//                                                 documentation ```java\n@LayoutRes\nint layoutRes\n```
+//                                                 signature_documentation java @LayoutRes\nint layoutRes
     this.layoutRes = layoutRes;
 //       ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#layoutRes.
 //                   ^^^^^^^^^ reference local 0
@@ -65,12 +65,12 @@ public SimpleEpoxyModel onClick(View.OnClickListener listener) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClick().
 //                                display_name onClick
-//                                documentation ```java\npublic SimpleEpoxyModel onClick(unresolved_type listener)\n```
+//                                signature_documentation java public SimpleEpoxyModel onClick(unresolved_type listener)
 //                                ^^^^ reference semanticdb maven . . View/
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . View/OnClickListener#
 //                                                     ^^^^^^^^ definition local 1
 //                                                              display_name listener
-//                                                              documentation ```java\nunresolved_type listener\n```
+//                                                              signature_documentation java unresolved_type listener
     this.onClickListener = listener;
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClickListener.
 //                         ^^^^^^^^ reference local 1
@@ -81,10 +81,10 @@ public SimpleEpoxyModel span(int span) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                        ^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#span().
 //                             display_name span
-//                             documentation ```java\npublic SimpleEpoxyModel span(int span)\n```
+//                             signature_documentation java public SimpleEpoxyModel span(int span)
 //                                 ^^^^ definition local 2
 //                                      display_name span
-//                                      documentation ```java\nint span\n```
+//                                      signature_documentation java int span
     spanCount = span;
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
 //              ^^^^ reference local 2
@@ -98,13 +98,13 @@ public SimpleEpoxyModel span(int span) {
   public void bind(@NonNull View view) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#bind().
 //                 display_name bind
-//                 documentation ```java\n@CallSuper\n@Override\npublic void bind(unresolved_type view)\n```
+//                 signature_documentation java @CallSuper\n@Override\npublic void bind(unresolved_type view)
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^ reference semanticdb maven . . View#
 //                               ^^^^ definition local 3
 //                                    display_name view
-//                                    documentation ```java\n@NonNull\nunresolved_type view\n```
+//                                    signature_documentation java @NonNull\nunresolved_type view
     super.bind(view);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
 //        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
@@ -126,13 +126,13 @@ public void bind(@NonNull View view) {
   public void unbind(@NonNull View view) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#unbind().
 //                   display_name unbind
-//                   documentation ```java\n@CallSuper\n@Override\npublic void unbind(unresolved_type view)\n```
+//                   signature_documentation java @CallSuper\n@Override\npublic void unbind(unresolved_type view)
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^ reference semanticdb maven . . View#
 //                                 ^^^^ definition local 4
 //                                      display_name view
-//                                      documentation ```java\n@NonNull\nunresolved_type view\n```
+//                                      signature_documentation java @NonNull\nunresolved_type view
     super.unbind(view);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
 //        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
@@ -147,7 +147,7 @@ public void unbind(@NonNull View view) {
   protected int getDefaultLayout() {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getDefaultLayout().
 //                               display_name getDefaultLayout
-//                               documentation ```java\n@Override\nprotected int getDefaultLayout()\n```
+//                               signature_documentation java @Override\nprotected int getDefaultLayout()
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     return layoutRes;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#layoutRes.
@@ -158,17 +158,17 @@ protected int getDefaultLayout() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize().
 //                       display_name getSpanSize
-//                       documentation ```java\n@Override\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)\n```
+//                       signature_documentation java @Override\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^^^^^^ definition local 5
 //                                          display_name totalSpanCount
-//                                          documentation ```java\nint totalSpanCount\n```
+//                                          signature_documentation java int totalSpanCount
 //                                               ^^^^^^^^ definition local 6
 //                                                        display_name position
-//                                                        documentation ```java\nint position\n```
+//                                                        signature_documentation java int position
 //                                                             ^^^^^^^^^ definition local 7
 //                                                                       display_name itemCount
-//                                                                       documentation ```java\nint itemCount\n```
+//                                                                       signature_documentation java int itemCount
     return spanCount;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
   }
@@ -178,13 +178,13 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
 //                      display_name equals
-//                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
+//                      signature_documentation java @Override\npublic boolean equals(Object o)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 8
 //                               display_name o
-//                               documentation ```java\nObject o\n```
+//                               signature_documentation java Object o
     if (this == o) {
 //              ^ reference local 8
       return true;
@@ -205,7 +205,7 @@ public boolean equals(Object o) {
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                   ^^^^ definition local 9
 //                        display_name that
-//                        documentation ```java\nSimpleEpoxyModel that\n```
+//                        signature_documentation java SimpleEpoxyModel that
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                                             ^ reference local 8
 
@@ -237,13 +237,13 @@ public boolean equals(Object o) {
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#hashCode().
 //                    display_name hashCode
-//                    documentation ```java\n@Override\npublic int hashCode()\n```
+//                    signature_documentation java @Override\npublic int hashCode()
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = super.hashCode();
 //      ^^^^^^ definition local 10
 //             display_name result
-//             documentation ```java\nint result\n```
+//             signature_documentation java int result
 //               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
     result = 31 * result + layoutRes;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
index b864fd0c4..96f483814 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
@@ -26,54 +26,54 @@
 public class StringAttributeData {
 //           ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
 //                               display_name StringAttributeData
-//                               documentation ```java\npublic class StringAttributeData\n```
+//                               signature_documentation java public class StringAttributeData
   private final boolean hasDefault;
 //                      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
 //                                 display_name hasDefault
-//                                 documentation ```java\nprivate final boolean hasDefault\n```
+//                                 signature_documentation java private final boolean hasDefault
   @Nullable private final CharSequence defaultString;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#defaultString.
 //                                                   display_name defaultString
-//                                                   documentation ```java\n@Nullable\nprivate final CharSequence defaultString\n```
+//                                                   signature_documentation java @Nullable\nprivate final CharSequence defaultString
   @StringRes private final int defaultStringRes;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#defaultStringRes.
 //                                              display_name defaultStringRes
-//                                              documentation ```java\n@StringRes\nprivate final int defaultStringRes\n```
+//                                              signature_documentation java @StringRes\nprivate final int defaultStringRes
 
   @Nullable private CharSequence string;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                      display_name string
-//                                      documentation ```java\n@Nullable\nprivate CharSequence string\n```
+//                                      signature_documentation java @Nullable\nprivate CharSequence string
   @StringRes private int stringRes;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#stringRes.
 //                                 display_name stringRes
-//                                 documentation ```java\n@StringRes\nprivate int stringRes\n```
+//                                 signature_documentation java @StringRes\nprivate int stringRes
   @PluralsRes private int pluralRes;
 // ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                        ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#pluralRes.
 //                                  display_name pluralRes
-//                                  documentation ```java\n@PluralsRes\nprivate int pluralRes\n```
+//                                  signature_documentation java @PluralsRes\nprivate int pluralRes
   private int quantity;
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#quantity.
 //                     display_name quantity
-//                     documentation ```java\nprivate int quantity\n```
+//                     signature_documentation java private int quantity
   @Nullable private Object[] formatArgs;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                           ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#formatArgs.
 //                                      display_name formatArgs
-//                                      documentation ```java\n@Nullable\nprivate Object[] formatArgs\n```
+//                                      signature_documentation java @Nullable\nprivate Object[] formatArgs
 
   public StringAttributeData() {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`().
 //                           display_name <init>
-//                           documentation ```java\npublic StringAttributeData()\n```
+//                           signature_documentation java public StringAttributeData()
     hasDefault = false;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
     defaultString = null;
@@ -85,12 +85,12 @@ public StringAttributeData() {
   public StringAttributeData(@Nullable CharSequence defaultString) {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`(+1).
 //                           display_name <init>
-//                           documentation ```java\npublic StringAttributeData(CharSequence defaultString)\n```
+//                           signature_documentation java public StringAttributeData(CharSequence defaultString)
 //                            ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                  ^^^^^^^^^^^^^ definition local 0
 //                                                                display_name defaultString
-//                                                                documentation ```java\n@Nullable\nCharSequence defaultString\n```
+//                                                                signature_documentation java @Nullable\nCharSequence defaultString
     hasDefault = true;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
     this.defaultString = defaultString;
@@ -106,11 +106,11 @@ public StringAttributeData(@Nullable CharSequence defaultString) {
   public StringAttributeData(@StringRes int defaultStringRes) {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`(+2).
 //                           display_name <init>
-//                           documentation ```java\npublic StringAttributeData(int defaultStringRes)\n```
+//                           signature_documentation java public StringAttributeData(int defaultStringRes)
 //                            ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                          ^^^^^^^^^^^^^^^^ definition local 1
 //                                                           display_name defaultStringRes
-//                                                           documentation ```java\n@StringRes\nint defaultStringRes\n```
+//                                                           signature_documentation java @StringRes\nint defaultStringRes
     hasDefault = true;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
     this.defaultStringRes = defaultStringRes;
@@ -126,12 +126,12 @@ public StringAttributeData(@StringRes int defaultStringRes) {
   public void setValue(@Nullable CharSequence string) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue().
 //                     display_name setValue
-//                     documentation ```java\npublic void setValue(CharSequence string)\n```
+//                     signature_documentation java public void setValue(CharSequence string)
 //                      ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^ definition local 2
 //                                                   display_name string
-//                                                   documentation ```java\n@Nullable\nCharSequence string\n```
+//                                                   signature_documentation java @Nullable\nCharSequence string
     this.string = string;
 //       ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                ^^^^^^ reference local 2
@@ -144,11 +144,11 @@ public void setValue(@Nullable CharSequence string) {
   public void setValue(@StringRes int stringRes) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+1).
 //                     display_name setValue
-//                     documentation ```java\npublic void setValue(int stringRes)\n```
+//                     signature_documentation java public void setValue(int stringRes)
 //                      ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                    ^^^^^^^^^ definition local 3
 //                                              display_name stringRes
-//                                              documentation ```java\n@StringRes\nint stringRes\n```
+//                                              signature_documentation java @StringRes\nint stringRes
     setValue(stringRes, null);
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+2).
 //           ^^^^^^^^^ reference local 3
@@ -157,16 +157,16 @@ public void setValue(@StringRes int stringRes) {
   public void setValue(@StringRes int stringRes, @Nullable Object[] formatArgs) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+2).
 //                     display_name setValue
-//                     documentation ```java\npublic void setValue(int stringRes, Object[] formatArgs)\n```
+//                     signature_documentation java public void setValue(int stringRes, Object[] formatArgs)
 //                      ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                    ^^^^^^^^^ definition local 4
 //                                              display_name stringRes
-//                                              documentation ```java\n@StringRes\nint stringRes\n```
+//                                              signature_documentation java @StringRes\nint stringRes
 //                                                ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                  ^^^^^^^^^^ definition local 5
 //                                                                             display_name formatArgs
-//                                                                             documentation ```java\n@Nullable\nObject[] formatArgs\n```
+//                                                                             signature_documentation java @Nullable\nObject[] formatArgs
     if (stringRes != 0) {
 //      ^^^^^^^^^ reference local 4
       this.stringRes = stringRes;
@@ -188,7 +188,7 @@ public void setValue(@StringRes int stringRes, @Nullable Object[] formatArgs) {
   private void handleInvalidStringRes() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#handleInvalidStringRes().
 //                                    display_name handleInvalidStringRes
-//                                    documentation ```java\nprivate void handleInvalidStringRes()\n```
+//                                    signature_documentation java private void handleInvalidStringRes()
     if (hasDefault) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
       if (defaultStringRes != 0) {
@@ -210,19 +210,19 @@ private void handleInvalidStringRes() {
   public void setValue(@PluralsRes int pluralRes, int quantity, @Nullable Object[] formatArgs) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+3).
 //                     display_name setValue
-//                     documentation ```java\npublic void setValue(int pluralRes, int quantity, Object[] formatArgs)\n```
+//                     signature_documentation java public void setValue(int pluralRes, int quantity, Object[] formatArgs)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                                     ^^^^^^^^^ definition local 6
 //                                               display_name pluralRes
-//                                               documentation ```java\n@PluralsRes\nint pluralRes\n```
+//                                               signature_documentation java @PluralsRes\nint pluralRes
 //                                                    ^^^^^^^^ definition local 7
 //                                                             display_name quantity
-//                                                             documentation ```java\nint quantity\n```
+//                                                             signature_documentation java int quantity
 //                                                               ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                 ^^^^^^^^^^ definition local 8
 //                                                                                            display_name formatArgs
-//                                                                                            documentation ```java\n@Nullable\nObject[] formatArgs\n```
+//                                                                                            signature_documentation java @Nullable\nObject[] formatArgs
     if (pluralRes != 0) {
 //      ^^^^^^^^^ reference local 6
       this.pluralRes = pluralRes;
@@ -248,11 +248,11 @@ public CharSequence toString(Context context) {
 //       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#toString().
 //                             display_name toString
-//                             documentation ```java\npublic CharSequence toString(unresolved_type context)\n```
+//                             signature_documentation java public CharSequence toString(unresolved_type context)
 //                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                     ^^^^^^^ definition local 9
 //                                             display_name context
-//                                             documentation ```java\nunresolved_type context\n```
+//                                             signature_documentation java unresolved_type context
     if (pluralRes != 0) {
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#pluralRes.
       if (formatArgs != null) {
@@ -300,12 +300,12 @@ public CharSequence toString(Context context) {
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#equals().
 //                      display_name equals
-//                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
+//                      signature_documentation java @Override\npublic boolean equals(Object o)
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 10
 //                               display_name o
-//                               documentation ```java\nObject o\n```
+//                               signature_documentation java Object o
     if (this == o) {
 //              ^ reference local 10
       return true;
@@ -320,7 +320,7 @@ public boolean equals(Object o) {
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
 //                      ^^^^ definition local 11
 //                           display_name that
-//                           documentation ```java\nStringAttributeData that\n```
+//                           signature_documentation java StringAttributeData that
 //                              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
 //                                                   ^ reference local 10
 
@@ -366,12 +366,12 @@ public boolean equals(Object o) {
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hashCode().
 //                    display_name hashCode
-//                    documentation ```java\n@Override\npublic int hashCode()\n```
+//                    signature_documentation java @Override\npublic int hashCode()
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = string != null ? string.hashCode() : 0;
 //      ^^^^^^ definition local 12
 //             display_name result
-//             documentation ```java\nint result\n```
+//             signature_documentation java int result
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#hashCode().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
index ead8eb5cc..32c40b668 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
@@ -7,17 +7,17 @@
 public interface StyleBuilderCallback<T> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#
 //                                    display_name StyleBuilderCallback
-//                                    documentation ```java\npublic interface StyleBuilderCallback<T>\n```
+//                                    signature_documentation java public interface StyleBuilderCallback<T>
 //                                    documentation  Used for specifying dynamic styling for a view when creating a model. This is only used if the\n view is set up to be styled with the Paris library.\n
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#[T]
 //                                      display_name T
-//                                      documentation ```java\nT\n```
+//                                      signature_documentation java T
   void buildStyle(T builder);
 //     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#buildStyle().
 //                display_name buildStyle
-//                documentation ```java\npublic abstract void buildStyle(T builder)\n```
+//                signature_documentation java public abstract void buildStyle(T builder)
 //                ^ reference semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#[T]
 //                  ^^^^^^^ definition local 0
 //                          display_name builder
-//                          documentation ```java\nT builder\n```
+//                          signature_documentation java T builder
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
index 10927764e..d4799bb0b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
@@ -3,21 +3,21 @@
 interface Timer {
 //        ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#
 //              display_name Timer
-//              documentation ```java\ninterface Timer\n```
+//              signature_documentation java interface Timer
   void start(String sectionName);
 //     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#start().
 //           display_name start
-//           documentation ```java\npublic abstract void start(String sectionName)\n```
+//           signature_documentation java public abstract void start(String sectionName)
 //           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/DebugTimer#start().
 //           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpTimer#start().
 //           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                  ^^^^^^^^^^^ definition local 0
 //                              display_name sectionName
-//                              documentation ```java\nString sectionName\n```
+//                              signature_documentation java String sectionName
   void stop();
 //     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#stop().
 //          display_name stop
-//          documentation ```java\npublic abstract void stop()\n```
+//          signature_documentation java public abstract void stop()
 //          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/DebugTimer#stop().
 //          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpTimer#stop().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
index 07eb185c6..78d5f5c65 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
@@ -22,52 +22,52 @@
 public abstract class Typed2EpoxyController<T, U> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#
 //                                          display_name Typed2EpoxyController
-//                                          documentation ```java\npublic abstract class Typed2EpoxyController<T, U>\n```
+//                                          signature_documentation java public abstract class Typed2EpoxyController<T, U>
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by two objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed3EpoxyController\n @see Typed4EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                          relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //                                            display_name T
-//                                            documentation ```java\nT\n```
+//                                            signature_documentation java T
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //                                               display_name U
-//                                               documentation ```java\nU\n```
+//                                               signature_documentation java U
 //                                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data1.
 //                display_name data1
-//                documentation ```java\nprivate T data1\n```
+//                signature_documentation java private T data1
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data2.
 //                display_name data2
-//                documentation ```java\nprivate U data2\n```
+//                signature_documentation java private U data2
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
 //                                        display_name allowModelBuildRequests
-//                                        documentation ```java\nprivate boolean allowModelBuildRequests\n```
+//                                        signature_documentation java private boolean allowModelBuildRequests
 
   public Typed2EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#`<init>`().
 //                             display_name <init>
-//                             documentation ```java\npublic Typed2EpoxyController()\n```
+//                             signature_documentation java public Typed2EpoxyController()
   }
 
   public Typed2EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#`<init>`(+1).
 //                             display_name <init>
-//                             documentation ```java\npublic Typed2EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
+//                             signature_documentation java public Typed2EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
-//                                                          documentation ```java\nunresolved_type modelBuildingHandler\n```
+//                                                          signature_documentation java unresolved_type modelBuildingHandler
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
 //                                                                                  display_name diffingHandler
-//                                                                                  documentation ```java\nunresolved_type diffingHandler\n```
+//                                                                                  signature_documentation java unresolved_type diffingHandler
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 0
@@ -81,16 +81,16 @@ public Typed2EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
   public void setData(T data1, U data2) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#setData().
 //                    display_name setData
-//                    documentation ```java\npublic void setData(T data1, U data2)\n```
+//                    signature_documentation java public void setData(T data1, U data2)
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //                      ^^^^^ definition local 2
 //                            display_name data1
-//                            documentation ```java\nT data1\n```
+//                            signature_documentation java T data1
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //                               ^^^^^ definition local 3
 //                                     display_name data2
-//                                     documentation ```java\nU data2\n```
+//                                     signature_documentation java U data2
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data1.
 //               ^^^^^ reference local 2
@@ -110,7 +110,7 @@ public void setData(T data1, U data2) {
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
-//                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
+//                                    signature_documentation java @Override\npublic final void requestModelBuild()
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
@@ -129,14 +129,14 @@ public final void requestModelBuild() {
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#moveModel().
 //                      display_name moveModel
-//                      documentation ```java\n@Override\npublic void moveModel(int fromPosition, int toPosition)\n```
+//                      signature_documentation java @Override\npublic void moveModel(int fromPosition, int toPosition)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 4
 //                                       display_name fromPosition
-//                                       documentation ```java\nint fromPosition\n```
+//                                       signature_documentation java int fromPosition
 //                                            ^^^^^^^^^^ definition local 5
 //                                                       display_name toPosition
-//                                                       documentation ```java\nint toPosition\n```
+//                                                       signature_documentation java int toPosition
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
     super.moveModel(fromPosition, toPosition);
@@ -153,11 +153,11 @@ public void moveModel(int fromPosition, int toPosition) {
   public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild().
 //                                     display_name requestDelayedModelBuild
-//                                     documentation ```java\n@Override\npublic void requestDelayedModelBuild(int delayMs)\n```
+//                                     signature_documentation java @Override\npublic void requestDelayedModelBuild(int delayMs)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 6
 //                                                 display_name delayMs
-//                                                 documentation ```java\nint delayMs\n```
+//                                                 signature_documentation java int delayMs
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
       throw new IllegalStateException(
@@ -176,7 +176,7 @@ public void requestDelayedModelBuild(int delayMs) {
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels().
 //                                 display_name buildModels
-//                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
+//                                 signature_documentation java @Override\nprotected final void buildModels()
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -194,13 +194,13 @@ protected final void buildModels() {
   protected abstract void buildModels(T data1, U data2);
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels(+1).
 //                                    display_name buildModels
-//                                    documentation ```java\nprotected abstract void buildModels(T data1, U data2)\n```
+//                                    signature_documentation java protected abstract void buildModels(T data1, U data2)
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //                                      ^^^^^ definition local 7
 //                                            display_name data1
-//                                            documentation ```java\nT data1\n```
+//                                            signature_documentation java T data1
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //                                               ^^^^^ definition local 8
 //                                                     display_name data2
-//                                                     documentation ```java\nU data2\n```
+//                                                     signature_documentation java U data2
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
index 6e206df77..7ceb95dcb 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
@@ -22,60 +22,60 @@
 public abstract class Typed3EpoxyController<T, U, V> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#
 //                                          display_name Typed3EpoxyController
-//                                          documentation ```java\npublic abstract class Typed3EpoxyController<T, U, V>\n```
+//                                          signature_documentation java public abstract class Typed3EpoxyController<T, U, V>
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by three objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed2EpoxyController\n @see Typed4EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                          relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //                                            display_name T
-//                                            documentation ```java\nT\n```
+//                                            signature_documentation java T
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //                                               display_name U
-//                                               documentation ```java\nU\n```
+//                                               signature_documentation java U
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //                                                  display_name V
-//                                                  documentation ```java\nV\n```
+//                                                  signature_documentation java V
 //                                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data1.
 //                display_name data1
-//                documentation ```java\nprivate T data1\n```
+//                signature_documentation java private T data1
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data2.
 //                display_name data2
-//                documentation ```java\nprivate U data2\n```
+//                signature_documentation java private U data2
   private V data3;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data3.
 //                display_name data3
-//                documentation ```java\nprivate V data3\n```
+//                signature_documentation java private V data3
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
 //                                        display_name allowModelBuildRequests
-//                                        documentation ```java\nprivate boolean allowModelBuildRequests\n```
+//                                        signature_documentation java private boolean allowModelBuildRequests
 
   public Typed3EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#`<init>`().
 //                             display_name <init>
-//                             documentation ```java\npublic Typed3EpoxyController()\n```
+//                             signature_documentation java public Typed3EpoxyController()
   }
 
   public Typed3EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#`<init>`(+1).
 //                             display_name <init>
-//                             documentation ```java\npublic Typed3EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
+//                             signature_documentation java public Typed3EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
-//                                                          documentation ```java\nunresolved_type modelBuildingHandler\n```
+//                                                          signature_documentation java unresolved_type modelBuildingHandler
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
 //                                                                                  display_name diffingHandler
-//                                                                                  documentation ```java\nunresolved_type diffingHandler\n```
+//                                                                                  signature_documentation java unresolved_type diffingHandler
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 0
@@ -89,20 +89,20 @@ public Typed3EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
   public void setData(T data1, U data2, V data3) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#setData().
 //                    display_name setData
-//                    documentation ```java\npublic void setData(T data1, U data2, V data3)\n```
+//                    signature_documentation java public void setData(T data1, U data2, V data3)
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //                      ^^^^^ definition local 2
 //                            display_name data1
-//                            documentation ```java\nT data1\n```
+//                            signature_documentation java T data1
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //                               ^^^^^ definition local 3
 //                                     display_name data2
-//                                     documentation ```java\nU data2\n```
+//                                     signature_documentation java U data2
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //                                        ^^^^^ definition local 4
 //                                              display_name data3
-//                                              documentation ```java\nV data3\n```
+//                                              signature_documentation java V data3
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data1.
 //               ^^^^^ reference local 2
@@ -125,7 +125,7 @@ public void setData(T data1, U data2, V data3) {
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
-//                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
+//                                    signature_documentation java @Override\npublic final void requestModelBuild()
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
@@ -144,14 +144,14 @@ public final void requestModelBuild() {
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#moveModel().
 //                      display_name moveModel
-//                      documentation ```java\n@Override\npublic void moveModel(int fromPosition, int toPosition)\n```
+//                      signature_documentation java @Override\npublic void moveModel(int fromPosition, int toPosition)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 5
 //                                       display_name fromPosition
-//                                       documentation ```java\nint fromPosition\n```
+//                                       signature_documentation java int fromPosition
 //                                            ^^^^^^^^^^ definition local 6
 //                                                       display_name toPosition
-//                                                       documentation ```java\nint toPosition\n```
+//                                                       signature_documentation java int toPosition
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
     super.moveModel(fromPosition, toPosition);
@@ -168,11 +168,11 @@ public void moveModel(int fromPosition, int toPosition) {
   public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestDelayedModelBuild().
 //                                     display_name requestDelayedModelBuild
-//                                     documentation ```java\n@Override\npublic void requestDelayedModelBuild(int delayMs)\n```
+//                                     signature_documentation java @Override\npublic void requestDelayedModelBuild(int delayMs)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 7
 //                                                 display_name delayMs
-//                                                 documentation ```java\nint delayMs\n```
+//                                                 signature_documentation java int delayMs
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
       throw new IllegalStateException(
@@ -191,7 +191,7 @@ public void requestDelayedModelBuild(int delayMs) {
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels().
 //                                 display_name buildModels
-//                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
+//                                 signature_documentation java @Override\nprotected final void buildModels()
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -210,17 +210,17 @@ protected final void buildModels() {
   protected abstract void buildModels(T data1, U data2, V data3);
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels(+1).
 //                                    display_name buildModels
-//                                    documentation ```java\nprotected abstract void buildModels(T data1, U data2, V data3)\n```
+//                                    signature_documentation java protected abstract void buildModels(T data1, U data2, V data3)
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //                                      ^^^^^ definition local 8
 //                                            display_name data1
-//                                            documentation ```java\nT data1\n```
+//                                            signature_documentation java T data1
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //                                               ^^^^^ definition local 9
 //                                                     display_name data2
-//                                                     documentation ```java\nU data2\n```
+//                                                     signature_documentation java U data2
 //                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //                                                        ^^^^^ definition local 10
 //                                                              display_name data3
-//                                                              documentation ```java\nV data3\n```
+//                                                              signature_documentation java V data3
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
index 3c12c0008..289cae803 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
@@ -22,68 +22,68 @@
 public abstract class Typed4EpoxyController<T, U, V, W> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#
 //                                          display_name Typed4EpoxyController
-//                                          documentation ```java\npublic abstract class Typed4EpoxyController<T, U, V, W>\n```
+//                                          signature_documentation java public abstract class Typed4EpoxyController<T, U, V, W>
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by four objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed2EpoxyController\n @see Typed3EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                          relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //                                            display_name T
-//                                            documentation ```java\nT\n```
+//                                            signature_documentation java T
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //                                               display_name U
-//                                               documentation ```java\nU\n```
+//                                               signature_documentation java U
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //                                                  display_name V
-//                                                  documentation ```java\nV\n```
+//                                                  signature_documentation java V
 //                                                   ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //                                                     display_name W
-//                                                     documentation ```java\nW\n```
+//                                                     signature_documentation java W
 //                                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data1.
 //                display_name data1
-//                documentation ```java\nprivate T data1\n```
+//                signature_documentation java private T data1
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data2.
 //                display_name data2
-//                documentation ```java\nprivate U data2\n```
+//                signature_documentation java private U data2
   private V data3;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data3.
 //                display_name data3
-//                documentation ```java\nprivate V data3\n```
+//                signature_documentation java private V data3
   private W data4;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data4.
 //                display_name data4
-//                documentation ```java\nprivate W data4\n```
+//                signature_documentation java private W data4
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
 //                                        display_name allowModelBuildRequests
-//                                        documentation ```java\nprivate boolean allowModelBuildRequests\n```
+//                                        signature_documentation java private boolean allowModelBuildRequests
 
   public Typed4EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#`<init>`().
 //                             display_name <init>
-//                             documentation ```java\npublic Typed4EpoxyController()\n```
+//                             signature_documentation java public Typed4EpoxyController()
   }
 
   public Typed4EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#`<init>`(+1).
 //                             display_name <init>
-//                             documentation ```java\npublic Typed4EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
+//                             signature_documentation java public Typed4EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
-//                                                          documentation ```java\nunresolved_type modelBuildingHandler\n```
+//                                                          signature_documentation java unresolved_type modelBuildingHandler
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
 //                                                                                  display_name diffingHandler
-//                                                                                  documentation ```java\nunresolved_type diffingHandler\n```
+//                                                                                  signature_documentation java unresolved_type diffingHandler
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 0
@@ -97,24 +97,24 @@ public Typed4EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
   public void setData(T data1, U data2, V data3, W data4) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#setData().
 //                    display_name setData
-//                    documentation ```java\npublic void setData(T data1, U data2, V data3, W data4)\n```
+//                    signature_documentation java public void setData(T data1, U data2, V data3, W data4)
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object, Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //                      ^^^^^ definition local 2
 //                            display_name data1
-//                            documentation ```java\nT data1\n```
+//                            signature_documentation java T data1
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //                               ^^^^^ definition local 3
 //                                     display_name data2
-//                                     documentation ```java\nU data2\n```
+//                                     signature_documentation java U data2
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //                                        ^^^^^ definition local 4
 //                                              display_name data3
-//                                              documentation ```java\nV data3\n```
+//                                              signature_documentation java V data3
 //                                               ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //                                                 ^^^^^ definition local 5
 //                                                       display_name data4
-//                                                       documentation ```java\nW data4\n```
+//                                                       signature_documentation java W data4
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data1.
 //               ^^^^^ reference local 2
@@ -140,7 +140,7 @@ public void setData(T data1, U data2, V data3, W data4) {
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
-//                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
+//                                    signature_documentation java @Override\npublic final void requestModelBuild()
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
@@ -159,14 +159,14 @@ public final void requestModelBuild() {
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#moveModel().
 //                      display_name moveModel
-//                      documentation ```java\n@Override\npublic void moveModel(int fromPosition, int toPosition)\n```
+//                      signature_documentation java @Override\npublic void moveModel(int fromPosition, int toPosition)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 6
 //                                       display_name fromPosition
-//                                       documentation ```java\nint fromPosition\n```
+//                                       signature_documentation java int fromPosition
 //                                            ^^^^^^^^^^ definition local 7
 //                                                       display_name toPosition
-//                                                       documentation ```java\nint toPosition\n```
+//                                                       signature_documentation java int toPosition
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
     super.moveModel(fromPosition, toPosition);
@@ -183,11 +183,11 @@ public void moveModel(int fromPosition, int toPosition) {
   public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#requestDelayedModelBuild().
 //                                     display_name requestDelayedModelBuild
-//                                     documentation ```java\n@Override\npublic void requestDelayedModelBuild(int delayMs)\n```
+//                                     signature_documentation java @Override\npublic void requestDelayedModelBuild(int delayMs)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 8
 //                                                 display_name delayMs
-//                                                 documentation ```java\nint delayMs\n```
+//                                                 signature_documentation java int delayMs
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
       throw new IllegalStateException(
@@ -206,7 +206,7 @@ public void requestDelayedModelBuild(int delayMs) {
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels().
 //                                 display_name buildModels
-//                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
+//                                 signature_documentation java @Override\nprotected final void buildModels()
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -226,22 +226,22 @@ protected final void buildModels() {
   protected abstract void buildModels(T data1, U data2, V data3, W data4);
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels(+1).
 //                                    display_name buildModels
-//                                    documentation ```java\nprotected abstract void buildModels(T data1, U data2, V data3, W data4)\n```
+//                                    signature_documentation java protected abstract void buildModels(T data1, U data2, V data3, W data4)
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //                                      ^^^^^ definition local 9
 //                                            display_name data1
-//                                            documentation ```java\nT data1\n```
+//                                            signature_documentation java T data1
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //                                               ^^^^^ definition local 10
 //                                                     display_name data2
-//                                                     documentation ```java\nU data2\n```
+//                                                     signature_documentation java U data2
 //                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //                                                        ^^^^^ definition local 11
 //                                                              display_name data3
-//                                                              documentation ```java\nV data3\n```
+//                                                              signature_documentation java V data3
 //                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //                                                                 ^^^^^ definition local 12
 //                                                                       display_name data4
-//                                                                       documentation ```java\nW data4\n```
+//                                                                       signature_documentation java W data4
 }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
index fe27d8f4c..c62d4774d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
@@ -26,43 +26,43 @@
 public abstract class TypedEpoxyController<T> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#
 //                                         display_name TypedEpoxyController
-//                                         documentation ```java\npublic abstract class TypedEpoxyController<T>\n```
+//                                         signature_documentation java public abstract class TypedEpoxyController<T>
 //                                         documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by a single object.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData(Object)}\n whenever that data changes. This class will handle calling {@link #buildModels(Object)} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see Typed2EpoxyController\n @see Typed3EpoxyController\n @see Typed4EpoxyController\n
 //                                         relationship is_implementation semanticdb maven . . ModelCollector#
 //                                         relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                         relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                         ^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //                                           display_name T
-//                                           documentation ```java\nT\n```
+//                                           signature_documentation java T
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   private T currentData;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
 //                      display_name currentData
-//                      documentation ```java\nprivate T currentData\n```
+//                      signature_documentation java private T currentData
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
 //                                        display_name allowModelBuildRequests
-//                                        documentation ```java\nprivate boolean allowModelBuildRequests\n```
+//                                        signature_documentation java private boolean allowModelBuildRequests
 
   public TypedEpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#`<init>`().
 //                            display_name <init>
-//                            documentation ```java\npublic TypedEpoxyController()\n```
+//                            signature_documentation java public TypedEpoxyController()
   }
 
   public TypedEpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#`<init>`(+1).
 //                            display_name <init>
-//                            documentation ```java\npublic TypedEpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)\n```
+//                            signature_documentation java public TypedEpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
 //                            ^^^^^^^ reference semanticdb maven . . Handler#
 //                                    ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                         display_name modelBuildingHandler
-//                                                         documentation ```java\nunresolved_type modelBuildingHandler\n```
+//                                                         signature_documentation java unresolved_type modelBuildingHandler
 //                                                          ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                  ^^^^^^^^^^^^^^ definition local 1
 //                                                                                 display_name diffingHandler
-//                                                                                 documentation ```java\nunresolved_type diffingHandler\n```
+//                                                                                 signature_documentation java unresolved_type diffingHandler
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 0
@@ -72,11 +72,11 @@ public TypedEpoxyController(Handler modelBuildingHandler, Handler diffingHandler
   public final void setData(T data) {
 //                  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#setData().
 //                          display_name setData
-//                          documentation ```java\npublic final void setData(T data)\n```
+//                          signature_documentation java public final void setData(T data)
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //                            ^^^^ definition local 2
 //                                 display_name data
-//                                 documentation ```java\nT data\n```
+//                                 signature_documentation java T data
     currentData = data;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
 //                ^^^^ reference local 2
@@ -93,7 +93,7 @@ public final void setData(T data) {
   public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
-//                                    documentation ```java\n@Override\npublic final void requestModelBuild()\n```
+//                                    signature_documentation java @Override\npublic final void requestModelBuild()
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
@@ -112,14 +112,14 @@ public final void requestModelBuild() {
   public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#moveModel().
 //                      display_name moveModel
-//                      documentation ```java\n@Override\npublic void moveModel(int fromPosition, int toPosition)\n```
+//                      signature_documentation java @Override\npublic void moveModel(int fromPosition, int toPosition)
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 3
 //                                       display_name fromPosition
-//                                       documentation ```java\nint fromPosition\n```
+//                                       signature_documentation java int fromPosition
 //                                            ^^^^^^^^^^ definition local 4
 //                                                       display_name toPosition
-//                                                       documentation ```java\nint toPosition\n```
+//                                                       signature_documentation java int toPosition
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
     super.moveModel(fromPosition, toPosition);
@@ -136,11 +136,11 @@ public void moveModel(int fromPosition, int toPosition) {
   public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestDelayedModelBuild().
 //                                     display_name requestDelayedModelBuild
-//                                     documentation ```java\n@Override\npublic void requestDelayedModelBuild(int delayMs)\n```
+//                                     signature_documentation java @Override\npublic void requestDelayedModelBuild(int delayMs)
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 5
 //                                                 display_name delayMs
-//                                                 documentation ```java\nint delayMs\n```
+//                                                 signature_documentation java int delayMs
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
       throw new IllegalStateException(
@@ -160,7 +160,7 @@ public final T getCurrentData() {
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#getCurrentData().
 //                              display_name getCurrentData
-//                              documentation ```java\n@Nullable\npublic final T getCurrentData()\n```
+//                              signature_documentation java @Nullable\npublic final T getCurrentData()
     return currentData;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
   }
@@ -170,7 +170,7 @@ public final T getCurrentData() {
   protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#buildModels().
 //                                 display_name buildModels
-//                                 documentation ```java\n@Override\nprotected final void buildModels()\n```
+//                                 signature_documentation java @Override\nprotected final void buildModels()
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -187,9 +187,9 @@ protected final void buildModels() {
   protected abstract void buildModels(T data);
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#buildModels(+1).
 //                                    display_name buildModels
-//                                    documentation ```java\nprotected abstract void buildModels(T data)\n```
+//                                    signature_documentation java protected abstract void buildModels(T data)
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //                                      ^^^^ definition local 6
 //                                           display_name data
-//                                           documentation ```java\nT data\n```
+//                                           signature_documentation java T data
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
index 4e9c26468..bf943ddff 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
@@ -29,7 +29,7 @@
 class UpdateOp {
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //             display_name UpdateOp
-//             documentation ```java\nclass UpdateOp\n```
+//             signature_documentation java class UpdateOp
 //             documentation Defines an operation that makes a change to the epoxy model list. 
 
   @IntDef({ADD, REMOVE, UPDATE, MOVE})
@@ -45,81 +45,81 @@ class UpdateOp {
   @interface Type {
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                display_name Type
-//                documentation ```java\n@IntDef({ADD, REMOVE, UPDATE, MOVE})\n@Retention(RetentionPolicy.SOURCE)\n@interface Type\n```
-//                relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                signature_documentation java @IntDef({ADD, REMOVE, UPDATE, MOVE})\n@Retention(RetentionPolicy.SOURCE)\n@interface Type
+//                relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
   }
 
   static final int ADD = 0;
 //                 ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#ADD.
 //                     display_name ADD
-//                     documentation ```java\nstatic final int ADD\n```
+//                     signature_documentation java static final int ADD
   static final int REMOVE = 1;
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#REMOVE.
 //                        display_name REMOVE
-//                        documentation ```java\nstatic final int REMOVE\n```
+//                        signature_documentation java static final int REMOVE
   static final int UPDATE = 2;
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#UPDATE.
 //                        display_name UPDATE
-//                        documentation ```java\nstatic final int UPDATE\n```
+//                        signature_documentation java static final int UPDATE
   static final int MOVE = 3;
 //                 ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#MOVE.
 //                      display_name MOVE
-//                      documentation ```java\nstatic final int MOVE\n```
+//                      signature_documentation java static final int MOVE
 
   @Type int type;
 // ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //          ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#type.
 //               display_name type
-//               documentation ```java\n@Type\nint type\n```
+//               signature_documentation java @Type\nint type
   int positionStart;
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
 //                  display_name positionStart
-//                  documentation ```java\nint positionStart\n```
+//                  signature_documentation java int positionStart
   /** Holds the target position if this is a MOVE */
   int itemCount;
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
 //              display_name itemCount
-//              documentation ```java\nint itemCount\n```
+//              signature_documentation java int itemCount
 //              documentation Holds the target position if this is a MOVE 
   ArrayList<EpoxyModel<?>> payloads;
 //^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#payloads.
 //                                  display_name payloads
-//                                  documentation ```java\nArrayList<EpoxyModel<?>> payloads\n```
+//                                  signature_documentation java ArrayList<EpoxyModel<?>> payloads
 
   private UpdateOp() {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#`<init>`().
 //                 display_name <init>
-//                 documentation ```java\nprivate UpdateOp()\n```
+//                 signature_documentation java private UpdateOp()
   }
 
   static UpdateOp instance(@Type int type, int positionStart, int itemCount,
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
 //                         display_name instance
-//                         documentation ```java\nstatic UpdateOp instance(int type, int positionStart, int itemCount, EpoxyModel<?> payload)\n```
+//                         signature_documentation java static UpdateOp instance(int type, int positionStart, int itemCount, EpoxyModel<?> payload)
 //                          ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                   ^^^^ definition local 0
 //                                        display_name type
-//                                        documentation ```java\n@Type\nint type\n```
+//                                        signature_documentation java @Type\nint type
 //                                             ^^^^^^^^^^^^^ definition local 1
 //                                                           display_name positionStart
-//                                                           documentation ```java\nint positionStart\n```
+//                                                           signature_documentation java int positionStart
 //                                                                ^^^^^^^^^ definition local 2
 //                                                                          display_name itemCount
-//                                                                          documentation ```java\nint itemCount\n```
+//                                                                          signature_documentation java int itemCount
       @Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^ definition local 3
 //                                    display_name payload
-//                                    documentation ```java\n@Nullable\nEpoxyModel<?> payload\n```
+//                                    signature_documentation java @Nullable\nEpoxyModel<?> payload
     UpdateOp op = new UpdateOp();
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //           ^^ definition local 4
 //              display_name op
-//              documentation ```java\nUpdateOp op\n```
+//              signature_documentation java UpdateOp op
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#`<init>`().
 
     op.type = type;
@@ -148,7 +148,7 @@ static UpdateOp instance(@Type int type, int positionStart, int itemCount,
   int positionEnd() {
 //    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionEnd().
 //                display_name positionEnd
-//                documentation ```java\nint positionEnd()\n```
+//                signature_documentation java int positionEnd()
 //                documentation Returns the index one past the last item in the affected range. 
     return positionStart + itemCount;
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
@@ -158,10 +158,10 @@ int positionEnd() {
   boolean isAfter(int position) {
 //        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#isAfter().
 //                display_name isAfter
-//                documentation ```java\nboolean isAfter(int position)\n```
+//                signature_documentation java boolean isAfter(int position)
 //                    ^^^^^^^^ definition local 5
 //                             display_name position
-//                             documentation ```java\nint position\n```
+//                             signature_documentation java int position
     return position < positionStart;
 //         ^^^^^^^^ reference local 5
 //                    ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
@@ -170,10 +170,10 @@ boolean isAfter(int position) {
   boolean isBefore(int position) {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#isBefore().
 //                 display_name isBefore
-//                 documentation ```java\nboolean isBefore(int position)\n```
+//                 signature_documentation java boolean isBefore(int position)
 //                     ^^^^^^^^ definition local 6
 //                              display_name position
-//                              documentation ```java\nint position\n```
+//                              signature_documentation java int position
     return position >= positionEnd();
 //         ^^^^^^^^ reference local 6
 //                     ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionEnd().
@@ -182,10 +182,10 @@ boolean isBefore(int position) {
   boolean contains(int position) {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#contains().
 //                 display_name contains
-//                 documentation ```java\nboolean contains(int position)\n```
+//                 signature_documentation java boolean contains(int position)
 //                     ^^^^^^^^ definition local 7
 //                              display_name position
-//                              documentation ```java\nint position\n```
+//                              signature_documentation java int position
     return position >= positionStart && position < positionEnd();
 //         ^^^^^^^^ reference local 7
 //                     ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
@@ -196,12 +196,12 @@ boolean contains(int position) {
   void addPayload(@Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#addPayload().
 //                display_name addPayload
-//                documentation ```java\nvoid addPayload(EpoxyModel<?> payload)\n```
+//                signature_documentation java void addPayload(EpoxyModel<?> payload)
 //                 ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^^ definition local 8
 //                                                display_name payload
-//                                                documentation ```java\n@Nullable\nEpoxyModel<?> payload\n```
+//                                                signature_documentation java @Nullable\nEpoxyModel<?> payload
     if (payload == null) {
 //      ^^^^^^^ reference local 8
       return;
@@ -235,7 +235,7 @@ public String toString() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#toString().
 //                       display_name toString
-//                       documentation ```java\n@Override\npublic String toString()\n```
+//                       signature_documentation java @Override\npublic String toString()
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return "UpdateOp{"
         + "type=" + type
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
index 03a6aef8d..b39399fa7 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
@@ -46,17 +46,17 @@
 class UpdateOpHelper {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                   display_name UpdateOpHelper
-//                   documentation ```java\nclass UpdateOpHelper\n```
+//                   signature_documentation java class UpdateOpHelper
 //                   documentation Helper class to collect changes in a diff, batching when possible. 
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#`<init>`().
 //                   display_name <init>
-//                   documentation ```java\nUpdateOpHelper()\n```
+//                   signature_documentation java UpdateOpHelper()
   final List<UpdateOp> opList = new ArrayList<>();
 //      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
 //                            display_name opList
-//                            documentation ```java\nfinal List<UpdateOp> opList\n```
+//                            signature_documentation java final List<UpdateOp> opList
 //                                  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   // We have to be careful to update all item positions in the list when we
   // do a MOVE. This adds some complexity.
@@ -67,34 +67,34 @@ class UpdateOpHelper {
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#moves.
 //                           display_name moves
-//                           documentation ```java\nfinal List<UpdateOp> moves\n```
+//                           signature_documentation java final List<UpdateOp> moves
 //                                 ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   private UpdateOp lastOp;
 //        ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
 //                        display_name lastOp
-//                        documentation ```java\nprivate UpdateOp lastOp\n```
+//                        signature_documentation java private UpdateOp lastOp
   private int numInsertions;
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
 //                          display_name numInsertions
-//                          documentation ```java\nprivate int numInsertions\n```
+//                          signature_documentation java private int numInsertions
   private int numInsertionBatches;
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertionBatches.
 //                                display_name numInsertionBatches
-//                                documentation ```java\nprivate int numInsertionBatches\n```
+//                                signature_documentation java private int numInsertionBatches
   private int numRemovals;
 //            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
 //                        display_name numRemovals
-//                        documentation ```java\nprivate int numRemovals\n```
+//                        signature_documentation java private int numRemovals
   private int numRemovalBatches;
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovalBatches.
 //                              display_name numRemovalBatches
-//                              documentation ```java\nprivate int numRemovalBatches\n```
+//                              signature_documentation java private int numRemovalBatches
 
   void reset() {
 //     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#reset().
 //           display_name reset
-//           documentation ```java\nvoid reset()\n```
+//           signature_documentation java void reset()
     opList.clear();
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
 //         ^^^^^ reference semanticdb maven jdk 11 java/util/List#clear().
@@ -116,10 +116,10 @@ void reset() {
   void add(int indexToInsert) {
 //     ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add().
 //         display_name add
-//         documentation ```java\nvoid add(int indexToInsert)\n```
+//         signature_documentation java void add(int indexToInsert)
 //             ^^^^^^^^^^^^^ definition local 0
 //                           display_name indexToInsert
-//                           documentation ```java\nint indexToInsert\n```
+//                           signature_documentation java int indexToInsert
     add(indexToInsert, 1);
 //  ^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
 //      ^^^^^^^^^^^^^ reference local 0
@@ -128,13 +128,13 @@ void add(int indexToInsert) {
   void add(int startPosition, int itemCount) {
 //     ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
 //         display_name add
-//         documentation ```java\nvoid add(int startPosition, int itemCount)\n```
+//         signature_documentation java void add(int startPosition, int itemCount)
 //             ^^^^^^^^^^^^^ definition local 1
 //                           display_name startPosition
-//                           documentation ```java\nint startPosition\n```
+//                           signature_documentation java int startPosition
 //                                ^^^^^^^^^ definition local 2
 //                                          display_name itemCount
-//                                          documentation ```java\nint itemCount\n```
+//                                          signature_documentation java int itemCount
     numInsertions += itemCount;
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
 //                   ^^^^^^^^^ reference local 2
@@ -144,7 +144,7 @@ void add(int startPosition, int itemCount) {
     boolean batchWithLast = isLastOp(ADD)
 //          ^^^^^^^^^^^^^ definition local 3
 //                        display_name batchWithLast
-//                        documentation ```java\nboolean batchWithLast\n```
+//                        signature_documentation java boolean batchWithLast
 //                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //                                   ^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#ADD.
         && (lastOp.contains(startPosition) || lastOp.positionEnd() == startPosition);
@@ -174,10 +174,10 @@ void add(int startPosition, int itemCount) {
   void update(int indexToChange) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update().
 //            display_name update
-//            documentation ```java\nvoid update(int indexToChange)\n```
+//            signature_documentation java void update(int indexToChange)
 //                ^^^^^^^^^^^^^ definition local 4
 //                              display_name indexToChange
-//                              documentation ```java\nint indexToChange\n```
+//                              signature_documentation java int indexToChange
     update(indexToChange, null);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update(+1).
 //         ^^^^^^^^^^^^^ reference local 4
@@ -186,14 +186,14 @@ void update(int indexToChange) {
   void update(final int indexToChange, EpoxyModel<?> payload) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update(+1).
 //            display_name update
-//            documentation ```java\nvoid update(int indexToChange, EpoxyModel<?> payload)\n```
+//            signature_documentation java void update(int indexToChange, EpoxyModel<?> payload)
 //                      ^^^^^^^^^^^^^ definition local 5
 //                                    display_name indexToChange
-//                                    documentation ```java\nfinal int indexToChange\n```
+//                                    signature_documentation java final int indexToChange
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                   ^^^^^^^ definition local 6
 //                                                           display_name payload
-//                                                           documentation ```java\nEpoxyModel<?> payload\n```
+//                                                           signature_documentation java EpoxyModel<?> payload
     if (isLastOp(UPDATE)) {
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#UPDATE.
@@ -246,10 +246,10 @@ void update(final int indexToChange, EpoxyModel<?> payload) {
   void remove(int indexToRemove) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove().
 //            display_name remove
-//            documentation ```java\nvoid remove(int indexToRemove)\n```
+//            signature_documentation java void remove(int indexToRemove)
 //                ^^^^^^^^^^^^^ definition local 7
 //                              display_name indexToRemove
-//                              documentation ```java\nint indexToRemove\n```
+//                              signature_documentation java int indexToRemove
     remove(indexToRemove, 1);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
 //         ^^^^^^^^^^^^^ reference local 7
@@ -258,13 +258,13 @@ void remove(int indexToRemove) {
   void remove(int startPosition, int itemCount) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
 //            display_name remove
-//            documentation ```java\nvoid remove(int startPosition, int itemCount)\n```
+//            signature_documentation java void remove(int startPosition, int itemCount)
 //                ^^^^^^^^^^^^^ definition local 8
 //                              display_name startPosition
-//                              documentation ```java\nint startPosition\n```
+//                              signature_documentation java int startPosition
 //                                   ^^^^^^^^^ definition local 9
 //                                             display_name itemCount
-//                                             documentation ```java\nint itemCount\n```
+//                                             signature_documentation java int itemCount
     numRemovals += itemCount;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
 //                 ^^^^^^^^^ reference local 9
@@ -272,7 +272,7 @@ void remove(int startPosition, int itemCount) {
     boolean batchWithLast = false;
 //          ^^^^^^^^^^^^^ definition local 10
 //                        display_name batchWithLast
-//                        documentation ```java\nboolean batchWithLast\n```
+//                        signature_documentation java boolean batchWithLast
     if (isLastOp(REMOVE)) {
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#REMOVE.
@@ -321,12 +321,12 @@ void remove(int startPosition, int itemCount) {
   private boolean isLastOp(@UpdateOp.Type int updateType) {
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //                         display_name isLastOp
-//                         documentation ```java\nprivate boolean isLastOp(int updateType)\n```
+//                         signature_documentation java private boolean isLastOp(int updateType)
 //                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                                   ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                            ^^^^^^^^^^ definition local 11
 //                                                       display_name updateType
-//                                                       documentation ```java\n@Type\nint updateType\n```
+//                                                       signature_documentation java @Type\nint updateType
     return lastOp != null && lastOp.type == updateType;
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
 //                           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
@@ -337,17 +337,17 @@ private boolean isLastOp(@UpdateOp.Type int updateType) {
   private void addNewOperation(@Type int type, int position, int itemCount) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation().
 //                             display_name addNewOperation
-//                             documentation ```java\nprivate void addNewOperation(int type, int position, int itemCount)\n```
+//                             signature_documentation java private void addNewOperation(int type, int position, int itemCount)
 //                              ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                       ^^^^ definition local 12
 //                                            display_name type
-//                                            documentation ```java\n@Type\nint type\n```
+//                                            signature_documentation java @Type\nint type
 //                                                 ^^^^^^^^ definition local 13
 //                                                          display_name position
-//                                                          documentation ```java\nint position\n```
+//                                                          signature_documentation java int position
 //                                                               ^^^^^^^^^ definition local 14
 //                                                                         display_name itemCount
-//                                                                         documentation ```java\nint itemCount\n```
+//                                                                         signature_documentation java int itemCount
     addNewOperation(type, position, itemCount, null);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
 //                  ^^^^ reference local 12
@@ -358,23 +358,23 @@ private void addNewOperation(@Type int type, int position, int itemCount) {
   private void addNewOperation(@Type int type, int position, int itemCount,
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
 //                             display_name addNewOperation
-//                             documentation ```java\nprivate void addNewOperation(int type, int position, int itemCount, EpoxyModel<?> payload)\n```
+//                             signature_documentation java private void addNewOperation(int type, int position, int itemCount, EpoxyModel<?> payload)
 //                              ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                       ^^^^ definition local 15
 //                                            display_name type
-//                                            documentation ```java\n@Type\nint type\n```
+//                                            signature_documentation java @Type\nint type
 //                                                 ^^^^^^^^ definition local 16
 //                                                          display_name position
-//                                                          documentation ```java\nint position\n```
+//                                                          signature_documentation java int position
 //                                                               ^^^^^^^^^ definition local 17
 //                                                                         display_name itemCount
-//                                                                         documentation ```java\nint itemCount\n```
+//                                                                         signature_documentation java int itemCount
       @Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^ definition local 18
 //                                    display_name payload
-//                                    documentation ```java\n@Nullable\nEpoxyModel<?> payload\n```
+//                                    signature_documentation java @Nullable\nEpoxyModel<?> payload
     lastOp = UpdateOp.instance(type, position, itemCount, payload);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
@@ -392,14 +392,14 @@ private void addNewOperation(@Type int type, int position, int itemCount,
   private void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addItemsToLastOperation().
 //                                     display_name addItemsToLastOperation
-//                                     documentation ```java\nprivate void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload)\n```
+//                                     signature_documentation java private void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload)
 //                                         ^^^^^^^^^^^^^ definition local 19
 //                                                       display_name numItemsToAdd
-//                                                       documentation ```java\nint numItemsToAdd\n```
+//                                                       signature_documentation java int numItemsToAdd
 //                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                      ^^^^^^^ definition local 20
 //                                                                              display_name payload
-//                                                                              documentation ```java\nEpoxyModel<?> payload\n```
+//                                                                              signature_documentation java EpoxyModel<?> payload
     lastOp.itemCount += numItemsToAdd;
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
@@ -413,13 +413,13 @@ private void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload) {
   void move(int from, int to) {
 //     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#move().
 //          display_name move
-//          documentation ```java\nvoid move(int from, int to)\n```
+//          signature_documentation java void move(int from, int to)
 //              ^^^^ definition local 21
 //                   display_name from
-//                   documentation ```java\nint from\n```
+//                   signature_documentation java int from
 //                        ^^ definition local 22
 //                           display_name to
-//                           documentation ```java\nint to\n```
+//                           signature_documentation java int to
     // We can't batch moves
     lastOp = null;
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
@@ -427,7 +427,7 @@ void move(int from, int to) {
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //           ^^ definition local 23
 //              display_name op
-//              documentation ```java\nUpdateOp op\n```
+//              signature_documentation java UpdateOp op
 //                ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
 //                                  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#MOVE.
@@ -446,7 +446,7 @@ void move(int from, int to) {
   int getNumRemovals() {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumRemovals().
 //                   display_name getNumRemovals
-//                   documentation ```java\nint getNumRemovals()\n```
+//                   signature_documentation java int getNumRemovals()
     return numRemovals;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
   }
@@ -454,7 +454,7 @@ int getNumRemovals() {
   boolean hasRemovals() {
 //        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#hasRemovals().
 //                    display_name hasRemovals
-//                    documentation ```java\nboolean hasRemovals()\n```
+//                    signature_documentation java boolean hasRemovals()
     return numRemovals > 0;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
   }
@@ -462,7 +462,7 @@ boolean hasRemovals() {
   int getNumInsertions() {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumInsertions().
 //                     display_name getNumInsertions
-//                     documentation ```java\nint getNumInsertions()\n```
+//                     signature_documentation java int getNumInsertions()
     return numInsertions;
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
   }
@@ -470,7 +470,7 @@ int getNumInsertions() {
   boolean hasInsertions() {
 //        ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#hasInsertions().
 //                      display_name hasInsertions
-//                      documentation ```java\nboolean hasInsertions()\n```
+//                      signature_documentation java boolean hasInsertions()
     return numInsertions > 0;
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
   }
@@ -478,7 +478,7 @@ boolean hasInsertions() {
   int getNumMoves() {
 //    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumMoves().
 //                display_name getNumMoves
-//                documentation ```java\nint getNumMoves()\n```
+//                signature_documentation java int getNumMoves()
     return moves.size();
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#moves.
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -487,7 +487,7 @@ int getNumMoves() {
   int getNumInsertionBatches() {
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumInsertionBatches().
 //                           display_name getNumInsertionBatches
-//                           documentation ```java\nint getNumInsertionBatches()\n```
+//                           signature_documentation java int getNumInsertionBatches()
     return numInsertionBatches;
 //         ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertionBatches.
   }
@@ -495,7 +495,7 @@ int getNumInsertionBatches() {
   int getNumRemovalBatches() {
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumRemovalBatches().
 //                         display_name getNumRemovalBatches
-//                         documentation ```java\nint getNumRemovalBatches()\n```
+//                         signature_documentation java int getNumRemovalBatches()
     return numRemovalBatches;
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovalBatches.
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
index 41376cde1..628323108 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
@@ -61,7 +61,7 @@
 class ViewHolderState extends LongSparseArray<ViewState> implements Parcelable {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 //                    display_name ViewHolderState
-//                    documentation ```java\n@SuppressWarnings("WeakerAccess")\nclass ViewHolderState\n```
+//                    signature_documentation java @SuppressWarnings("WeakerAccess")\nclass ViewHolderState
 //                    documentation  Helper for {@link EpoxyAdapter} to store the state of Views in the adapter. This is useful for\n saving changes due to user input, such as text input or selection, when a view is scrolled off\n screen or if the adapter needs to be recreated.\n <p/>\n This saved state is separate from the state represented by a {@link EpoxyModel}, which should\n represent the more permanent state of the data shown in the view. This class stores transient\n state that is added to the View after it is bound to a {@link EpoxyModel}. For example, a {@link\n EpoxyModel} may inflate and bind an EditText and then be responsible for styling it and attaching\n listeners. If the user then inputs text, scrolls the view offscreen and then scrolls back, this\n class will preserve the inputted text without the {@link EpoxyModel} needing to be aware of its\n existence.\n <p/>\n This class relies on the adapter having stable ids, as the state of a view is mapped to the id of\n the {@link EpoxyModel}.\n
 //                    relationship is_implementation semanticdb maven . . Parcelable#
 //                    relationship is_implementation semanticdb maven jdk 11 java/lang/Cloneable#
@@ -72,16 +72,16 @@ class ViewHolderState extends LongSparseArray<ViewState> implements Parcelable {
   ViewHolderState() {
 //^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`().
 //                display_name <init>
-//                documentation ```java\nViewHolderState()\n```
+//                signature_documentation java ViewHolderState()
   }
 
   private ViewHolderState(int size) {
 //        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`(+1).
 //                        display_name <init>
-//                        documentation ```java\nprivate ViewHolderState(int size)\n```
+//                        signature_documentation java private ViewHolderState(int size)
 //                            ^^^^ definition local 0
 //                                 display_name size
-//                                 documentation ```java\nint size\n```
+//                                 signature_documentation java int size
     super(size);
 //  ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#`<init>`(+1).
 //        ^^^^ reference local 0
@@ -92,7 +92,7 @@ private ViewHolderState(int size) {
   public int describeContents() {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#describeContents().
 //                            display_name describeContents
-//                            documentation ```java\n@Override\npublic int describeContents()\n```
+//                            signature_documentation java @Override\npublic int describeContents()
     return 0;
   }
 
@@ -101,18 +101,18 @@ public int describeContents() {
   public void writeToParcel(Parcel dest, int flags) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
 //                          display_name writeToParcel
-//                          documentation ```java\n@Override\npublic void writeToParcel(unresolved_type dest, int flags)\n```
+//                          signature_documentation java @Override\npublic void writeToParcel(unresolved_type dest, int flags)
 //                          ^^^^^^ reference semanticdb maven . . Parcel#
 //                                 ^^^^ definition local 1
 //                                      display_name dest
-//                                      documentation ```java\nunresolved_type dest\n```
+//                                      signature_documentation java unresolved_type dest
 //                                           ^^^^^ definition local 2
 //                                                 display_name flags
-//                                                 documentation ```java\nint flags\n```
+//                                                 signature_documentation java int flags
     final int size = size();
 //            ^^^^ definition local 3
 //                 display_name size
-//                 documentation ```java\nfinal int size\n```
+//                 signature_documentation java final int size
 //                   ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
     dest.writeInt(size);
 //  ^^^^ reference local 1
@@ -121,7 +121,7 @@ public void writeToParcel(Parcel dest, int flags) {
     for (int i = 0; i < size; i++) {
 //           ^ definition local 4
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //                  ^ reference local 4
 //                      ^^^^ reference local 3
 //                            ^ reference local 4
@@ -143,7 +143,7 @@ public void writeToParcel(Parcel dest, int flags) {
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 //                                             ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#CREATOR.
 //                                                     display_name CREATOR
-//                                                     documentation ```java\npublic static final unresolved_type CREATOR\n```
+//                                                     signature_documentation java public static final unresolved_type CREATOR
 //                                                           ^^^^^^^ reference semanticdb maven . . Creator#
 //                                                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 
@@ -168,11 +168,11 @@ public ViewHolderState createFromParcel(Parcel source) {
   public boolean hasStateForHolder(EpoxyViewHolder holder) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#hasStateForHolder().
 //                                 display_name hasStateForHolder
-//                                 documentation ```java\npublic boolean hasStateForHolder(EpoxyViewHolder holder)\n```
+//                                 signature_documentation java public boolean hasStateForHolder(EpoxyViewHolder holder)
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^ definition local 5
 //                                                        display_name holder
-//                                                        documentation ```java\nEpoxyViewHolder holder\n```
+//                                                        signature_documentation java EpoxyViewHolder holder
     return get(holder.getItemId()) != null;
 //         ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //             ^^^^^^ reference local 5
@@ -182,17 +182,17 @@ public boolean hasStateForHolder(EpoxyViewHolder holder) {
   public void save(Collection<EpoxyViewHolder> holders) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save().
 //                 display_name save
-//                 documentation ```java\npublic void save(Collection<EpoxyViewHolder> holders)\n```
+//                 signature_documentation java public void save(Collection<EpoxyViewHolder> holders)
 //                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^^ definition local 6
 //                                                     display_name holders
-//                                                     documentation ```java\nCollection<EpoxyViewHolder> holders\n```
+//                                                     signature_documentation java Collection<EpoxyViewHolder> holders
     for (EpoxyViewHolder holder : holders) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^ definition local 7
 //                              display_name holder
-//                              documentation ```java\nEpoxyViewHolder holder\n```
+//                              signature_documentation java EpoxyViewHolder holder
 //                                ^^^^^^^ reference local 6
       save(holder);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
@@ -204,12 +204,12 @@ public void save(Collection<EpoxyViewHolder> holders) {
   public void save(EpoxyViewHolder holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
 //                 display_name save
-//                 documentation ```java\npublic void save(EpoxyViewHolder holder)\n```
+//                 signature_documentation java public void save(EpoxyViewHolder holder)
 //                 documentation Save the state of the view bound to the given holder. 
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                 ^^^^^^ definition local 8
 //                                        display_name holder
-//                                        documentation ```java\nEpoxyViewHolder holder\n```
+//                                        signature_documentation java EpoxyViewHolder holder
     if (!holder.getModel().shouldSaveViewState()) {
 //       ^^^^^^ reference local 8
 //              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -224,7 +224,7 @@ public void save(EpoxyViewHolder holder) {
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //            ^^^^^ definition local 9
 //                  display_name state
-//                  documentation ```java\nViewState state\n```
+//                  signature_documentation java ViewState state
 //                    ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //                        ^^^^^^ reference local 8
 //                               ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getItemId#
@@ -254,12 +254,12 @@ public void save(EpoxyViewHolder holder) {
   public void restore(EpoxyViewHolder holder) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#restore().
 //                    display_name restore
-//                    documentation ```java\npublic void restore(EpoxyViewHolder holder)\n```
+//                    signature_documentation java public void restore(EpoxyViewHolder holder)
 //                    documentation  If a state was previously saved for this view holder via {@link #save} it will be restored\n here.\n
 //                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                    ^^^^^^ definition local 10
 //                                           display_name holder
-//                                           documentation ```java\nEpoxyViewHolder holder\n```
+//                                           signature_documentation java EpoxyViewHolder holder
     if (!holder.getModel().shouldSaveViewState()) {
 //       ^^^^^^ reference local 10
 //              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -271,7 +271,7 @@ public void restore(EpoxyViewHolder holder) {
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //            ^^^^^ definition local 11
 //                  display_name state
-//                  documentation ```java\nViewState state\n```
+//                  signature_documentation java ViewState state
 //                    ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //                        ^^^^^^ reference local 10
 //                               ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getItemId#
@@ -298,7 +298,7 @@ public void restore(EpoxyViewHolder holder) {
   public static class ViewState extends SparseArray<Parcelable> implements Parcelable {
 //                    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //                              display_name ViewState
-//                              documentation ```java\npublic static class ViewState\n```
+//                              signature_documentation java public static class ViewState
 //                              documentation  A wrapper around a sparse array as a helper to save the state of a view. This also adds\n parcelable support.\n
 //                              relationship is_implementation semanticdb maven . . Parcelable#
 //                              relationship is_implementation semanticdb maven . . SparseArray#
@@ -309,29 +309,29 @@ public static class ViewState extends SparseArray<Parcelable> implements Parcela
     ViewState() {
 //  ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`().
 //            display_name <init>
-//            documentation ```java\nViewState()\n```
+//            signature_documentation java ViewState()
     }
 
     private ViewState(int size, int[] keys, Parcelable[] values) {
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`(+1).
 //                    display_name <init>
-//                    documentation ```java\nprivate ViewState(int size, int[] keys, unresolved_type[] values)\n```
+//                    signature_documentation java private ViewState(int size, int[] keys, unresolved_type[] values)
 //                        ^^^^ definition local 12
 //                             display_name size
-//                             documentation ```java\nint size\n```
+//                             signature_documentation java int size
 //                                    ^^^^ definition local 13
 //                                         display_name keys
-//                                         documentation ```java\nint[] keys\n```
+//                                         signature_documentation java int[] keys
 //                                          ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                                                       ^^^^^^ definition local 14
 //                                                              display_name values
-//                                                              documentation ```java\nunresolved_type[] values\n```
+//                                                              signature_documentation java unresolved_type[] values
       super(size);
 //          ^^^^ reference local 12
       for (int i = 0; i < size; ++i) {
 //             ^ definition local 15
 //               display_name i
-//               documentation ```java\nint i\n```
+//               signature_documentation java int i
 //                    ^ reference local 15
 //                        ^^^^ reference local 12
 //                                ^ reference local 15
@@ -347,15 +347,15 @@ private ViewState(int size, int[] keys, Parcelable[] values) {
     public void save(View view) {
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#save().
 //                   display_name save
-//                   documentation ```java\npublic void save(unresolved_type view)\n```
+//                   signature_documentation java public void save(unresolved_type view)
 //                   ^^^^ reference semanticdb maven . . View#
 //                        ^^^^ definition local 16
 //                             display_name view
-//                             documentation ```java\nunresolved_type view\n```
+//                             signature_documentation java unresolved_type view
       int originalId = view.getId();
 //        ^^^^^^^^^^ definition local 17
 //                   display_name originalId
-//                   documentation ```java\nint originalId\n```
+//                   signature_documentation java int originalId
 //                     ^^^^ reference local 16
 //                          ^^^^^ reference semanticdb maven . . View#getId#
       setIdIfNoneExists(view);
@@ -374,15 +374,15 @@ public void save(View view) {
     public void restore(View view) {
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#restore().
 //                      display_name restore
-//                      documentation ```java\npublic void restore(unresolved_type view)\n```
+//                      signature_documentation java public void restore(unresolved_type view)
 //                      ^^^^ reference semanticdb maven . . View#
 //                           ^^^^ definition local 18
 //                                display_name view
-//                                documentation ```java\nunresolved_type view\n```
+//                                signature_documentation java unresolved_type view
       int originalId = view.getId();
 //        ^^^^^^^^^^ definition local 19
 //                   display_name originalId
-//                   documentation ```java\nint originalId\n```
+//                   signature_documentation java int originalId
 //                     ^^^^ reference local 18
 //                          ^^^^^ reference semanticdb maven . . View#getId#
       setIdIfNoneExists(view);
@@ -407,12 +407,12 @@ public void restore(View view) {
     private void setIdIfNoneExists(View view) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#setIdIfNoneExists().
 //                                 display_name setIdIfNoneExists
-//                                 documentation ```java\nprivate void setIdIfNoneExists(unresolved_type view)\n```
+//                                 signature_documentation java private void setIdIfNoneExists(unresolved_type view)
 //                                 documentation  If a view hasn't had an id set we need to set a temporary one in order to save state, since a\n view won't save its state unless it has an id. The view's id is also the key into the sparse\n array for its saved state, so the temporary one we choose just needs to be consistent between\n saving and restoring state.\n
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^ definition local 20
 //                                           display_name view
-//                                           documentation ```java\nunresolved_type view\n```
+//                                           signature_documentation java unresolved_type view
       if (view.getId() == View.NO_ID) {
 //        ^^^^ reference local 20
 //             ^^^^^ reference semanticdb maven . . View#getId#
@@ -432,7 +432,7 @@ private void setIdIfNoneExists(View view) {
     public int describeContents() {
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#describeContents().
 //                              display_name describeContents
-//                              documentation ```java\n@Override\npublic int describeContents()\n```
+//                              signature_documentation java @Override\npublic int describeContents()
       return 0;
     }
 
@@ -441,35 +441,35 @@ public int describeContents() {
     public void writeToParcel(Parcel parcel, int flags) {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
 //                            display_name writeToParcel
-//                            documentation ```java\n@Override\npublic void writeToParcel(unresolved_type parcel, int flags)\n```
+//                            signature_documentation java @Override\npublic void writeToParcel(unresolved_type parcel, int flags)
 //                            ^^^^^^ reference semanticdb maven . . Parcel#
 //                                   ^^^^^^ definition local 21
 //                                          display_name parcel
-//                                          documentation ```java\nunresolved_type parcel\n```
+//                                          signature_documentation java unresolved_type parcel
 //                                               ^^^^^ definition local 22
 //                                                     display_name flags
-//                                                     documentation ```java\nint flags\n```
+//                                                     signature_documentation java int flags
       int size = size();
 //        ^^^^ definition local 23
 //             display_name size
-//             documentation ```java\nint size\n```
+//             signature_documentation java int size
 //               ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
       int[] keys = new int[size];
 //          ^^^^ definition local 24
 //               display_name keys
-//               documentation ```java\nint[] keys\n```
+//               signature_documentation java int[] keys
 //                         ^^^^ reference local 23
       Parcelable[] values = new Parcelable[size];
 //    ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                 ^^^^^^ definition local 25
 //                        display_name values
-//                        documentation ```java\nunresolved_type[] values\n```
+//                        signature_documentation java unresolved_type[] values
 //                              ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                                         ^^^^ reference local 23
       for (int i = 0; i < size; ++i) {
 //             ^ definition local 26
 //               display_name i
-//               documentation ```java\nint i\n```
+//               signature_documentation java int i
 //                    ^ reference local 26
 //                        ^^^^ reference local 23
 //                                ^ reference local 26
@@ -504,7 +504,7 @@ public void writeToParcel(Parcel parcel, int flags) {
 //                              ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //                                         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#CREATOR.
 //                                                 display_name CREATOR
-//                                                 documentation ```java\npublic static final unresolved_type CREATOR\n```
+//                                                 signature_documentation java public static final unresolved_type CREATOR
         new Parcelable.ClassLoaderCreator<ViewState>() {
 //          ^^^^^^^^^^ reference semanticdb maven . . Parcelable/
 //                     ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . Parcelable/ClassLoaderCreator#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
index 0b6b131f0..2d27b9fc8 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
@@ -21,17 +21,17 @@
 class ViewTypeManager {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#
 //                    display_name ViewTypeManager
-//                    documentation ```java\nclass ViewTypeManager\n```
+//                    signature_documentation java class ViewTypeManager
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#`<init>`().
 //                    display_name <init>
-//                    documentation ```java\nViewTypeManager()\n```
+//                    signature_documentation java ViewTypeManager()
   private static final Map<Class, Integer> VIEW_TYPE_MAP = new HashMap<>();
 //                     ^^^ reference semanticdb maven jdk 11 java/util/Map#
 //                         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                                         ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
 //                                                       display_name VIEW_TYPE_MAP
-//                                                       documentation ```java\nprivate static final Map<Class, Integer> VIEW_TYPE_MAP\n```
+//                                                       signature_documentation java private static final Map<Class, Integer> VIEW_TYPE_MAP
 //                                                             ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   /**
    * The last model that had its view type looked up. This is stored so in most cases we can quickly
@@ -43,7 +43,7 @@ class ViewTypeManager {
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
 //                                         display_name lastModelForViewTypeLookup
-//                                         documentation ```java\n@Nullable\nEpoxyModel<?> lastModelForViewTypeLookup\n```
+//                                         signature_documentation java @Nullable\nEpoxyModel<?> lastModelForViewTypeLookup
 //                                         documentation  The last model that had its view type looked up. This is stored so in most cases we can quickly\n look up what view type belongs to which model.\n
 
   /**
@@ -57,7 +57,7 @@ class ViewTypeManager {
   void resetMapForTesting() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#resetMapForTesting().
 //                        display_name resetMapForTesting
-//                        documentation ```java\n@VisibleForTesting\nvoid resetMapForTesting()\n```
+//                        signature_documentation java @VisibleForTesting\nvoid resetMapForTesting()
 //                        documentation  The type map is static so that models of the same class share the same views across different\n adapters. This is useful for view recycling when the adapter instance changes, or when there\n are multiple adapters. For testing purposes though it is good to be able to clear the map so we\n don't carry over values across tests.\n
     VIEW_TYPE_MAP.clear();
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
@@ -67,11 +67,11 @@ void resetMapForTesting() {
   int getViewTypeAndRememberModel(EpoxyModel<?> model) {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewTypeAndRememberModel().
 //                                display_name getViewTypeAndRememberModel
-//                                documentation ```java\nint getViewTypeAndRememberModel(EpoxyModel<?> model)\n```
+//                                signature_documentation java int getViewTypeAndRememberModel(EpoxyModel<?> model)
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 0
 //                                                    display_name model
-//                                                    documentation ```java\nEpoxyModel<?> model\n```
+//                                                    signature_documentation java EpoxyModel<?> model
     lastModelForViewTypeLookup = model;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
 //                               ^^^^^ reference local 0
@@ -83,15 +83,15 @@ int getViewTypeAndRememberModel(EpoxyModel<?> model) {
   static int getViewType(EpoxyModel<?> model) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
 //                       display_name getViewType
-//                       documentation ```java\nstatic int getViewType(EpoxyModel<?> model)\n```
+//                       signature_documentation java static int getViewType(EpoxyModel<?> model)
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^ definition local 1
 //                                           display_name model
-//                                           documentation ```java\nEpoxyModel<?> model\n```
+//                                           signature_documentation java EpoxyModel<?> model
     int defaultViewType = model.getViewType();
 //      ^^^^^^^^^^^^^^^ definition local 2
 //                      display_name defaultViewType
-//                      documentation ```java\nint defaultViewType\n```
+//                      signature_documentation java int defaultViewType
 //                        ^^^^^ reference local 1
 //                              ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
     if (defaultViewType != 0) {
@@ -106,7 +106,7 @@ static int getViewType(EpoxyModel<?> model) {
 //  ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //        ^^^^^^^^^^ definition local 3
 //                   display_name modelClass
-//                   documentation ```java\nClass modelClass\n```
+//                   signature_documentation java Class modelClass
 //                     ^^^^^ reference local 1
 //                           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
 
@@ -114,7 +114,7 @@ static int getViewType(EpoxyModel<?> model) {
 //  ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //          ^^^^^^^^ definition local 4
 //                   display_name viewType
-//                   documentation ```java\nInteger viewType\n```
+//                   signature_documentation java Integer viewType
 //                     ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
 //                                   ^^^ reference semanticdb maven jdk 11 java/util/Map#get().
 //                                       ^^^^^^^^^^ reference local 3
@@ -155,15 +155,15 @@ EpoxyModel<?> getModelForViewType(BaseEpoxyAdapter adapter, int viewType) {
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
 //                                  display_name getModelForViewType
-//                                  documentation ```java\nEpoxyModel<?> getModelForViewType(BaseEpoxyAdapter adapter, int viewType)\n```
+//                                  signature_documentation java EpoxyModel<?> getModelForViewType(BaseEpoxyAdapter adapter, int viewType)
 //                                  documentation  Find the model that has the given view type so we can create a view for that model. In most\n cases this value is a layout resource and we could simply inflate it, but to support {@link\n EpoxyModelWithView} we can't assume the view type is a layout. In that case we need to lookup\n the model so we can ask it to create a new view for itself.\n <p>\n To make this efficient, we rely on the RecyclerView implementation detail that {@link\n BaseEpoxyAdapter#getItemViewType(int)} is called immediately before {@link\n BaseEpoxyAdapter#onCreateViewHolder(android.view.ViewGroup, int)} . We cache the last model\n that had its view type looked up, and unless that implementation changes we expect to have a\n very fast lookup for the correct model.\n <p>\n To be safe, we fallback to searching through all models for a view type match. This is slow and\n shouldn't be needed, but is a guard against recyclerview behavior changing.\n
 //                                  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                                                   ^^^^^^^ definition local 5
 //                                                           display_name adapter
-//                                                           documentation ```java\nBaseEpoxyAdapter adapter\n```
+//                                                           signature_documentation java BaseEpoxyAdapter adapter
 //                                                                ^^^^^^^^ definition local 6
 //                                                                         display_name viewType
-//                                                                         documentation ```java\nint viewType\n```
+//                                                                         signature_documentation java int viewType
     if (lastModelForViewTypeLookup != null
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
         && getViewType(lastModelForViewTypeLookup) == viewType) {
@@ -186,7 +186,7 @@ && getViewType(lastModelForViewTypeLookup) == viewType) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 7
 //                           display_name model
-//                           documentation ```java\nEpoxyModel<?> model\n```
+//                           signature_documentation java EpoxyModel<?> model
 //                             ^^^^^^^ reference local 5
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
       if (getViewType(model) == viewType) {
@@ -203,7 +203,7 @@ && getViewType(lastModelForViewTypeLookup) == viewType) {
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#
 //                   ^^^^^^^^^^^^^^^^ definition local 8
 //                                    display_name hiddenEpoxyModel
-//                                    documentation ```java\nHiddenEpoxyModel hiddenEpoxyModel\n```
+//                                    signature_documentation java HiddenEpoxyModel hiddenEpoxyModel
 //                                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
     if (viewType == hiddenEpoxyModel.getViewType()) {
 //      ^^^^^^^^ reference local 6
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
index a0b53983d..cc38dd742 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
@@ -19,10 +19,10 @@
 public final class VisibilityState {
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#
 //                                 display_name VisibilityState
-//                                 documentation ```java\npublic final class VisibilityState\n```
+//                                 signature_documentation java public final class VisibilityState
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#`<init>`().
 //                                 display_name <init>
-//                                 documentation ```java\npublic VisibilityState()\n```
+//                                 signature_documentation java public VisibilityState()
 
   @Retention(RetentionPolicy.SOURCE)
 // ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Retention#
@@ -46,8 +46,8 @@ public final class VisibilityState {
   public @interface Visibility {
 //                  ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                             display_name Visibility
-//                             documentation ```java\n@Retention(RetentionPolicy.SOURCE)\n@IntDef({VISIBLE, INVISIBLE, FOCUSED_VISIBLE, UNFOCUSED_VISIBLE, FULL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_INVISIBLE})\npublic @interface Visibility\n```
-//                             relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                             signature_documentation java @Retention(RetentionPolicy.SOURCE)\n@IntDef({VISIBLE, INVISIBLE, FOCUSED_VISIBLE, UNFOCUSED_VISIBLE, FULL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_INVISIBLE})\npublic @interface Visibility
+//                             relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
   }
 
   /**
@@ -57,7 +57,7 @@ public final class VisibilityState {
   public static final int VISIBLE = 0;
 //                        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#VISIBLE.
 //                                display_name VISIBLE
-//                                documentation ```java\npublic static final int VISIBLE\n```
+//                                signature_documentation java public static final int VISIBLE
 //                                documentation  Event triggered when a Component enters the Visible Range. This happens when at least a pixel\n of the Component is visible.\n
 
   /**
@@ -68,7 +68,7 @@ public final class VisibilityState {
   public static final int INVISIBLE = 1;
 //                        ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#INVISIBLE.
 //                                  display_name INVISIBLE
-//                                  documentation ```java\npublic static final int INVISIBLE\n```
+//                                  signature_documentation java public static final int INVISIBLE
 //                                  documentation  Event triggered when a Component becomes invisible. This is the same with exiting the Visible\n Range, the Focused Range and the Full Impression Range. All the code that needs to be executed\n when a component leaves any of these ranges should be written in the handler for this event.\n
 
   /**
@@ -79,7 +79,7 @@ public final class VisibilityState {
   public static final int FOCUSED_VISIBLE = 2;
 //                        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#FOCUSED_VISIBLE.
 //                                        display_name FOCUSED_VISIBLE
-//                                        documentation ```java\npublic static final int FOCUSED_VISIBLE\n```
+//                                        signature_documentation java public static final int FOCUSED_VISIBLE
 //                                        documentation  Event triggered when a Component enters the Focused Range. This happens when either the\n Component occupies at least half of the viewport or, if the Component is smaller than half of\n the viewport, when the it is fully visible.\n
 
   /**
@@ -90,7 +90,7 @@ public final class VisibilityState {
   public static final int UNFOCUSED_VISIBLE = 3;
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#UNFOCUSED_VISIBLE.
 //                                          display_name UNFOCUSED_VISIBLE
-//                                          documentation ```java\npublic static final int UNFOCUSED_VISIBLE\n```
+//                                          signature_documentation java public static final int UNFOCUSED_VISIBLE
 //                                          documentation  Event triggered when a Component exits the Focused Range. The Focused Range is defined as at\n least half of the viewport or, if the Component is smaller than half of the viewport, when the\n it is fully visible.\n
 
   /**
@@ -101,7 +101,7 @@ public final class VisibilityState {
   public static final int FULL_IMPRESSION_VISIBLE = 4;
 //                        ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#FULL_IMPRESSION_VISIBLE.
 //                                                display_name FULL_IMPRESSION_VISIBLE
-//                                                documentation ```java\npublic static final int FULL_IMPRESSION_VISIBLE\n```
+//                                                signature_documentation java public static final int FULL_IMPRESSION_VISIBLE
 //                                                documentation  Event triggered when a Component enters the Full Impression Range. This happens, for instance\n in the case of a vertical RecyclerView, when both the top and bottom edges of the component\n become visible.\n
 
   /**
@@ -113,7 +113,7 @@ public final class VisibilityState {
   public static final int PARTIAL_IMPRESSION_VISIBLE = 5;
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_VISIBLE.
 //                                                   display_name PARTIAL_IMPRESSION_VISIBLE
-//                                                   documentation ```java\npublic static final int PARTIAL_IMPRESSION_VISIBLE\n```
+//                                                   signature_documentation java public static final int PARTIAL_IMPRESSION_VISIBLE
 //                                                   documentation  Event triggered when a Component enters the Partial Impression Range. This happens, for\n instance in the case of a vertical RecyclerView, when the percentage of the visible area is\n at least the specified threshold. The threshold can be set in\n {@link EpoxyVisibilityTracker#setPartialImpressionThresholdPercentage(int)}.\n
 
   /**
@@ -125,6 +125,6 @@ public final class VisibilityState {
   public static final int PARTIAL_IMPRESSION_INVISIBLE = 6;
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_INVISIBLE.
 //                                                     display_name PARTIAL_IMPRESSION_INVISIBLE
-//                                                     documentation ```java\npublic static final int PARTIAL_IMPRESSION_INVISIBLE\n```
+//                                                     signature_documentation java public static final int PARTIAL_IMPRESSION_INVISIBLE
 //                                                     documentation  Event triggered when a Component exits the Partial Impression Range. This happens, for\n instance in the case of a vertical RecyclerView, when the percentage of the visible area is\n less than a specified threshold. The threshold can be set in\n {@link EpoxyVisibilityTracker#setPartialImpressionThresholdPercentage(int)}.\n
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
index 89029928a..917cf3a66 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
@@ -23,16 +23,16 @@
 public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#
 //                                                  display_name WrappedEpoxyModelCheckedChangeListener
-//                                                  documentation ```java\npublic class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>\n```
+//                                                  signature_documentation java public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
 //                                                  documentation  Used in the generated models to transform normal checked change listener to model\n checked change.\n
 //                                                  relationship is_implementation semanticdb maven . . OnCheckedChangeListener#
 //                                                  ^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[T]
 //                                                    display_name T
-//                                                    documentation ```java\nT extends EpoxyModel<?>\n```
+//                                                    signature_documentation java T extends EpoxyModel<?>
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                           ^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[V]
 //                                                                             display_name V
-//                                                                             documentation ```java\nV\n```
+//                                                                             signature_documentation java V
     implements OnCheckedChangeListener {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . OnCheckedChangeListener#
 
@@ -42,19 +42,19 @@ public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[V]
 //                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#originalCheckedChangeListener.
 //                                                                               display_name originalCheckedChangeListener
-//                                                                               documentation ```java\nprivate final OnModelCheckedChangeListener<T, V> originalCheckedChangeListener\n```
+//                                                                               signature_documentation java private final OnModelCheckedChangeListener<T, V> originalCheckedChangeListener
 
   public WrappedEpoxyModelCheckedChangeListener(
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#`<init>`().
 //                                              display_name <init>
-//                                              documentation ```java\npublic WrappedEpoxyModelCheckedChangeListener(OnModelCheckedChangeListener<T, V> checkedListener)\n```
+//                                              signature_documentation java public WrappedEpoxyModelCheckedChangeListener(OnModelCheckedChangeListener<T, V> checkedListener)
       OnModelCheckedChangeListener<T, V> checkedListener
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#
 //                                 ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[T]
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[V]
 //                                       ^^^^^^^^^^^^^^^ definition local 0
 //                                                       display_name checkedListener
-//                                                       documentation ```java\nOnModelCheckedChangeListener<T, V> checkedListener\n```
+//                                                       signature_documentation java OnModelCheckedChangeListener<T, V> checkedListener
   ) {
     if (checkedListener == null) {
 //      ^^^^^^^^^^^^^^^ reference local 0
@@ -72,19 +72,19 @@ public WrappedEpoxyModelCheckedChangeListener(
   public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
 //                             display_name onCheckedChanged
-//                             documentation ```java\n@Override\npublic void onCheckedChanged(unresolved_type button, boolean isChecked)\n```
+//                             signature_documentation java @Override\npublic void onCheckedChanged(unresolved_type button, boolean isChecked)
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven . . CompoundButton#
 //                                            ^^^^^^ definition local 1
 //                                                   display_name button
-//                                                   documentation ```java\nunresolved_type button\n```
+//                                                   signature_documentation java unresolved_type button
 //                                                            ^^^^^^^^^ definition local 2
 //                                                                      display_name isChecked
-//                                                                      documentation ```java\nboolean isChecked\n```
+//                                                                      signature_documentation java boolean isChecked
     EpoxyViewHolder epoxyHolder = ListenersUtils.getEpoxyHolderForChildView(button);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                  ^^^^^^^^^^^ definition local 3
 //                              display_name epoxyHolder
-//                              documentation ```java\nEpoxyViewHolder epoxyHolder\n```
+//                              signature_documentation java EpoxyViewHolder epoxyHolder
 //                                ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
 //                                                                          ^^^^^^ reference local 1
@@ -102,7 +102,7 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
     final int adapterPosition = epoxyHolder.getAdapterPosition();
 //            ^^^^^^^^^^^^^^^ definition local 4
 //                            display_name adapterPosition
-//                            documentation ```java\nfinal int adapterPosition\n```
+//                            signature_documentation java final int adapterPosition
 //                              ^^^^^^^^^^^ reference local 3
 //                                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     if (adapterPosition != RecyclerView.NO_POSITION) {
@@ -131,12 +131,12 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
   public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#equals().
 //                      display_name equals
-//                      documentation ```java\n@Override\npublic boolean equals(Object o)\n```
+//                      signature_documentation java @Override\npublic boolean equals(Object o)
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 5
 //                               display_name o
-//                               documentation ```java\nObject o\n```
+//                               signature_documentation java Object o
     if (this == o) {
 //              ^ reference local 5
       return true;
@@ -152,7 +152,7 @@ public boolean equals(Object o) {
         that = (WrappedEpoxyModelCheckedChangeListener<?, ?>) o;
 //      ^^^^ definition local 6
 //           display_name that
-//           documentation ```java\nWrappedEpoxyModelCheckedChangeListener<?, ?> that\n```
+//           signature_documentation java WrappedEpoxyModelCheckedChangeListener<?, ?> that
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#
 //                                                            ^ reference local 5
 
@@ -168,7 +168,7 @@ public boolean equals(Object o) {
   public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#hashCode().
 //                    display_name hashCode
-//                    documentation ```java\n@Override\npublic int hashCode()\n```
+//                    signature_documentation java @Override\npublic int hashCode()
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     return originalCheckedChangeListener.hashCode();
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#originalCheckedChangeListener.
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
index 0b15a9c8b..98b9417ee 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
@@ -4,60 +4,60 @@ package minimized
 case class Issue396(a: Int)
 //         ^^^^^^^^ definition semanticdb maven . . minimized/Issue396#
 //                  display_name Issue396
-//                  documentation ```scala\ncase class Issue396(a: Int)\n```
+//                  signature_documentation scala case class Issue396(a: Int)
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#copy().
 //                  display_name copy
-//                  documentation ```scala\ndef copy(a: Int): Issue396\n```
+//                  signature_documentation scala def copy(a: Int): Issue396
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#productElement().
 //                  display_name productElement
-//                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                  signature_documentation scala def productElement(x$1: Int): Any
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396.
 //                  display_name Issue396
-//                  documentation ```scala\nobject Issue396\n```
+//                  signature_documentation scala object Issue396
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396.apply().
 //                  display_name apply
-//                  documentation ```scala\ndef apply(a: Int): Issue396\n```
+//                  signature_documentation scala def apply(a: Int): Issue396
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Function1#apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#productElementName().
 //                  display_name productElementName
-//                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                  signature_documentation scala def productElementName(x$1: Int): String
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //                 ^ definition semanticdb maven . . minimized/Issue396#`<init>`().
 //                   display_name <init>
-//                   documentation ```scala\ndef this(a: Int)\n```
+//                   signature_documentation scala def this(a: Int)
 //                  ^ definition semanticdb maven . . minimized/Issue396#a.
 //                    display_name a
-//                    documentation ```scala\nval a: Int\n```
+//                    signature_documentation scala val a: Int
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396.apply().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396.apply().(a)
 //                    display_name a
-//                    documentation ```scala\na: Int \n```
+//                    signature_documentation scala a: Int 
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    display_name a
-//                    documentation ```scala\na: Int \n```
+//                    signature_documentation scala a: Int 
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396.apply().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396#copy().(a)
 //                    display_name a
-//                    documentation ```scala\ndefault a: Int \n```
+//                    signature_documentation scala default a: Int 
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
 //                    relationship is_reference semanticdb maven . . minimized/Issue396.apply().(a)
@@ -65,7 +65,7 @@ case class Issue396(a: Int)
 object Issue396App {
 //     ^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue396App.
 //                 display_name Issue396App
-//                 documentation ```scala\nobject Issue396App\n```
+//                 signature_documentation scala object Issue396App
   println(Issue396)
 //^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
 //        ^^^^^^^^ reference semanticdb maven . . minimized/Issue396.
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
index 419593709..cf8cdb6ac 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
@@ -4,17 +4,17 @@ package minimized
 class Issue397 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue397#
 //             display_name Issue397
-//             documentation ```scala\nclass Issue397\n```
+//             signature_documentation scala class Issue397
 //             ^ definition semanticdb maven . . minimized/Issue397#`<init>`().
 //               display_name <init>
-//               documentation ```scala\ndef this()\n```
+//               signature_documentation scala def this()
   var blah = Set("abc")
 //    ^^^^ definition semanticdb maven . . minimized/Issue397#blah().
 //         display_name blah
-//         documentation ```scala\nvar blah: Set[String]\n```
+//         signature_documentation scala var blah: Set[String]
 //    ____ synthetic_definition semanticdb maven . . minimized/Issue397#`blah_=`().
 //         display_name blah_=
-//         documentation ```scala\nvar blah_=(x$1: Set[String]): Unit\n```
+//         signature_documentation scala var blah_=(x$1: Set[String]): Unit
 //         relationship is_definition semanticdb maven . . minimized/Issue397#blah().
 //           ^^^ reference semanticdb maven . . scala/Predef.Set.
 //              ^ reference semanticdb maven . . scala/collection/IterableFactory#apply().
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
index 3a512d48a..33f421274 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
@@ -4,60 +4,60 @@ package minimized
 case class Issue403(value: String)
 //         ^^^^^^^^ definition semanticdb maven . . minimized/Issue403#
 //                  display_name Issue403
-//                  documentation ```scala\ncase class Issue403(value: String)\n```
+//                  signature_documentation scala case class Issue403(value: String)
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#productElementName().
 //                  display_name productElementName
-//                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                  signature_documentation scala def productElementName(x$1: Int): String
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403.apply().
 //                  display_name apply
-//                  documentation ```scala\ndef apply(value: String): Issue403\n```
+//                  signature_documentation scala def apply(value: String): Issue403
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Function1#apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403.
 //                  display_name Issue403
-//                  documentation ```scala\nobject Issue403\n```
+//                  signature_documentation scala object Issue403
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#productElement().
 //                  display_name productElement
-//                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                  signature_documentation scala def productElement(x$1: Int): Any
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#copy().
 //                  display_name copy
-//                  documentation ```scala\ndef copy(value: String): Issue403\n```
+//                  signature_documentation scala def copy(value: String): Issue403
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                 ^ definition semanticdb maven . . minimized/Issue403#`<init>`().
 //                   display_name <init>
-//                   documentation ```scala\ndef this(value: String)\n```
+//                   signature_documentation scala def this(value: String)
 //                  ^^^^^ definition semanticdb maven . . minimized/Issue403#value.
 //                        display_name value
-//                        documentation ```scala\nval value: String\n```
+//                        signature_documentation scala val value: String
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403.apply().(value)
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403#copy().(value)
 //                        display_name value
-//                        documentation ```scala\ndefault value: String \n```
+//                        signature_documentation scala default value: String 
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
 //                        relationship is_reference semanticdb maven . . minimized/Issue403.apply().(value)
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403.apply().(value)
 //                        display_name value
-//                        documentation ```scala\nvalue: String \n```
+//                        signature_documentation scala value: String 
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        display_name value
-//                        documentation ```scala\nvalue: String \n```
+//                        signature_documentation scala value: String 
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
 //                        relationship is_reference semanticdb maven . . minimized/Issue403.apply().(value)
@@ -66,11 +66,11 @@ case class Issue403(value: String)
 object Issue403App {
 //     ^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue403App.
 //                 display_name Issue403App
-//                 documentation ```scala\nobject Issue403App\n```
+//                 signature_documentation scala object Issue403App
   def instantiations(): Unit = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue403App.instantiations().
 //                   display_name instantiations
-//                   documentation ```scala\ndef instantiations(): Unit\n```
+//                   signature_documentation scala def instantiations(): Unit
 //                      ^^^^ reference semanticdb maven . . scala/Unit#
     println(Issue403("a").value)
 //  ^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
@@ -95,7 +95,7 @@ object Issue403App {
 //         ^^^^^^^^ reference semanticdb maven . . minimized/Issue403.
 //                  ^^^^^ definition local 1
 //                        display_name value
-//                        documentation ```scala\nvalue: String \n```
+//                        signature_documentation scala value: String 
         println(value)
 //      ^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
 //              ^^^^^ reference local 1
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
index 1a4f7aa73..12cb7628c 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
@@ -4,29 +4,29 @@ package minimized
 class Issue412 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue412#
 //             display_name Issue412
-//             documentation ```scala\nclass Issue412\n```
+//             signature_documentation scala class Issue412
 //             ^ definition semanticdb maven . . minimized/Issue412#`<init>`().
 //               display_name <init>
-//               documentation ```scala\ndef this()\n```
+//               signature_documentation scala def this()
   val a: Int = 5
 //    ^ definition semanticdb maven . . minimized/Issue412#a.
 //      display_name a
-//      documentation ```scala\nval a: Int\n```
+//      signature_documentation scala val a: Int
 //       ^^^ reference semanticdb maven . . scala/Int#
   val b: Long = a
 //    ^ definition semanticdb maven . . minimized/Issue412#b.
 //      display_name b
-//      documentation ```scala\nval b: Long\n```
+//      signature_documentation scala val b: Long
 //       ^^^^ reference semanticdb maven . . scala/Long#
 //              ^ reference semanticdb maven . . minimized/Issue412#a.
 
   def a(b: Long): Unit = {
 //    ^ definition semanticdb maven . . minimized/Issue412#a().
 //      display_name a
-//      documentation ```scala\ndef a(b: Long): Unit\n```
+//      signature_documentation scala def a(b: Long): Unit
 //      ^ definition semanticdb maven . . minimized/Issue412#a().(b)
 //        display_name b
-//        documentation ```scala\nb: Long \n```
+//        signature_documentation scala b: Long 
 //         ^^^^ reference semanticdb maven . . scala/Long#
 //                ^^^^ reference semanticdb maven . . scala/Unit#
     println(b)
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
index 9fbfc5e02..5a15723eb 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
@@ -4,39 +4,39 @@ package minimized
 trait Issue413 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue413#
 //             display_name Issue413
-//             documentation ```scala\ntrait Issue413\n```
+//             signature_documentation scala trait Issue413
   val b: Int
 //    ^ definition semanticdb maven . . minimized/Issue413#b.
 //      display_name b
-//      documentation ```scala\nval b: Int\n```
+//      signature_documentation scala val b: Int
 //      relationship is_reference is_implementation semanticdb maven . . minimized/Issue413Subclass#b.
 //       ^^^ reference semanticdb maven . . scala/Int#
   val c: Int
 //    ^ definition semanticdb maven . . minimized/Issue413#c.
 //      display_name c
-//      documentation ```scala\nval c: Int\n```
+//      signature_documentation scala val c: Int
 //      relationship is_reference is_implementation semanticdb maven . . minimized/Issue413Subclass#c.
 //       ^^^ reference semanticdb maven . . scala/Int#
 }
 object Issue413 {
 //     ^^^^^^^^ definition semanticdb maven . . minimized/Issue413.
 //              display_name Issue413
-//              documentation ```scala\nobject Issue413\n```
+//              signature_documentation scala object Issue413
   def main(): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/Issue413.main().
 //         display_name main
-//         documentation ```scala\ndef main(): Unit\n```
+//         signature_documentation scala def main(): Unit
 //            ^^^^ reference semanticdb maven . . scala/Unit#
     val a = new Issue413Subclass()
 //      ^ definition local 0
 //        display_name a
-//        documentation ```scala\na: Issue413Subclass \n```
+//        signature_documentation scala a: Issue413Subclass 
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Issue413Subclass#
 //                              ^ reference semanticdb maven . . minimized/Issue413Subclass#`<init>`().
     val b: Issue413 = a
 //      ^ definition local 1
 //        display_name b
-//        documentation ```scala\nb: Issue413 \n```
+//        signature_documentation scala b: Issue413 
 //         ^^^^^^^^ reference semanticdb maven . . minimized/Issue413#
 //                    ^ reference local 0
     println(a.b + b.b)
@@ -52,20 +52,20 @@ object Issue413 {
 class Issue413Subclass extends Issue413 {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue413Subclass#
 //                     display_name Issue413Subclass
-//                     documentation ```scala\nclass Issue413Subclass\n```
+//                     signature_documentation scala class Issue413Subclass
 //                     ^ definition semanticdb maven . . minimized/Issue413Subclass#`<init>`().
 //                       display_name <init>
-//                       documentation ```scala\ndef this()\n```
+//                       signature_documentation scala def this()
 //                             ^^^^^^^^ reference semanticdb maven . . minimized/Issue413#
 //                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   override val b = 10
 //             ^ definition semanticdb maven . . minimized/Issue413Subclass#b.
 //               display_name b
-//               documentation ```scala\nval b: Int\n```
+//               signature_documentation scala val b: Int
 //               relationship is_reference is_implementation semanticdb maven . . minimized/Issue413#b.
   override val c = 10
 //             ^ definition semanticdb maven . . minimized/Issue413Subclass#c.
 //               display_name c
-//               documentation ```scala\nval c: Int\n```
+//               signature_documentation scala val c: Int
 //               relationship is_reference is_implementation semanticdb maven . . minimized/Issue413#c.
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
index 0c5e0f380..1c1bddfa5 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
@@ -4,31 +4,31 @@ package minimized
 object Issue414 {
 //     ^^^^^^^^ definition semanticdb maven . . minimized/Issue414.
 //              display_name Issue414
-//              documentation ```scala\nobject Issue414\n```
+//              signature_documentation scala object Issue414
   trait A {
 //      ^ definition semanticdb maven . . minimized/Issue414.A#
 //        display_name A
-//        documentation ```scala\ntrait A\n```
+//        signature_documentation scala trait A
     def b(): Unit
 //      ^ definition semanticdb maven . . minimized/Issue414.A#b().
 //        display_name b
-//        documentation ```scala\ndef b(): Unit\n```
+//        signature_documentation scala def b(): Unit
 //           ^^^^ reference semanticdb maven . . scala/Unit#
   }
   val a1 =
 //    ^^ definition semanticdb maven . . minimized/Issue414.a1.
 //       display_name a1
-//       documentation ```scala\nval a1: {}\n```
+//       signature_documentation scala val a1: {}
     new A {
 //      ^ definition local 0
 //        display_name $anon
-//        documentation ```scala\nfinal class $anon\n```
+//        signature_documentation scala final class $anon
 //      ^ reference semanticdb maven . . minimized/Issue414.A#
 //        ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       override def b(): Unit = {
 //                 ^ definition local 1
 //                   display_name b
-//                   documentation ```scala\ndef b(): Unit\n```
+//                   signature_documentation scala def b(): Unit
 //                   relationship is_reference is_implementation semanticdb maven . . minimized/Issue414.A#b().
 //                      ^^^^ reference semanticdb maven . . scala/Unit#
         print("Hello")
@@ -38,7 +38,7 @@ object Issue414 {
   val a2: A = a1
 //    ^^ definition semanticdb maven . . minimized/Issue414.a2.
 //       display_name a2
-//       documentation ```scala\nval a2: A\n```
+//       signature_documentation scala val a2: A
 //        ^ reference semanticdb maven . . minimized/Issue414.A#
 //            ^^ reference semanticdb maven . . minimized/Issue414.a1.
   println(a1.b())
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
index d7e18958d..170a9035e 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
@@ -4,7 +4,7 @@ package minimized
 object Issue414Reference {
 //     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue414Reference.
 //                       display_name Issue414Reference
-//                       documentation ```scala\nobject Issue414Reference\n```
+//                       signature_documentation scala object Issue414Reference
   println(Issue414.a1.b())
 //^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
 //        ^^^^^^^^ reference semanticdb maven . . minimized/Issue414.
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
index ae687a827..c2452ece1 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
@@ -5,14 +5,14 @@ package minimized
 object MinimizedScalaMain {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.
 //                        display_name MinimizedScalaMain
-//                        documentation ```scala\nobject MinimizedScalaMain\n```
+//                        signature_documentation scala object MinimizedScalaMain
   def main(args: Array[String]): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.main().
 //         display_name main
-//         documentation ```scala\ndef main(args: Array[String]): Unit\n```
+//         signature_documentation scala def main(args: Array[String]): Unit
 //         ^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.main().(args)
 //              display_name args
-//              documentation ```scala\nargs: Array[String] \n```
+//              signature_documentation scala args: Array[String] 
 //               ^^^^^ reference semanticdb maven . . scala/Array#
 //                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                               ^^^^ reference semanticdb maven . . scala/Unit#
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
index 6be2025e0..998a567fb 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
@@ -7,45 +7,45 @@ package minimized
 case class MinimizedCaseClass(value: String) {
 //         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                            display_name MinimizedCaseClass
-//                            documentation ```scala\ncase class MinimizedCaseClass(value: String)\n```
+//                            signature_documentation scala case class MinimizedCaseClass(value: String)
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#productElement().
 //                            display_name productElement
-//                            documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                            signature_documentation scala def productElement(x$1: Int): Any
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                            relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#productElementName().
 //                            display_name productElementName
-//                            documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                            signature_documentation scala def productElementName(x$1: Int): String
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                            relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#copy().
 //                            display_name copy
-//                            documentation ```scala\ndef copy(value: String): MinimizedCaseClass\n```
+//                            signature_documentation scala def copy(value: String): MinimizedCaseClass
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                           ^ definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().
 //                             display_name <init>
-//                             documentation ```scala\ndef this(value: String)\n```
+//                             signature_documentation scala def this(value: String)
 //                            ^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#value.
 //                                  display_name value
-//                                  documentation ```scala\nval value: String\n```
+//                                  signature_documentation scala val value: String
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  display_name value
-//                                  documentation ```scala\ndefault value: String \n```
+//                                  signature_documentation scala default value: String 
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference is_definition semanticdb maven . . minimized/MinimizedCaseClass#value.
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  display_name value
-//                                  documentation ```scala\nvalue: String \n```
+//                                  signature_documentation scala value: String 
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  relationship is_reference is_definition semanticdb maven . . minimized/MinimizedCaseClass#value.
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                                  display_name value
-//                                  documentation ```scala\nvalue: String \n```
+//                                  signature_documentation scala value: String 
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  relationship is_reference is_definition semanticdb maven . . minimized/MinimizedCaseClass#value.
@@ -53,23 +53,23 @@ case class MinimizedCaseClass(value: String) {
   def this() = this(value = "value")
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`(+1).
 //         display_name <init>
-//         documentation ```scala\ndef this()\n```
+//         signature_documentation scala def this()
 //                 ^ reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().
 //                  ^^^^^ reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 }
 object MinimizedCaseClass {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass.
 //                        display_name MinimizedCaseClass
-//                        documentation ```scala\nobject MinimizedCaseClass\n```
+//                        signature_documentation scala object MinimizedCaseClass
 //                        relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().
 //     __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass.apply().
 //                        display_name apply
-//                        documentation ```scala\ndef apply(value: String): MinimizedCaseClass\n```
+//                        signature_documentation scala def apply(value: String): MinimizedCaseClass
 //                        relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass.
   def main(): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass.main().
 //         display_name main
-//         documentation ```scala\ndef main(): Unit\n```
+//         signature_documentation scala def main(): Unit
 //            ^^^^ reference semanticdb maven . . scala/Unit#
     println(MinimizedCaseClass.apply(value = "value1").copy(value = "value2").value)
 //  ^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
@@ -85,27 +85,27 @@ object MinimizedCaseClass {
 trait MinimizedTrait[T] extends AutoCloseable {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedTrait#
 //                   display_name MinimizedTrait
-//                   documentation ```scala\ntrait MinimizedTrait[T]\n```
+//                   signature_documentation scala trait MinimizedTrait[T]
 //                   ^ definition semanticdb maven . . minimized/MinimizedTrait#[T]
 //                     display_name T
-//                     documentation ```scala\nT\n```
+//                     signature_documentation scala T
 //                              ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/AutoCloseable#
   def add(e: T): T
 //    ^^^ definition semanticdb maven . . minimized/MinimizedTrait#add().
 //        display_name add
-//        documentation ```scala\ndef add(e: T): T\n```
+//        signature_documentation scala def add(e: T): T
 //        ^ definition semanticdb maven . . minimized/MinimizedTrait#add().(e)
 //          display_name e
-//          documentation ```scala\ne: T \n```
+//          signature_documentation scala e: T 
 //           ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
 //               ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
   final def +(e: T): T = add(e)
 //          ^ definition semanticdb maven . . minimized/MinimizedTrait#`+`().
 //            display_name +
-//            documentation ```scala\nfinal def +(e: T): T\n```
+//            signature_documentation scala final def +(e: T): T
 //            ^ definition semanticdb maven . . minimized/MinimizedTrait#`+`().(e)
 //              display_name e
-//              documentation ```scala\ne: T \n```
+//              signature_documentation scala e: T 
 //               ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
 //                   ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
 //                       ^^^ reference semanticdb maven . . minimized/MinimizedTrait#add().
@@ -115,10 +115,10 @@ trait MinimizedTrait[T] extends AutoCloseable {
 class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#
 //                             display_name MinimizedScalaSignatures
-//                             documentation ```scala\nclass MinimizedScalaSignatures\n```
+//                             signature_documentation scala class MinimizedScalaSignatures
 //                             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#`<init>`().
 //                               display_name <init>
-//                               documentation ```scala\ndef this()\n```
+//                               signature_documentation scala def this()
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/AutoCloseable#
 //                                                   ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 //                                                        ^^^^ reference semanticdb maven . . java/
@@ -127,7 +127,7 @@ class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
   def close(): Unit = ()
 //    ^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#close().
 //          display_name close
-//          documentation ```scala\ndef close(): Unit\n```
+//          signature_documentation scala def close(): Unit
 //          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/AutoCloseable#close().
 //             ^^^^ reference semanticdb maven . . scala/Unit#
 }
@@ -135,7 +135,7 @@ class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
 object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable[Int] {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.
 //                              display_name MinimizedScalaSignatures
-//                              documentation ```scala\nobject MinimizedScalaSignatures\n```
+//                              signature_documentation scala object MinimizedScalaSignatures
 //                                      ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/MinimizedScalaSignatures#
 //                                                               ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures#`<init>`().
 //                                                                    ^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Comparable#
@@ -145,10 +145,10 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //        ^ reference semanticdb maven . . scala/inline#`<init>`().
 //            ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotation().
 //                       display_name annotation
-//                       documentation ```scala\n@inline\ndef annotation(x: Int): Int\n```
+//                       signature_documentation scala @inline\ndef annotation(x: Int): Int
 //                       ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotation().(x)
 //                         display_name x
-//                         documentation ```scala\nx: Int \n```
+//                         signature_documentation scala x: Int 
 //                          ^^^ reference semanticdb maven . . scala/Int#
 //                                ^^^ reference semanticdb maven . . scala/Int#
 //                                      ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.annotation().(x)
@@ -158,10 +158,10 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //           ^ reference semanticdb maven . . scala/deprecated#`<init>`().
 //                              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotationMessage().
 //                                                display_name annotationMessage
-//                                                documentation ```scala\n@deprecated\ndef annotationMessage(x: Int): Int\n```
+//                                                signature_documentation scala @deprecated\ndef annotationMessage(x: Int): Int
 //                                                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotationMessage().(x)
 //                                                  display_name x
-//                                                  documentation ```scala\nx: Int \n```
+//                                                  signature_documentation scala x: Int 
 //                                                   ^^^ reference semanticdb maven . . scala/Int#
 //                                                         ^^^ reference semanticdb maven . . scala/Int#
 //                                                               ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.annotationMessage().(x)
@@ -169,183 +169,183 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
   def compareTo(x: Int): Int = ???
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.compareTo().
 //              display_name compareTo
-//              documentation ```scala\ndef compareTo(x: Int): Int\n```
+//              signature_documentation scala def compareTo(x: Int): Int
 //              relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Comparable#compareTo().
 //              ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.compareTo().(x)
 //                display_name x
-//                documentation ```scala\nx: Int \n```
+//                signature_documentation scala x: Int 
 //                 ^^^ reference semanticdb maven . . scala/Int#
 //                       ^^^ reference semanticdb maven . . scala/Int#
 //                             ^^^ reference semanticdb maven . . scala/Predef.`???`().
   def identity[T](e: T): T = e
 //    ^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().
 //             display_name identity
-//             documentation ```scala\ndef identity(e: T): T\n```
+//             signature_documentation scala def identity(e: T): T
 //             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
 //               display_name T
-//               documentation ```scala\nT\n```
+//               signature_documentation scala T
 //                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().(e)
 //                  display_name e
-//                  documentation ```scala\ne: T \n```
+//                  signature_documentation scala e: T 
 //                   ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
 //                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
 //                           ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().(e)
   def tuple(): (Int, String) = null
 //    ^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.tuple().
 //          display_name tuple
-//          documentation ```scala\ndef tuple(): (Int, String)\n```
+//          signature_documentation scala def tuple(): (Int, String)
 //              ^^^ reference semanticdb maven . . scala/Int#
 //                   ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function0(): () => String = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function0().
 //              display_name function0
-//              documentation ```scala\ndef function0(): String=> String\n```
+//              signature_documentation scala def function0(): String=> String
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function1(): Int => String = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function1().
 //              display_name function1
-//              documentation ```scala\ndef function1(): (Int) => String\n```
+//              signature_documentation scala def function1(): (Int) => String
 //                 ^^^ reference semanticdb maven . . scala/Int#
 //                        ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function2(): (Int, String) => Unit = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function2().
 //              display_name function2
-//              documentation ```scala\ndef function2(): (Int, String) => Unit\n```
+//              signature_documentation scala def function2(): (Int, String) => Unit
 //                  ^^^ reference semanticdb maven . . scala/Int#
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                  ^^^^ reference semanticdb maven . . scala/Unit#
   def typeParameter(): Map[Int, String] = null
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.typeParameter().
 //                  display_name typeParameter
-//                  documentation ```scala\ndef typeParameter(): Map[Int, String]\n```
+//                  signature_documentation scala def typeParameter(): Map[Int, String]
 //                     ^^^ reference semanticdb maven . . scala/Predef.Map#
 //                         ^^^ reference semanticdb maven . . scala/Int#
 //                              ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def termParameter(a: Int, b: String): String = null
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().
 //                  display_name termParameter
-//                  documentation ```scala\ndef termParameter(a: Int, b: String): String\n```
+//                  signature_documentation scala def termParameter(a: Int, b: String): String
 //                  ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().(a)
 //                    display_name a
-//                    documentation ```scala\na: Int \n```
+//                    signature_documentation scala a: Int 
 //                     ^^^ reference semanticdb maven . . scala/Int#
 //                          ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().(b)
 //                            display_name b
-//                            documentation ```scala\nb: String \n```
+//                            signature_documentation scala b: String 
 //                             ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                      ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def singletonType(e: String): e.type = e
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().
 //                  display_name singletonType
-//                  documentation ```scala\ndef singletonType(e: String): e.type\n```
+//                  signature_documentation scala def singletonType(e: String): e.type
 //                  ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
 //                    display_name e
-//                    documentation ```scala\ne: String \n```
+//                    signature_documentation scala e: String 
 //                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                              ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
 //                                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
   def thisType(): this.type = this
 //    ^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.thisType().
 //             display_name thisType
-//             documentation ```scala\ndef thisType(): this.type\n```
+//             signature_documentation scala def thisType(): this.type
   def constantInt(): 1 = 1
 //    ^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantInt().
 //                display_name constantInt
-//                documentation ```scala\ndef constantInt(): 1\n```
+//                signature_documentation scala def constantInt(): 1
   def constantString(): "string" = "string"
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantString().
 //                   display_name constantString
-//                   documentation ```scala\ndef constantString(): "string"\n```
+//                   signature_documentation scala def constantString(): "string"
   def constantBoolean(): true = true
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantBoolean().
 //                    display_name constantBoolean
-//                    documentation ```scala\ndef constantBoolean(): true\n```
+//                    signature_documentation scala def constantBoolean(): true
   def constantFloat(): 1.2f = 1.2f
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantFloat().
 //                  display_name constantFloat
-//                  documentation ```scala\ndef constantFloat(): 1.2f\n```
+//                  signature_documentation scala def constantFloat(): 1.2f
   def constantChar(): 'a' = 'a'
 //    ^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantChar().
 //                 display_name constantChar
-//                 documentation ```scala\ndef constantChar(): 'a'\n```
+//                 signature_documentation scala def constantChar(): 'a'
   def structuralType(): { val x: Int; def foo(a: Int): String } = null
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.structuralType().
 //                   display_name structuralType
-//                   documentation ```scala\ndef structuralType(): { val x: Int; def foo(a: Int): String }\n```
+//                   signature_documentation scala def structuralType(): { val x: Int; def foo(a: Int): String }
 //                            ^ definition local 1
 //                              display_name x
-//                              documentation ```scala\nval x: Int\n```
+//                              signature_documentation scala val x: Int
 //                               ^^^ reference semanticdb maven . . scala/Int#
 //                                        ^^^ definition local 2
 //                                            display_name foo
-//                                            documentation ```scala\ndef foo(a: Int): String\n```
+//                                            signature_documentation scala def foo(a: Int): String
 //                                            ^ definition local 3
 //                                              display_name a
-//                                              documentation ```scala\na: Int \n```
+//                                              signature_documentation scala a: Int 
 //                                               ^^^ reference semanticdb maven . . scala/Int#
 //                                                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def byNameType(a: => Int): Unit = ()
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.byNameType().
 //               display_name byNameType
-//               documentation ```scala\ndef byNameType(a: => Int): Unit\n```
+//               signature_documentation scala def byNameType(a: => Int): Unit
 //               ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.byNameType().(a)
 //                 display_name a
-//                 documentation ```scala\na: => Int \n```
+//                 signature_documentation scala a: => Int 
 //                     ^^^ reference semanticdb maven . . scala/Int#
 //                           ^^^^ reference semanticdb maven . . scala/Unit#
   def repeatedType(a: Int*): Unit = ()
 //    ^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.repeatedType().
 //                 display_name repeatedType
-//                 documentation ```scala\ndef repeatedType(a: Int*): Unit\n```
+//                 signature_documentation scala def repeatedType(a: Int*): Unit
 //                 ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.repeatedType().(a)
 //                   display_name a
-//                   documentation ```scala\na: Int* \n```
+//                   signature_documentation scala a: Int* 
 //                    ^^^ reference semanticdb maven . . scala/Int#
 //                           ^^^^ reference semanticdb maven . . scala/Unit#
 
   type TypeAlias = Int
 //     ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeAlias#
 //               display_name TypeAlias
-//               documentation ```scala\ntype TypeAlias >: Int <: Int\n```
+//               signature_documentation scala type TypeAlias >: Int <: Int
 //                 ^^^ reference semanticdb maven . . scala/Int#
   type ParameterizedTypeAlias[A] = () => A
 //     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#
 //                            display_name ParameterizedTypeAlias
-//                            documentation ```scala\ntype ParameterizedTypeAlias >: A=> A <: A=> A\n```
+//                            signature_documentation scala type ParameterizedTypeAlias >: A=> A <: A=> A
 //                            ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#[A]
 //                              display_name A
-//                              documentation ```scala\nA\n```
+//                              signature_documentation scala A
 //                                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#[A]
   type ParameterizedTypeAlias2[A, B] = A => B
 //     ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#
 //                             display_name ParameterizedTypeAlias2
-//                             documentation ```scala\ntype ParameterizedTypeAlias2 >: (A) => B <: (A) => B\n```
+//                             signature_documentation scala type ParameterizedTypeAlias2 >: (A) => B <: (A) => B
 //                             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[A]
 //                               display_name A
-//                               documentation ```scala\nA\n```
+//                               signature_documentation scala A
 //                                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[B]
 //                                  display_name B
-//                                  documentation ```scala\nB\n```
+//                                  signature_documentation scala B
 //                                     ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[A]
 //                                          ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[B]
   type TypeBound
 //     ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeBound#
 //               display_name TypeBound
-//               documentation ```scala\ntype TypeBound\n```
+//               signature_documentation scala type TypeBound
   type TypeUpperBound <: String
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeUpperBound#
 //                    display_name TypeUpperBound
-//                    documentation ```scala\ntype TypeUpperBound <: String\n```
+//                    signature_documentation scala type TypeUpperBound <: String
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   type TypeLowerBound >: CharSequence
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeLowerBound#
 //                    display_name TypeLowerBound
-//                    documentation ```scala\ntype TypeLowerBound >: CharSequence\n```
+//                    signature_documentation scala type TypeLowerBound >: CharSequence
 //                       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
   type TypeLowerUpperBound >: String <: CharSequence 
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeLowerUpperBound#
 //                         display_name TypeLowerUpperBound
-//                         documentation ```scala\ntype TypeLowerUpperBound >: String <: CharSequence\n```
+//                         signature_documentation scala type TypeLowerUpperBound >: String <: CharSequence
 //                            ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
index aa4930a01..2bcdbca98 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
@@ -16,14 +16,14 @@ import scala.concurrent.Future
 class MinimizedScalaSynthetic {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#
 //                            display_name MinimizedScalaSynthetic
-//                            documentation ```scala\nclass MinimizedScalaSynthetic\n```
+//                            signature_documentation scala class MinimizedScalaSynthetic
 //                            ^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#`<init>`().
 //                              display_name <init>
-//                              documentation ```scala\ndef this()\n```
+//                              signature_documentation scala def this()
   def everything(): Unit = Future(1)
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#everything().
 //               display_name everything
-//               documentation ```scala\ndef everything(): Unit\n```
+//               signature_documentation scala def everything(): Unit
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                               ^ reference semanticdb maven . . scala/concurrent/Future.apply().
@@ -31,7 +31,7 @@ class MinimizedScalaSynthetic {
   def applyTree(): Unit = Future.apply[Int](1)
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#applyTree().
 //              display_name applyTree
-//              documentation ```scala\ndef applyTree(): Unit\n```
+//              signature_documentation scala def applyTree(): Unit
 //                 ^^^^ reference semanticdb maven . . scala/Unit#
 //                        ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                               ^^^^^ reference semanticdb maven . . scala/concurrent/Future.apply().
@@ -40,7 +40,7 @@ class MinimizedScalaSynthetic {
   def applyTree2(): Unit = List.apply[Int](1).sorted
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#applyTree2().
 //               display_name applyTree2
-//               documentation ```scala\ndef applyTree2(): Unit\n```
+//               signature_documentation scala def applyTree2(): Unit
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^ reference semanticdb maven . . scala/package.List.
 //                              ^^^^^ reference semanticdb maven . . scala/collection/IterableFactory#apply().
@@ -50,7 +50,7 @@ class MinimizedScalaSynthetic {
   def selectTree(): Unit = Future[Int](1)
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#selectTree().
 //               display_name selectTree
-//               documentation ```scala\ndef selectTree(): Unit\n```
+//               signature_documentation scala def selectTree(): Unit
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                               ^ reference semanticdb maven . . scala/concurrent/Future.apply().
@@ -59,7 +59,7 @@ class MinimizedScalaSynthetic {
   def typeApplyTree(): Unit = Future.apply(1)
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#typeApplyTree().
 //                  display_name typeApplyTree
-//                  documentation ```scala\ndef typeApplyTree(): Unit\n```
+//                  signature_documentation scala def typeApplyTree(): Unit
 //                     ^^^^ reference semanticdb maven . . scala/Unit#
 //                            ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                                   ^^^^^ reference semanticdb maven . . scala/concurrent/Future.apply().
@@ -67,19 +67,19 @@ class MinimizedScalaSynthetic {
   def forComprehensions(): Unit =
 //    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#forComprehensions().
 //                      display_name forComprehensions
-//                      documentation ```scala\ndef forComprehensions(): Unit\n```
+//                      signature_documentation scala def forComprehensions(): Unit
 //                         ^^^^ reference semanticdb maven . . scala/Unit#
     for {
       x <- Future(1)
 //    ^ definition local 0
 //      display_name x
-//      documentation ```scala\nx: Int \n```
+//      signature_documentation scala x: Int 
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //               ^ reference semanticdb maven . . scala/concurrent/Future.apply().
       y <- Future.successful(1)
 //    ^ definition local 1
 //      display_name y
-//      documentation ```scala\ny: Int \n```
+//      signature_documentation scala y: Int 
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                ^^^^^^^^^^ reference semanticdb maven . . scala/concurrent/Future.successful().
       if y < 2
@@ -88,7 +88,7 @@ class MinimizedScalaSynthetic {
       z <- Future.apply[Int](1)
 //    ^ definition local 2
 //      display_name z
-//      documentation ```scala\nz: Int \n```
+//      signature_documentation scala z: Int 
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                ^^^^^ reference semanticdb maven . . scala/concurrent/Future.apply().
 //                      ^^^ reference semanticdb maven . . scala/Int#
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
index 6f2fa82ce..cd9fdcbc9 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
@@ -9,23 +9,23 @@ import scala.language.reflectiveCalls
 class ReflectiveCall {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ReflectiveCall#
 //                   display_name ReflectiveCall
-//                   documentation ```scala\nclass ReflectiveCall\n```
+//                   signature_documentation scala class ReflectiveCall
 //                   ^ definition semanticdb maven . . minimized/ReflectiveCall#`<init>`().
 //                     display_name <init>
-//                     documentation ```scala\ndef this()\n```
+//                     signature_documentation scala def this()
   // Reproduction for https://github.com/scalameta/scalameta/issues/2788
   val a =
 //    ^ definition semanticdb maven . . minimized/ReflectiveCall#a.
 //      display_name a
-//      documentation ```scala\nval a: { val b: Int }\n```
+//      signature_documentation scala val a: { val b: Int }
     new {
 //      ^ definition local 0
 //        display_name $anon
-//        documentation ```scala\nfinal class $anon\n```
+//        signature_documentation scala final class $anon
       val b = 1
 //        ^ definition local 1
 //          display_name b
-//          documentation ```scala\nval b: Int\n```
+//          signature_documentation scala val b: Int
     }
   println(a.b)
 //^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
index a2107b00f..b6e23d2ae 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
@@ -3,15 +3,15 @@
 public abstract class AbstractClasses {
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#
 //                                    display_name AbstractClasses
-//                                    documentation ```java\npublic abstract class AbstractClasses\n```
+//                                    signature_documentation java public abstract class AbstractClasses
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#`<init>`().
 //                                    display_name <init>
-//                                    documentation ```java\npublic AbstractClasses()\n```
+//                                    signature_documentation java public AbstractClasses()
   public String defaultImplementation() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#defaultImplementation().
 //                                    display_name defaultImplementation
-//                                    documentation ```java\npublic String defaultImplementation()\n```
+//                                    signature_documentation java public String defaultImplementation()
     return "";
   }
 
@@ -19,6 +19,6 @@ public String defaultImplementation() {
 //                ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#abstractImplementation().
 //                                              display_name abstractImplementation
-//                                              documentation ```java\npublic abstract String abstractImplementation()\n```
+//                                              signature_documentation java public abstract String abstractImplementation()
 //                                              relationship is_reference is_implementation semanticdb maven . . minimized/SubClasses#abstractImplementation().
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
index 3cce3a442..a0d4b3649 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
@@ -53,18 +53,18 @@
 public @interface Annotations {
 //                ^^^^^^^^^^^ definition semanticdb maven . . minimized/Annotations#
 //                            display_name Annotations
-//                            documentation ```java\n@Documented\n@Retention(RetentionPolicy.RUNTIME)\n@Target({CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})\npublic @interface Annotations\n```
-//                            relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                            signature_documentation java @Documented\n@Retention(RetentionPolicy.RUNTIME)\n@Target({CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})\npublic @interface Annotations
+//                            relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 
   String value() default "";
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //       ^^^^^ definition semanticdb maven . . minimized/Annotations#value().
 //             display_name value
-//             documentation ```java\npublic abstract String value()\n```
+//             signature_documentation java public abstract String value()
 
   String format() default "";
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //       ^^^^^^ definition semanticdb maven . . minimized/Annotations#format().
 //              display_name format
-//              documentation ```java\npublic abstract String format()\n```
+//              signature_documentation java public abstract String format()
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
index 7e63c4d2a..7614f489d 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
@@ -11,24 +11,24 @@
 public class AnonymousClasses {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnonymousClasses#
 //                            display_name AnonymousClasses
-//                            documentation ```java\n@SuppressWarnings("ALL")\npublic class AnonymousClasses\n```
+//                            signature_documentation java @SuppressWarnings("ALL")\npublic class AnonymousClasses
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnonymousClasses#`<init>`().
 //                            display_name <init>
-//                            documentation ```java\npublic AnonymousClasses()\n```
+//                            signature_documentation java public AnonymousClasses()
   public static int app(int n) {
 //                  ^^^ definition semanticdb maven . . minimized/AnonymousClasses#app().
 //                      display_name app
-//                      documentation ```java\npublic static int app(int n)\n```
+//                      signature_documentation java public static int app(int n)
 //                          ^ definition local 0
 //                            display_name n
-//                            documentation ```java\nint n\n```
+//                            signature_documentation java int n
     Function<Integer, Integer> fn =
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //           ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                    ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                             ^^ definition local 1
 //                                display_name fn
-//                                documentation ```java\nFunction<Integer, Integer> fn\n```
+//                                signature_documentation java Function<Integer, Integer> fn
         new Function<Integer, Integer>() {
 //          ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //                   ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
@@ -39,12 +39,12 @@ public Integer apply(Integer integer) {
 //               ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                       ^^^^^ definition local 3
 //                             display_name apply
-//                             documentation ```java\n@Override\npublic Integer apply(Integer integer)\n```
+//                             signature_documentation java @Override\npublic Integer apply(Integer integer)
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/function/Function#apply().
 //                             ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                                     ^^^^^^^ definition local 4
 //                                             display_name integer
-//                                             documentation ```java\nInteger integer\n```
+//                                             signature_documentation java Integer integer
             return integer + n;
 //                 ^^^^^^^ reference local 4
 //                           ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
index 4695448ae..d81342194 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
@@ -3,33 +3,33 @@
 public class Arrays {
 //           ^^^^^^ definition semanticdb maven . . minimized/Arrays#
 //                  display_name Arrays
-//                  documentation ```java\npublic class Arrays\n```
+//                  signature_documentation java public class Arrays
 //           ^^^^^^ definition semanticdb maven . . minimized/Arrays#`<init>`().
 //                  display_name <init>
-//                  documentation ```java\npublic Arrays()\n```
+//                  signature_documentation java public Arrays()
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Arrays#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app()\n```
+//                         signature_documentation java public static String app()
     int[] a = {1, 2, 3};
 //        ^ definition local 0
 //          display_name a
-//          documentation ```java\nint[] a\n```
+//          signature_documentation java int[] a
     String[] b = {"1", "2", "3"};
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^ definition local 1
 //             display_name b
-//             documentation ```java\nString[] b\n```
+//             signature_documentation java String[] b
     int[][] c = {{1}, {2}, {3}};
 //          ^ definition local 2
 //            display_name c
-//            documentation ```java\nint[][] c\n```
+//            signature_documentation java int[][] c
     String[][] d = {{"1"}, {"2"}, {"3"}};
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //             ^ definition local 3
 //               display_name d
-//               documentation ```java\nString[][] d\n```
+//               signature_documentation java String[][] d
     return b[0] + a[0] + c[1][0] + d[1][0];
 //         ^ reference local 1
 //                ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
index bd4b0a4e5..d848ff8de 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
@@ -3,15 +3,15 @@
 public class ClassOf {
 //           ^^^^^^^ definition semanticdb maven . . minimized/ClassOf#
 //                   display_name ClassOf
-//                   documentation ```java\npublic class ClassOf\n```
+//                   signature_documentation java public class ClassOf
 //           ^^^^^^^ definition semanticdb maven . . minimized/ClassOf#`<init>`().
 //                   display_name <init>
-//                   documentation ```java\npublic ClassOf()\n```
+//                   signature_documentation java public ClassOf()
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/ClassOf#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app()\n```
+//                         signature_documentation java public static String app()
     return ClassOf.class.getName();
 //         ^^^^^^^ reference semanticdb maven . . minimized/ClassOf#
 //                 ^^^^^ reference semanticdb maven . . minimized/ClassOf#class.
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
index 7246a5d79..18bb951c5 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
@@ -4,17 +4,17 @@
 public class Docstrings {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#
 //                      display_name Docstrings
-//                      documentation ```java\npublic class Docstrings\n```
+//                      signature_documentation java public class Docstrings
 //                      documentation Example class docstring. 
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#`<init>`().
 //                      display_name <init>
-//                      documentation ```java\npublic Docstrings()\n```
+//                      signature_documentation java public Docstrings()
 
   /** Example field docstring. */
   public static int field = 42;
 //                  ^^^^^ definition semanticdb maven . . minimized/Docstrings#field.
 //                        display_name field
-//                        documentation ```java\npublic static int field\n```
+//                        signature_documentation java public static int field
 //                        documentation Example field docstring. 
 
   /**
@@ -25,7 +25,7 @@ public class Docstrings {
   public static int method() {
 //                  ^^^^^^ definition semanticdb maven . . minimized/Docstrings#method().
 //                         display_name method
-//                         documentation ```java\npublic static int method()\n```
+//                         signature_documentation java public static int method()
 //                         documentation  Example method docstring.\n\n @return 42.\n
     return 42;
   }
@@ -39,11 +39,11 @@ public static int method() {
   public static int methodParameter(int n) {
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#methodParameter().
 //                                  display_name methodParameter
-//                                  documentation ```java\npublic static int methodParameter(int n)\n```
+//                                  signature_documentation java public static int methodParameter(int n)
 //                                  documentation  Example method parameter docstring.\n\n @param n The parameter.\n @return The number + 42.\n
 //                                      ^ definition local 0
 //                                        display_name n
-//                                        documentation ```java\nint n\n```
+//                                        signature_documentation java int n
     return n + 42;
 //         ^ reference local 0
   }
@@ -52,7 +52,7 @@ public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Docstrings#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app()\n```
+//                         signature_documentation java public static String app()
     return String.format("%s%s%s", field, method(), methodParameter(42));
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#format().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
index 812a38a9e..21fab3138 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
@@ -13,42 +13,42 @@
 enum Enums {
 //   ^^^^^ definition semanticdb maven . . minimized/Enums#
 //         display_name Enums
-//         documentation ```java\nenum Enums\n```
+//         signature_documentation java enum Enums
 //         relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //         relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //         relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
   A("A", 420),
 //^ definition semanticdb maven . . minimized/Enums#A.
 //  display_name A("A", 420)
-//  documentation ```java\nEnums.A("A", 420) /* ordinal 0 */\n```
+//  signature_documentation java Enums.A("A", 420) /* ordinal 0 */
 //^ reference semanticdb maven . . minimized/Enums#`<init>`().
   B("B", 1),
 //^ definition semanticdb maven . . minimized/Enums#B.
 //  display_name B("B", 1)
-//  documentation ```java\nEnums.B("B", 1) /* ordinal 1 */\n```
+//  signature_documentation java Enums.B("B", 1) /* ordinal 1 */
 //^ reference semanticdb maven . . minimized/Enums#`<init>`().
   C("C", 5);
 //^ definition semanticdb maven . . minimized/Enums#C.
 //  display_name C("C", 5)
-//  documentation ```java\nEnums.C("C", 5) /* ordinal 2 */\n```
+//  signature_documentation java Enums.C("C", 5) /* ordinal 2 */
 //^ reference semanticdb maven . . minimized/Enums#`<init>`().
   public String value;
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^ definition semanticdb maven . . minimized/Enums#value.
 //                    display_name value
-//                    documentation ```java\npublic String value\n```
+//                    signature_documentation java public String value
 
   Enums(String value, int a) {
 //^^^^^ definition semanticdb maven . . minimized/Enums#`<init>`().
 //      display_name <init>
-//      documentation ```java\nprivate Enums(String value, int a)\n```
+//      signature_documentation java private Enums(String value, int a)
 //      ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //             ^^^^^ definition local 0
 //                   display_name value
-//                   documentation ```java\nString value\n```
+//                   signature_documentation java String value
 //                        ^ definition local 1
 //                          display_name a
-//                          documentation ```java\nint a\n```
+//                          signature_documentation java int a
     this.value = value;
 //       ^^^^^ reference semanticdb maven . . minimized/Enums#value.
 //               ^^^^^ reference local 0
@@ -58,19 +58,19 @@ public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Enums#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app()\n```
+//                         signature_documentation java public static String app()
     String all = Arrays.stream(values()).map(e -> e.value).map(Enums::valueOf).collect(Collectors.toList()).toString();
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^^^ definition local 2
 //             display_name all
-//             documentation ```java\nString all\n```
+//             signature_documentation java String all
 //               ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#stream().
 //                             ^^^^^^ reference semanticdb maven . . minimized/Enums#values().
 //                                       ^^^ reference semanticdb maven jdk 11 java/util/stream/Stream#map().
 //                                           ^ definition local 3
 //                                             display_name e
-//                                             documentation ```java\nEnums e\n```
+//                                             signature_documentation java Enums e
 //                                                ^ reference local 3
 //                                                  ^^^^^ reference semanticdb maven . . minimized/Enums#value.
 //                                                         ^^^ reference semanticdb maven jdk 11 java/util/stream/Stream#map().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
index 2b3f2b1fa..6b41426e0 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
@@ -3,89 +3,89 @@
 public class Fields {
 //           ^^^^^^ definition semanticdb maven . . minimized/Fields#
 //                  display_name Fields
-//                  documentation ```java\npublic class Fields\n```
+//                  signature_documentation java public class Fields
 //           ^^^^^^ definition semanticdb maven . . minimized/Fields#`<init>`().
 //                  display_name <init>
-//                  documentation ```java\npublic Fields()\n```
+//                  signature_documentation java public Fields()
   private final int privateField = 0;
 //                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#privateField.
 //                               display_name privateField
-//                               documentation ```java\nprivate final int privateField\n```
+//                               signature_documentation java private final int privateField
   protected int protectedField = 0;
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#protectedField.
 //                             display_name protectedField
-//                             documentation ```java\nprotected int protectedField\n```
+//                             signature_documentation java protected int protectedField
   public int publicField = 0;
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#publicField.
 //                       display_name publicField
-//                       documentation ```java\npublic int publicField\n```
+//                       signature_documentation java public int publicField
   private static final int staticPrivateField = 0;
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticPrivateField.
 //                                            display_name staticPrivateField
-//                                            documentation ```java\nprivate static final int staticPrivateField\n```
+//                                            signature_documentation java private static final int staticPrivateField
   protected static int staticProtectedFields = 0;
 //                     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticProtectedFields.
 //                                           display_name staticProtectedFields
-//                                           documentation ```java\nprotected static int staticProtectedFields\n```
+//                                           signature_documentation java protected static int staticProtectedFields
   public static int staticPublicField = 0;
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticPublicField.
 //                                    display_name staticPublicField
-//                                    documentation ```java\npublic static int staticPublicField\n```
+//                                    signature_documentation java public static int staticPublicField
 
   public class InnerFields {
 //             ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#
 //                         display_name InnerFields
-//                         documentation ```java\npublic class InnerFields\n```
+//                         signature_documentation java public class InnerFields
 //             ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#`<init>`().
 //                         display_name <init>
-//                         documentation ```java\npublic InnerFields()\n```
+//                         signature_documentation java public InnerFields()
     public int publicInnerField = publicField;
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#publicInnerField.
 //                              display_name publicInnerField
-//                              documentation ```java\npublic int publicInnerField\n```
+//                              signature_documentation java public int publicInnerField
 //                                ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#publicField.
   }
 
   public static class InnerStaticFields {
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#
 //                                      display_name InnerStaticFields
-//                                      documentation ```java\npublic static class InnerStaticFields\n```
+//                                      signature_documentation java public static class InnerStaticFields
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#`<init>`().
 //                                      display_name <init>
-//                                      documentation ```java\npublic InnerStaticFields()\n```
+//                                      signature_documentation java public InnerStaticFields()
     public int publicNonStaticInnerField = 0;
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField.
 //                                       display_name publicNonStaticInnerField
-//                                       documentation ```java\npublic int publicNonStaticInnerField\n```
+//                                       signature_documentation java public int publicNonStaticInnerField
     public static int publicStaticInnerField = 0;
 //                    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField.
 //                                           display_name publicStaticInnerField
-//                                           documentation ```java\npublic static int publicStaticInnerField\n```
+//                                           signature_documentation java public static int publicStaticInnerField
   }
 
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Fields#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app()\n```
+//                         signature_documentation java public static String app()
     Fields fields = new Fields();
 //  ^^^^^^ reference semanticdb maven . . minimized/Fields#
 //         ^^^^^^ definition local 0
 //                display_name fields
-//                documentation ```java\nFields fields\n```
+//                signature_documentation java Fields fields
 //                      ^^^^^^ reference semanticdb maven . . minimized/Fields#`<init>`().
     InnerFields innerFields = fields.new InnerFields();
 //  ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#
 //              ^^^^^^^^^^^ definition local 1
 //                          display_name innerFields
-//                          documentation ```java\nInnerFields innerFields\n```
+//                          signature_documentation java InnerFields innerFields
 //                            ^^^^^^ reference local 0
 //                                       ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#`<init>`().
     InnerStaticFields innerStaticFields = new InnerStaticFields();
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#
 //                    ^^^^^^^^^^^^^^^^^ definition local 2
 //                                      display_name innerStaticFields
-//                                      documentation ```java\nInnerStaticFields innerStaticFields\n```
+//                                      signature_documentation java InnerStaticFields innerStaticFields
 //                                            ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#`<init>`().
     return String.valueOf(fields.privateField)
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
index a2eb0976d..5ec3bda9e 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
@@ -12,34 +12,34 @@
 public class ForComprehensions {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ForComprehensions#
 //                             display_name ForComprehensions
-//                             documentation ```java\npublic class ForComprehensions\n```
+//                             signature_documentation java public class ForComprehensions
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ForComprehensions#`<init>`().
 //                             display_name <init>
-//                             documentation ```java\npublic ForComprehensions()\n```
+//                             signature_documentation java public ForComprehensions()
   public static int app(int n) {
 //                  ^^^ definition semanticdb maven . . minimized/ForComprehensions#app().
 //                      display_name app
-//                      documentation ```java\npublic static int app(int n)\n```
+//                      signature_documentation java public static int app(int n)
 //                          ^ definition local 0
 //                            display_name n
-//                            documentation ```java\nint n\n```
+//                            signature_documentation java int n
     List<Integer> integers = Collections.singletonList(n);
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                ^^^^^^^^ definition local 1
 //                         display_name integers
-//                         documentation ```java\nList<Integer> integers\n```
+//                         signature_documentation java List<Integer> integers
 //                           ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                       ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList().
 //                                                     ^ reference local 0
     int result = 0;
 //      ^^^^^^ definition local 2
 //             display_name result
-//             documentation ```java\nint result\n```
+//             signature_documentation java int result
     for (int i : integers) {
 //           ^ definition local 3
 //             display_name i
-//             documentation ```java\nint i\n```
+//             signature_documentation java int i
 //               ^^^^^^^^ reference local 1
       result += i;
 //    ^^^^^^ reference local 2
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
index b14845ef1..e2f82175b 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
@@ -3,35 +3,35 @@
 public class InnerClasses {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#
 //                        display_name InnerClasses
-//                        documentation ```java\npublic class InnerClasses\n```
+//                        signature_documentation java public class InnerClasses
 
   private final int exampleField;
 //                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#exampleField.
 //                               display_name exampleField
-//                               documentation ```java\nprivate final int exampleField\n```
+//                               signature_documentation java private final int exampleField
 
   private static final String STRING = "asdf";
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^ definition semanticdb maven . . minimized/InnerClasses#STRING.
 //                                   display_name STRING
-//                                   documentation ```java\nprivate static final String STRING\n```
+//                                   signature_documentation java private static final String STRING
 
   private static final int top = 5;
 //                         ^^^ definition semanticdb maven . . minimized/InnerClasses#top.
 //                             display_name top
-//                             documentation ```java\nprivate static final int top\n```
+//                             signature_documentation java private static final int top
   private static final int bottom = 10;
 //                         ^^^^^^ definition semanticdb maven . . minimized/InnerClasses#bottom.
 //                                display_name bottom
-//                                documentation ```java\nprivate static final int bottom\n```
+//                                signature_documentation java private static final int bottom
 
   public InnerClasses(int exampleField) {
 //       ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#`<init>`().
 //                    display_name <init>
-//                    documentation ```java\npublic InnerClasses(int exampleField)\n```
+//                    signature_documentation java public InnerClasses(int exampleField)
 //                        ^^^^^^^^^^^^ definition local 0
 //                                     display_name exampleField
-//                                     documentation ```java\nint exampleField\n```
+//                                     signature_documentation java int exampleField
     this.exampleField = exampleField;
 //       ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#exampleField.
 //                      ^^^^^^^^^^^^ reference local 0
@@ -40,61 +40,61 @@ public InnerClasses(int exampleField) {
   public enum InnerEnum {
 //            ^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#
 //                      display_name InnerEnum
-//                      documentation ```java\npublic enum InnerEnum\n```
+//                      signature_documentation java public enum InnerEnum
 //                      relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                      relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //                      relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
 //            ^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
 //                      display_name <init>
-//                      documentation ```java\nprivate InnerEnum()\n```
+//                      signature_documentation java private InnerEnum()
     A,
 //  ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#A.
 //    display_name A
-//    documentation ```java\nInnerEnum.A /* ordinal 0 */\n```
+//    signature_documentation java InnerEnum.A /* ordinal 0 */
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
     B,
 //  ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#B.
 //    display_name B
-//    documentation ```java\nInnerEnum.B /* ordinal 1 */\n```
+//    signature_documentation java InnerEnum.B /* ordinal 1 */
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
     C
 //  ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#C.
 //    display_name C
-//    documentation ```java\nInnerEnum.C /* ordinal 2 */\n```
+//    signature_documentation java InnerEnum.C /* ordinal 2 */
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
   }
 
   public interface InnerInterface<A, B> {
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                display_name InnerInterface
-//                                documentation ```java\npublic interface InnerInterface<A, B>\n```
+//                                signature_documentation java public interface InnerInterface<A, B>
 //                                ^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#[A]
 //                                  display_name A
-//                                  documentation ```java\nA\n```
+//                                  signature_documentation java A
 //                                   ^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#[B]
 //                                     display_name B
-//                                     documentation ```java\nB\n```
+//                                     signature_documentation java B
     B apply(A a);
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#[B]
 //    ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //          display_name apply
-//          documentation ```java\npublic abstract B apply(A a)\n```
+//          signature_documentation java public abstract B apply(A a)
 //          relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerClass#apply().
 //          ^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#[A]
 //            ^ definition local 1
 //              display_name a
-//              documentation ```java\nA a\n```
+//              signature_documentation java A a
   }
 
   public @interface InnerAnnotation {
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation#
 //                                  display_name InnerAnnotation
-//                                  documentation ```java\npublic @interface InnerAnnotation\n```
-//                                  relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                                  signature_documentation java public @interface InnerAnnotation
+//                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
     int value();
 //      ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation#value().
 //            display_name value
-//            documentation ```java\npublic abstract int value()\n```
+//            signature_documentation java public abstract int value()
   }
 
   @SuppressWarnings(STRING + " ")
@@ -107,21 +107,21 @@ public interface InnerInterface<A, B> {
   public static class InnerStaticClass {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#
 //                                     display_name InnerStaticClass
-//                                     documentation ```java\n@SuppressWarnings(STRING + " ")\n@InnerAnnotation(top / bottom)\npublic static class InnerStaticClass\n```
+//                                     signature_documentation java @SuppressWarnings(STRING + " ")\n@InnerAnnotation(top / bottom)\npublic static class InnerStaticClass
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#`<init>`().
 //                                     display_name <init>
-//                                     documentation ```java\npublic InnerStaticClass()\n```
+//                                     signature_documentation java public InnerStaticClass()
 
     public static void innerStaticMethod() {}
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod().
 //                                       display_name innerStaticMethod
-//                                       documentation ```java\npublic static void innerStaticMethod()\n```
+//                                       signature_documentation java public static void innerStaticMethod()
   }
 
   public class InnerClass implements InnerInterface<Integer, Integer> {
 //             ^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#
 //                        display_name InnerClass
-//                        documentation ```java\npublic class InnerClass\n```
+//                        signature_documentation java public class InnerClass
 //                        relationship is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                   ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                                  ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
@@ -129,15 +129,15 @@ public class InnerClass implements InnerInterface<Integer, Integer> {
     private final int field;
 //                    ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#field.
 //                          display_name field
-//                          documentation ```java\nprivate final int field\n```
+//                          signature_documentation java private final int field
 
     public InnerClass(int field) {
 //         ^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#`<init>`().
 //                    display_name <init>
-//                    documentation ```java\npublic InnerClass(int field)\n```
+//                    signature_documentation java public InnerClass(int field)
 //                        ^^^^^ definition local 2
 //                              display_name field
-//                              documentation ```java\nint field\n```
+//                              signature_documentation java int field
       this.field = field;
 //         ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field.
 //                 ^^^^^ reference local 2
@@ -146,7 +146,7 @@ public InnerClass(int field) {
     public void innerMethod() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#innerMethod().
 //                          display_name innerMethod
-//                          documentation ```java\npublic void innerMethod()\n```
+//                          signature_documentation java public void innerMethod()
       System.out.println(field + exampleField);
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //           ^^^ reference semanticdb maven jdk 11 java/lang/System#out.
@@ -161,12 +161,12 @@ public Integer apply(Integer integer) {
 //         ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                 ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#apply().
 //                       display_name apply
-//                       documentation ```java\n@Override\npublic Integer apply(Integer integer)\n```
+//                       signature_documentation java @Override\npublic Integer apply(Integer integer)
 //                       relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //                       ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                               ^^^^^^^ definition local 3
 //                                       display_name integer
-//                                       documentation ```java\nInteger integer\n```
+//                                       signature_documentation java Integer integer
       return field * integer;
 //           ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field.
 //                   ^^^^^^^ reference local 3
@@ -176,24 +176,24 @@ public Integer apply(Integer integer) {
   private static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a) {
 //                ^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
 //                  display_name A
-//                  documentation ```java\nA\n```
+//                  signature_documentation java A
 //                   ^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
 //                     display_name B
-//                     documentation ```java\nB\n```
+//                     signature_documentation java B
 //                      ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().
 //                                          display_name runInnerInterface
-//                                          documentation ```java\nprivate static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a)\n```
+//                                          signature_documentation java private static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a)
 //                                          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                                         ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
 //                                                            ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
 //                                                               ^^ definition local 4
 //                                                                  display_name fn
-//                                                                  documentation ```java\nInnerInterface<A, B> fn\n```
+//                                                                  signature_documentation java InnerInterface<A, B> fn
 //                                                                   ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
 //                                                                     ^ definition local 5
 //                                                                       display_name a
-//                                                                       documentation ```java\nA a\n```
+//                                                                       signature_documentation java A a
     return fn.apply(a);
 //         ^^ reference local 4
 //            ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
@@ -203,11 +203,11 @@ private static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a) {
   public static void testEnum(InnerEnum magicEnum) {
 //                   ^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#testEnum().
 //                            display_name testEnum
-//                            documentation ```java\npublic static void testEnum(InnerEnum magicEnum)\n```
+//                            signature_documentation java public static void testEnum(InnerEnum magicEnum)
 //                            ^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#
 //                                      ^^^^^^^^^ definition local 6
 //                                                display_name magicEnum
-//                                                documentation ```java\nInnerEnum magicEnum\n```
+//                                                signature_documentation java InnerEnum magicEnum
     if (System.nanoTime() > System.currentTimeMillis()) {
 //      ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#nanoTime().
@@ -260,14 +260,14 @@ public static void testEnum(InnerEnum magicEnum) {
   public static void testAnon() {
 //                   ^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#testAnon().
 //                            display_name testAnon
-//                            documentation ```java\npublic static void testAnon()\n```
+//                            signature_documentation java public static void testAnon()
     InnerInterface<String, String> fn =
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                 ^^ definition local 7
 //                                    display_name fn
-//                                    documentation ```java\nInnerInterface<String, String> fn\n```
+//                                    signature_documentation java InnerInterface<String, String> fn
         new InnerInterface<String, String>() {
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
@@ -278,12 +278,12 @@ public String apply(String s) {
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                      ^^^^^ definition local 9
 //                            display_name apply
-//                            documentation ```java\n@Override\npublic String apply(String s)\n```
+//                            signature_documentation java @Override\npublic String apply(String s)
 //                            relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //                            ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                   ^ definition local 10
 //                                     display_name s
-//                                     documentation ```java\nString s\n```
+//                                     signature_documentation java String s
             return s + "b";
 //                 ^ reference local 10
           }
@@ -300,11 +300,11 @@ public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/InnerClasses#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app()\n```
+//                         signature_documentation java public static String app()
     int a = 42;
 //      ^ definition local 11
 //        display_name a
-//        documentation ```java\nint a\n```
+//        signature_documentation java int a
     InnerStaticClass.innerStaticMethod();
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass#
 //                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod().
@@ -312,14 +312,14 @@ public static String app() {
 //  ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#
 //               ^^^^^^^^^^^^ definition local 12
 //                            display_name innerClasses
-//                            documentation ```java\nInnerClasses innerClasses\n```
+//                            signature_documentation java InnerClasses innerClasses
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#`<init>`().
 //                                               ^ reference local 11
     InnerClass innerClass = innerClasses.new InnerClass(a);
 //  ^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#
 //             ^^^^^^^^^^ definition local 13
 //                        display_name innerClass
-//                        documentation ```java\nInnerClass innerClass\n```
+//                        signature_documentation java InnerClass innerClass
 //                          ^^^^^^^^^^^^ reference local 12
 //                                           ^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#`<init>`().
 //                                                      ^ reference local 11
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
index 5c823d8f2..979b22f1f 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
@@ -3,24 +3,24 @@
 public interface Interfaces {
 //               ^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#
 //                          display_name Interfaces
-//                          documentation ```java\npublic interface Interfaces\n```
+//                          signature_documentation java public interface Interfaces
   static void staticInterfaceMethod() {}
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#staticInterfaceMethod().
 //                                  display_name staticInterfaceMethod
-//                                  documentation ```java\npublic static void staticInterfaceMethod()\n```
+//                                  signature_documentation java public static void staticInterfaceMethod()
 
   String abstractInterfaceMethod();
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod().
 //                               display_name abstractInterfaceMethod
-//                               documentation ```java\npublic abstract String abstractInterfaceMethod()\n```
+//                               signature_documentation java public abstract String abstractInterfaceMethod()
 //                               relationship is_reference is_implementation semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod().
 
   default String defaultInterfaceMethod() {
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#defaultInterfaceMethod().
 //                                      display_name defaultInterfaceMethod
-//                                      documentation ```java\npublic default String defaultInterfaceMethod()\n```
+//                                      signature_documentation java public default String defaultInterfaceMethod()
     return "default";
   }
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
index 8f3534a07..8ba6a1a94 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
@@ -51,45 +51,45 @@
 //      ^^^^^^^ reference semanticdb maven . . lombok/Builder#
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#build(). 1:4
 //              display_name build
-//              documentation ```java\n@SuppressWarnings("all")\npublic Hello build()\n```
+//              signature_documentation java @SuppressWarnings("all")\npublic Hello build()
 //              definition semanticdb maven . . minimized/Hello#builder(). 1:6
 //              display_name builder
-//              documentation ```java\n@SuppressWarnings("all")\npublic static HelloBuilder builder()\n```
+//              signature_documentation java @SuppressWarnings("all")\npublic static HelloBuilder builder()
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#toString(). 1:7
 //              display_name toString
-//              documentation ```java\n@Override\n@SuppressWarnings("all")\npublic String toString()\n```
+//              signature_documentation java @Override\n@SuppressWarnings("all")\npublic String toString()
 //              relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder# 1:11
 //              display_name HelloBuilder
-//              documentation ```java\n@SuppressWarnings("all")\npublic static class HelloBuilder\n```
+//              signature_documentation java @SuppressWarnings("all")\npublic static class HelloBuilder
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#`<init>`(). 1:11
 //              display_name <init>
-//              documentation ```java\n@SuppressWarnings("all")\nHelloBuilder()\n```
+//              signature_documentation java @SuppressWarnings("all")\nHelloBuilder()
 //              reference semanticdb maven . . minimized/Hello#HelloBuilder#`<init>`(). 1:11
 class Hello {
 //    ^^^^^ definition semanticdb maven . . minimized/Hello#
 //          display_name Hello
-//          documentation ```java\n@Builder\nclass Hello\n```
+//          signature_documentation java @Builder\nclass Hello
 //    ^^^^^ definition semanticdb maven . . minimized/Hello#`<init>`().
 //          display_name <init>
-//          documentation ```java\n@SuppressWarnings("all")\nHello(String message)\n```
+//          signature_documentation java @SuppressWarnings("all")\nHello(String message)
 //    ^^^^^ reference semanticdb maven . . minimized/Hello#`<init>`().
 →private String message;
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^ definition local 0
 //                      display_name message
-//                      documentation ```java\nfinal String message\n```
+//                      signature_documentation java final String message
 //              ^^^^^^^ definition local 1
 //                      display_name message
-//                      documentation ```java\nfinal String message\n```
+//                      signature_documentation java final String message
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message().
 //                      display_name message
-//                      documentation ```java\n@SuppressWarnings("all")\npublic HelloBuilder message(String message)\n```
+//                      signature_documentation java @SuppressWarnings("all")\npublic HelloBuilder message(String message)
 //                      documentation @return {@code this}.
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message.
 //                      display_name message
-//                      documentation ```java\n@SuppressWarnings("all")\nprivate String message\n```
+//                      signature_documentation java @SuppressWarnings("all")\nprivate String message
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#message.
 //                      display_name message
-//                      documentation ```java\nprivate String message\n```
+//                      signature_documentation java private String message
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
index cc114b9e1..b05dd6057 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
@@ -3,17 +3,17 @@
 public class Methods {
 //           ^^^^^^^ definition semanticdb maven . . minimized/Methods#
 //                   display_name Methods
-//                   documentation ```java\npublic class Methods\n```
+//                   signature_documentation java public class Methods
 //           ^^^^^^^ definition semanticdb maven . . minimized/Methods#`<init>`().
 //                   display_name <init>
-//                   documentation ```java\npublic Methods()\n```
+//                   signature_documentation java public Methods()
   private int overload(int value) {
 //            ^^^^^^^^ definition semanticdb maven . . minimized/Methods#overload().
 //                     display_name overload
-//                     documentation ```java\nprivate int overload(int value)\n```
+//                     signature_documentation java private int overload(int value)
 //                         ^^^^^ definition local 0
 //                               display_name value
-//                               documentation ```java\nint value\n```
+//                               signature_documentation java int value
     return value + 1;
 //         ^^^^^ reference local 0
   }
@@ -22,11 +22,11 @@ private String overload(String value) {
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^ definition semanticdb maven . . minimized/Methods#overload(+1).
 //                        display_name overload
-//                        documentation ```java\nprivate String overload(String value)\n```
+//                        signature_documentation java private String overload(String value)
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                               ^^^^^ definition local 1
 //                                     display_name value
-//                                     documentation ```java\nString value\n```
+//                                     signature_documentation java String value
     return value + "1";
 //         ^^^^^ reference local 1
   }
@@ -34,10 +34,10 @@ private String overload(String value) {
   private static int staticOverload(int value) {
 //                   ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Methods#staticOverload().
 //                                  display_name staticOverload
-//                                  documentation ```java\nprivate static int staticOverload(int value)\n```
+//                                  signature_documentation java private static int staticOverload(int value)
 //                                      ^^^^^ definition local 2
 //                                            display_name value
-//                                            documentation ```java\nint value\n```
+//                                            signature_documentation java int value
     return value + 1;
 //         ^^^^^ reference local 2
   }
@@ -46,11 +46,11 @@ private static String staticOverload(String value) {
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                      ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Methods#staticOverload(+1).
 //                                     display_name staticOverload
-//                                     documentation ```java\nprivate static String staticOverload(String value)\n```
+//                                     signature_documentation java private static String staticOverload(String value)
 //                                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                            ^^^^^ definition local 3
 //                                                  display_name value
-//                                                  documentation ```java\nString value\n```
+//                                                  signature_documentation java String value
     return value + "1";
 //         ^^^^^ reference local 3
   }
@@ -59,39 +59,39 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Methods#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException\n```
+//                         signature_documentation java public static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException
 //                             ^ definition local 4
 //                               display_name n
-//                               documentation ```java\nint n\n```
+//                               signature_documentation java int n
 //                                ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                       ^ definition local 5
 //                                         display_name m
-//                                         documentation ```java\nString m\n```
+//                                         signature_documentation java String m
 //                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
     Methods methods = new Methods();
 //  ^^^^^^^ reference semanticdb maven . . minimized/Methods#
 //          ^^^^^^^ definition local 6
 //                  display_name methods
-//                  documentation ```java\nMethods methods\n```
+//                  signature_documentation java Methods methods
 //                        ^^^^^^^ reference semanticdb maven . . minimized/Methods#`<init>`().
     int a = staticOverload(n);
 //      ^ definition local 7
 //        display_name a
-//        documentation ```java\nint a\n```
+//        signature_documentation java int a
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload().
 //                         ^ reference local 4
     String b = staticOverload(m);
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^ definition local 8
 //           display_name b
-//           documentation ```java\nString b\n```
+//           signature_documentation java String b
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload(+1).
 //                            ^ reference local 5
     int c = methods.overload(n);
 //      ^ definition local 9
 //        display_name c
-//        documentation ```java\nint c\n```
+//        signature_documentation java int c
 //          ^^^^^^^ reference local 6
 //                  ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload().
 //                           ^ reference local 4
@@ -99,7 +99,7 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^ definition local 10
 //           display_name d
-//           documentation ```java\nString d\n```
+//           signature_documentation java String d
 //             ^^^^^^^ reference local 6
 //                     ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload(+1).
 //                              ^ reference local 5
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
index 335af3db2..4536048df 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
@@ -7,18 +7,18 @@
 public class MinimizedJavaMain {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#
 //                             display_name MinimizedJavaMain
-//                             documentation ```java\n@Annotations(value = "value", format = "format")\npublic class MinimizedJavaMain\n```
+//                             signature_documentation java @Annotations(value = "value", format = "format")\npublic class MinimizedJavaMain
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#`<init>`().
 //                             display_name <init>
-//                             documentation ```java\npublic MinimizedJavaMain()\n```
+//                             signature_documentation java public MinimizedJavaMain()
   public static void main(String[] args) {
 //                   ^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#main().
 //                        display_name main
-//                        documentation ```java\npublic static void main(String[] args)\n```
+//                        signature_documentation java public static void main(String[] args)
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                 ^^^^ definition local 0
 //                                      display_name args
-//                                      documentation ```java\nString[] args\n```
+//                                      signature_documentation java String[] args
     TypeVariables.app(new TypeVariables.CT());
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . minimized/TypeVariables#
 //                ^^^ reference semanticdb maven . . minimized/TypeVariables#app().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
index 721c3ed7f..7fa36d4b8 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
@@ -20,47 +20,47 @@
 public class ParameterizedTypes<A, B extends String> {
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#
 //                              display_name ParameterizedTypes
-//                              documentation ```java\npublic class ParameterizedTypes<A, B extends String>\n```
+//                              signature_documentation java public class ParameterizedTypes<A, B extends String>
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#`<init>`().
 //                              display_name <init>
-//                              documentation ```java\npublic ParameterizedTypes()\n```
+//                              signature_documentation java public ParameterizedTypes()
 //                              ^ definition semanticdb maven . . minimized/ParameterizedTypes#[A]
 //                                display_name A
-//                                documentation ```java\nA\n```
+//                                signature_documentation java A
 //                                 ^ definition semanticdb maven . . minimized/ParameterizedTypes#[B]
 //                                   display_name B
-//                                   documentation ```java\nB extends String\n```
+//                                   signature_documentation java B extends String
 //                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
   public <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list) {}
 //        ^ definition semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T]
 //          display_name T
-//          documentation ```java\nT extends Iterable<A> & Iterator<B>\n```
+//          signature_documentation java T extends Iterable<A> & Iterator<B>
 //                  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                           ^ reference semanticdb maven . . minimized/ParameterizedTypes#[A]
 //                                ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                         ^ reference semanticdb maven . . minimized/ParameterizedTypes#[B]
 //                                                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#iteratorable().
 //                                                               display_name iteratorable
-//                                                               documentation ```java\npublic <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list)\n```
+//                                                               signature_documentation java public <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list)
 //                                                               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                    ^ reference semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T]
 //                                                                       ^^^^ definition local 0
 //                                                                            display_name list
-//                                                                            documentation ```java\nList<T> list\n```
+//                                                                            signature_documentation java List<T> list
 
   public String app(A a, B b) {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^ definition semanticdb maven . . minimized/ParameterizedTypes#app().
 //                  display_name app
-//                  documentation ```java\npublic String app(A a, B b)\n```
+//                  signature_documentation java public String app(A a, B b)
 //                  ^ reference semanticdb maven . . minimized/ParameterizedTypes#[A]
 //                    ^ definition local 1
 //                      display_name a
-//                      documentation ```java\nA a\n```
+//                      signature_documentation java A a
 //                       ^ reference semanticdb maven . . minimized/ParameterizedTypes#[B]
 //                         ^ definition local 2
 //                           display_name b
-//                           documentation ```java\nB b\n```
+//                           signature_documentation java B b
     return a.toString() + b;
 //         ^ reference local 1
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#toString().
@@ -72,7 +72,7 @@ public String app(A a, B b) {
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                ^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#doStuff().
 //                                        display_name doStuff
-//                                        documentation ```java\npublic Map<? extends String, ?> doStuff()\n```
+//                                        signature_documentation java public Map<? extends String, ?> doStuff()
 
   public Quadruplet<String, ?, Object, ? super Integer> createQuadruplet() { return null; }
 //       ^^^^^^^^^^ reference semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#
@@ -81,25 +81,25 @@ public String app(A a, B b) {
 //                                             ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                                                      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#createQuadruplet().
 //                                                                       display_name createQuadruplet
-//                                                                       documentation ```java\npublic Quadruplet<String, ?, Object, ? super Integer> createQuadruplet()\n```
+//                                                                       signature_documentation java public Quadruplet<String, ?, Object, ? super Integer> createQuadruplet()
 
   public static class Quadruplet<T, S, X, Y> {}
 //                    ^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#
 //                               display_name Quadruplet
-//                               documentation ```java\npublic static class Quadruplet<T, S, X, Y>\n```
+//                               signature_documentation java public static class Quadruplet<T, S, X, Y>
 //                    ^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#`<init>`().
 //                               display_name <init>
-//                               documentation ```java\npublic Quadruplet()\n```
+//                               signature_documentation java public Quadruplet()
 //                               ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[T]
 //                                 display_name T
-//                                 documentation ```java\nT\n```
+//                                 signature_documentation java T
 //                                  ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[S]
 //                                    display_name S
-//                                    documentation ```java\nS\n```
+//                                    signature_documentation java S
 //                                     ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[X]
 //                                       display_name X
-//                                       documentation ```java\nX\n```
+//                                       signature_documentation java X
 //                                        ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[Y]
 //                                          display_name Y
-//                                          documentation ```java\nY\n```
+//                                          signature_documentation java Y
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
index b8cfa3ca0..8242514c7 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
@@ -8,67 +8,67 @@
 public class Primitives {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Primitives#
 //                      display_name Primitives
-//                      documentation ```java\npublic class Primitives\n```
+//                      signature_documentation java public class Primitives
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Primitives#`<init>`().
 //                      display_name <init>
-//                      documentation ```java\npublic Primitives()\n```
+//                      signature_documentation java public Primitives()
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Primitives#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app()\n```
+//                         signature_documentation java public static String app()
     Random random = new Random();
 //  ^^^^^^ reference semanticdb maven jdk 11 java/util/Random#
 //         ^^^^^^ definition local 0
 //                display_name random
-//                documentation ```java\nRandom random\n```
+//                signature_documentation java Random random
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/Random#`<init>`().
     byte a = (byte) random.nextInt();
 //       ^ definition local 1
 //         display_name a
-//         documentation ```java\nbyte a\n```
+//         signature_documentation java byte a
 //                  ^^^^^^ reference local 0
 //                         ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     short b = (short) random.nextInt();
 //        ^ definition local 2
 //          display_name b
-//          documentation ```java\nshort b\n```
+//          signature_documentation java short b
 //                    ^^^^^^ reference local 0
 //                           ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     int c = random.nextInt();
 //      ^ definition local 3
 //        display_name c
-//        documentation ```java\nint c\n```
+//        signature_documentation java int c
 //          ^^^^^^ reference local 0
 //                 ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     long d = random.nextLong();
 //       ^ definition local 4
 //         display_name d
-//         documentation ```java\nlong d\n```
+//         signature_documentation java long d
 //           ^^^^^^ reference local 0
 //                  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextLong().
     char e = (char) random.nextInt();
 //       ^ definition local 5
 //         display_name e
-//         documentation ```java\nchar e\n```
+//         signature_documentation java char e
 //                  ^^^^^^ reference local 0
 //                         ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     float f = (float) random.nextDouble();
 //        ^ definition local 6
 //          display_name f
-//          documentation ```java\nfloat f\n```
+//          signature_documentation java float f
 //                    ^^^^^^ reference local 0
 //                           ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble().
     double g = (double) random.nextDouble();
 //         ^ definition local 7
 //           display_name g
-//           documentation ```java\ndouble g\n```
+//           signature_documentation java double g
 //                      ^^^^^^ reference local 0
 //                             ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble().
     boolean h = random.nextBoolean();
 //          ^ definition local 8
 //            display_name h
-//            documentation ```java\nboolean h\n```
+//            signature_documentation java boolean h
 //              ^^^^^^ reference local 0
 //                     ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextBoolean().
     return "" + a + b + c + d + e + f + g + h;
@@ -85,5 +85,5 @@ public static String app() {
   public static void test() {}
 //                   ^^^^ definition semanticdb maven . . minimized/Primitives#test().
 //                        display_name test
-//                        documentation ```java\npublic static void test()\n```
+//                        signature_documentation java public static void test()
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
index 1838c8991..8cccae587 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
@@ -14,15 +14,15 @@
 public class RawTypes {
 //           ^^^^^^^^ definition semanticdb maven . . minimized/RawTypes#
 //                    display_name RawTypes
-//                    documentation ```java\n@SuppressWarnings("ALL")\npublic class RawTypes\n```
+//                    signature_documentation java @SuppressWarnings("ALL")\npublic class RawTypes
 //           ^^^^^^^^ definition semanticdb maven . . minimized/RawTypes#`<init>`().
 //                    display_name <init>
-//                    documentation ```java\npublic RawTypes()\n```
+//                    signature_documentation java public RawTypes()
   public static final List x = Collections.singletonList(42);
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                         ^ definition semanticdb maven . . minimized/RawTypes#x.
 //                           display_name x
-//                           documentation ```java\npublic static final List x\n```
+//                           signature_documentation java public static final List x
 //                             ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                         ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList().
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
index a2e9d355d..aab6c1304 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
@@ -3,12 +3,12 @@
 public class SubClasses extends AbstractClasses implements Interfaces {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#
 //                      display_name SubClasses
-//                      documentation ```java\npublic class SubClasses\n```
+//                      signature_documentation java public class SubClasses
 //                      relationship is_implementation semanticdb maven . . minimized/AbstractClasses#
 //                      relationship is_implementation semanticdb maven . . minimized/Interfaces#
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#`<init>`().
 //                      display_name <init>
-//                      documentation ```java\npublic SubClasses()\n```
+//                      signature_documentation java public SubClasses()
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AbstractClasses#
 //                                                         ^^^^^^^^^^ reference semanticdb maven . . minimized/Interfaces#
 
@@ -18,7 +18,7 @@ public String abstractImplementation() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#abstractImplementation().
 //                                     display_name abstractImplementation
-//                                     documentation ```java\n@Override\npublic String abstractImplementation()\n```
+//                                     signature_documentation java @Override\npublic String abstractImplementation()
 //                                     relationship is_reference is_implementation semanticdb maven . . minimized/AbstractClasses#abstractImplementation().
     return "abstract";
   }
@@ -29,7 +29,7 @@ public String abstractInterfaceMethod() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod().
 //                                      display_name abstractInterfaceMethod
-//                                      documentation ```java\n@Override\npublic String abstractInterfaceMethod()\n```
+//                                      signature_documentation java @Override\npublic String abstractInterfaceMethod()
 //                                      relationship is_reference is_implementation semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod().
     return "abstractInterface";
   }
@@ -38,12 +38,12 @@ public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/SubClasses#app().
 //                         display_name app
-//                         documentation ```java\npublic static String app()\n```
+//                         signature_documentation java public static String app()
     SubClasses s = new SubClasses();
 //  ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#
 //             ^ definition local 0
 //               display_name s
-//               documentation ```java\nSubClasses s\n```
+//               signature_documentation java SubClasses s
 //                     ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#`<init>`().
     return s.abstractImplementation()
 //         ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
index ad6425159..28ba5ecea 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
@@ -3,31 +3,31 @@
 public class TabIndented {
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/TabIndented#
 //                       display_name TabIndented
-//                       documentation ```java\npublic class TabIndented\n```
+//                       signature_documentation java public class TabIndented
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/TabIndented#`<init>`().
 //                       display_name <init>
-//                       documentation ```java\npublic TabIndented()\n```
+//                       signature_documentation java public TabIndented()
 →public void app() {
 //           ^^^ definition semanticdb maven . . minimized/TabIndented#app().
 //               display_name app
-//               documentation ```java\npublic void app()\n```
+//               signature_documentation java public void app()
 →→Object o = new Object() {
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //       ^ definition local 0
 //         display_name o
-//         documentation ```java\nObject o\n```
+//         signature_documentation java Object o
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 →→→@Override
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
 →→→public boolean equals(Object other) {
 //                ^^^^^^ definition local 2
 //                       display_name equals
-//                       documentation ```java\n@Override\npublic boolean equals(Object other)\n```
+//                       signature_documentation java @Override\npublic boolean equals(Object other)
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                              ^^^^^ definition local 3
 //                                    display_name other
-//                                    documentation ```java\nObject other\n```
+//                                    signature_documentation java Object other
 →→→→return false;
 →→→}
 
@@ -36,7 +36,7 @@ public class TabIndented {
 →→→public int hashCode() {
 //            ^^^^^^^^ definition local 4
 //                     display_name hashCode
-//                     documentation ```java\n@Override\npublic int hashCode()\n```
+//                     signature_documentation java @Override\npublic int hashCode()
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
 →→→→return System.identityHashCode(this);
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
@@ -49,7 +49,7 @@ public class TabIndented {
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^ definition local 5
 //                        display_name toString
-//                        documentation ```java\n@Override\npublic String toString()\n```
+//                        signature_documentation java @Override\npublic String toString()
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 →→→→return "";
 →→→}
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
index 626933cef..579559a60 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
@@ -4,76 +4,76 @@
 public class TypeVariables {
 //           ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#
 //                         display_name TypeVariables
-//                         documentation ```java\npublic class TypeVariables\n```
+//                         signature_documentation java public class TypeVariables
 //                         documentation Example from https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4 
 //           ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#`<init>`().
 //                         display_name <init>
-//                         documentation ```java\npublic TypeVariables()\n```
+//                         signature_documentation java public TypeVariables()
   static class C {
 //             ^ definition semanticdb maven . . minimized/TypeVariables#C#
 //               display_name C
-//               documentation ```java\nstatic class C\n```
+//               signature_documentation java static class C
 //             ^ definition semanticdb maven . . minimized/TypeVariables#C#`<init>`().
 //               display_name <init>
-//               documentation ```java\nC()\n```
+//               signature_documentation java C()
     public void mCPublic() {}
 //              ^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCPublic().
 //                       display_name mCPublic
-//                       documentation ```java\npublic void mCPublic()\n```
+//                       signature_documentation java public void mCPublic()
 
     protected void mCProtected() {}
 //                 ^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCProtected().
 //                             display_name mCProtected
-//                             documentation ```java\nprotected void mCProtected()\n```
+//                             signature_documentation java protected void mCProtected()
 
     void mCPackage() {}
 //       ^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCPackage().
 //                 display_name mCPackage
-//                 documentation ```java\nvoid mCPackage()\n```
+//                 signature_documentation java void mCPackage()
   }
 
   interface I {
 //          ^ definition semanticdb maven . . minimized/TypeVariables#I#
 //            display_name I
-//            documentation ```java\ninterface I\n```
+//            signature_documentation java interface I
     void mI();
 //       ^^ definition semanticdb maven . . minimized/TypeVariables#I#mI().
 //          display_name mI
-//          documentation ```java\npublic abstract void mI()\n```
+//          signature_documentation java public abstract void mI()
 //          relationship is_reference is_implementation semanticdb maven . . minimized/TypeVariables#CT#mI().
   }
 
   static class CT extends C implements I {
 //             ^^ definition semanticdb maven . . minimized/TypeVariables#CT#
 //                display_name CT
-//                documentation ```java\nstatic class CT\n```
+//                signature_documentation java static class CT
 //                relationship is_implementation semanticdb maven . . minimized/TypeVariables#C#
 //                relationship is_implementation semanticdb maven . . minimized/TypeVariables#I#
 //             ^^ definition semanticdb maven . . minimized/TypeVariables#CT#`<init>`().
 //                display_name <init>
-//                documentation ```java\nCT()\n```
+//                signature_documentation java CT()
 //                        ^ reference semanticdb maven . . minimized/TypeVariables#C#
 //                                     ^ reference semanticdb maven . . minimized/TypeVariables#I#
     public void mI() {}
 //              ^^ definition semanticdb maven . . minimized/TypeVariables#CT#mI().
 //                 display_name mI
-//                 documentation ```java\npublic void mI()\n```
+//                 signature_documentation java public void mI()
 //                 relationship is_reference is_implementation semanticdb maven . . minimized/TypeVariables#I#mI().
   }
 
   public static <T extends C & I> void app(T t) {
 //               ^ definition semanticdb maven . . minimized/TypeVariables#app().[T]
 //                 display_name T
-//                 documentation ```java\nT extends C & I\n```
+//                 signature_documentation java T extends C & I
 //                         ^ reference semanticdb maven . . minimized/TypeVariables#C#
 //                             ^ reference semanticdb maven . . minimized/TypeVariables#I#
 //                                     ^^^ definition semanticdb maven . . minimized/TypeVariables#app().
 //                                         display_name app
-//                                         documentation ```java\npublic static <T extends C & I> void app(T t)\n```
+//                                         signature_documentation java public static <T extends C & I> void app(T t)
 //                                         ^ reference semanticdb maven . . minimized/TypeVariables#app().[T]
 //                                           ^ definition local 0
 //                                             display_name t
-//                                             documentation ```java\nT t\n```
+//                                             signature_documentation java T t
     t.mI();
 //  ^ reference local 0
 //    ^^ reference semanticdb maven . . minimized/TypeVariables#I#mI().
diff --git a/tests/snapshots/src/main/generated/ujson/AstTransformer.scala b/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
index 618fa39e4..33ea195b5 100644
--- a/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
+++ b/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
@@ -12,10 +12,10 @@ import upickle.core.compat._
 trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
 //                   display_name AstTransformer
-//                   documentation ```scala\ntrait AstTransformer[I]\n```
+//                   signature_documentation scala trait AstTransformer[I]
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                     display_name I
-//                     documentation ```scala\nI\n```
+//                     signature_documentation scala I
 //                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
@@ -24,10 +24,10 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
   def apply(t: Readable): I = t.transform(this)
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#apply().
 //          display_name apply
-//          documentation ```scala\ndef apply(t: Readable): I\n```
+//          signature_documentation scala def apply(t: Readable): I
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#apply().(t)
 //            display_name t
-//            documentation ```scala\nt: Readable \n```
+//            signature_documentation scala t: Readable 
 //             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#apply().(t)
@@ -36,33 +36,33 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
   def transformArray[T](f: Visitor[_, T], items: Iterable[I]) = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().
 //                   display_name transformArray
-//                   documentation ```scala\ndef transformArray(f: Visitor[local0, T[, items: Iterable[I]): T\n```
+//                   signature_documentation scala def transformArray(f: Visitor[local0, T[, items: Iterable[I]): T
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().[T]
 //                     display_name T
-//                     documentation ```scala\nT\n```
+//                     signature_documentation scala T
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(f)
 //                        display_name f
-//                        documentation ```scala\nf: Visitor[local0, T[ \n```
+//                        signature_documentation scala f: Visitor[local0, T[ 
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().[T]
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
 //                                              display_name items
-//                                              documentation ```scala\nitems: Iterable[I] \n```
-//                                               ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Iterable#
+//                                              signature_documentation scala items: Iterable[I] 
+//                                               ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Iterable#
 //                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
     val ctx = f.visitArray(items.size, -1).narrow
 //      ^^^ definition local 1
 //          display_name ctx
-//          documentation ```scala\nctx: ArrVisitor[Any, T] \n```
+//          signature_documentation scala ctx: ArrVisitor[Any, T] 
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(f)
 //              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
-//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#size().
+//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#size().
 //                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#narrow().
     for(item <- items) ctx.visitValue(transform(item, ctx.subVisitor), -1)
 //      ^^^^ definition local 2
 //           display_name item
-//           documentation ```scala\nitem: I \n```
+//           signature_documentation scala item: I 
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
 //                     ^^^ reference local 1
 //                         ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
@@ -77,39 +77,39 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
   def transformObject[T](f: Visitor[_, T], items: Iterable[(String, I)]) = {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().
 //                    display_name transformObject
-//                    documentation ```scala\ndef transformObject(f: Visitor[local3, T[, items: Iterable[(String, I)]): T\n```
+//                    signature_documentation scala def transformObject(f: Visitor[local3, T[, items: Iterable[(String, I)]): T
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().[T]
 //                      display_name T
-//                      documentation ```scala\nT\n```
+//                      signature_documentation scala T
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(f)
 //                         display_name f
-//                         documentation ```scala\nf: Visitor[local3, T[ \n```
+//                         signature_documentation scala f: Visitor[local3, T[ 
 //                          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().[T]
 //                                         ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
 //                                               display_name items
-//                                               documentation ```scala\nitems: Iterable[(String, I)] \n```
-//                                                ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Iterable#
-//                                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                               signature_documentation scala items: Iterable[(String, I)] 
+//                                                ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Iterable#
+//                                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
     val ctx = f.visitObject(items.size, -1).narrow
 //      ^^^ definition local 4
 //          display_name ctx
-//          documentation ```scala\nctx: ObjVisitor[Any, T] \n```
+//          signature_documentation scala ctx: ObjVisitor[Any, T] 
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(f)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
-//                                ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#size().
+//                                ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#size().
 //                                          ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#narrow().
     for(kv <- items) {
 //      ^^ definition local 5
 //         display_name kv
-//         documentation ```scala\nkv: (String, I) \n```
+//         signature_documentation scala kv: (String, I) 
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
       val keyVisitor = ctx.visitKey(-1)
 //        ^^^^^^^^^^ definition local 6
 //                   display_name keyVisitor
-//                   documentation ```scala\nkeyVisitor: Visitor[local7, Any[ \n```
+//                   signature_documentation scala keyVisitor: Visitor[local7, Any[ 
 //                     ^^^ reference local 4
 //                         ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
       ctx.visitKeyValue(keyVisitor.visitString(kv._1, -1))
@@ -118,13 +118,13 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                      ^^^^^^^^^^ reference local 6
 //                                 ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                             ^^ reference local 5
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
       ctx.visitValue(transform(kv._2, ctx.subVisitor), -1)
 //    ^^^ reference local 4
 //        ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //                             ^^ reference local 5
-//                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
+//                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_2.
 //                                    ^^^ reference local 4
 //                                        ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
     }
@@ -136,34 +136,34 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
   class AstObjVisitor[T](build: T => I)
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#
 //                    display_name AstObjVisitor
-//                    documentation ```scala\nclass AstObjVisitor[T]\n```
+//                    signature_documentation scala class AstObjVisitor[T]
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#[T]
 //                      display_name T
-//                      documentation ```scala\nT\n```
+//                      signature_documentation scala T
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().
 //                        display_name <init>
-//                        documentation ```scala\ndef this(build: (T) => I)(factory: Factory[(String, I), T])\n```
+//                        signature_documentation scala def this(build: (T) => I)(factory: Factory[(String, I), T])
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
 //                             display_name build
-//                             documentation ```scala\nprivate[this] val build: (T) => I\n```
+//                             signature_documentation scala private[this] val build: (T) => I
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(build)
 //                       _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(build)
 //                             display_name build
-//                             documentation ```scala\nbuild: (T) => I \n```
+//                             signature_documentation scala build: (T) => I 
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
 //                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#[T]
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
                         (implicit factory: Factory[(String, I), T])extends ObjVisitor[I, I] {
 //                                ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
 //                                        display_name factory
-//                                        documentation ```scala\nprivate[this] implicit val factory: Factory[(String, I), T]\n```
+//                                        signature_documentation scala private[this] implicit val factory: Factory[(String, I), T]
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(factory)
 //                                _______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(factory)
 //                                        display_name factory
-//                                        documentation ```scala\nimplicit factory: Factory[(String, I), T] \n```
+//                                        signature_documentation scala implicit factory: Factory[(String, I), T] 
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/compat/package.Factory#
-//                                                  ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                                  ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#[T]
 //                                                                         ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
@@ -174,46 +174,46 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
     private[this] var key: String = null
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
 //                        display_name key
-//                        documentation ```scala\nprivate[this] var key: String\n```
+//                        signature_documentation scala private[this] var key: String
 //                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`key_=`().
 //                        display_name key_=
-//                        documentation ```scala\nprivate[this] var key_=(x$1: String): Unit\n```
+//                        signature_documentation scala private[this] var key_=(x$1: String): Unit
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
-//                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
     private[this] val vs = factory.newBuilder
 //                    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
 //                       display_name vs
-//                       documentation ```scala\nprivate[this] val vs: Builder[(String, I), T]\n```
+//                       signature_documentation scala private[this] val vs: Builder[(String, I), T]
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
-//                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/Factory#newBuilder().
+//                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/Factory#newBuilder().
     def subVisitor = AstTransformer.this
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#subVisitor().
 //                 display_name subVisitor
-//                 documentation ```scala\ndef subVisitor: AstTransformer[I]\n```
+//                 signature_documentation scala def subVisitor: AstTransformer[I]
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
     def visitKey(index: Int) = upickle.core.StringVisitor
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKey().
 //               display_name visitKey
-//               documentation ```scala\ndef visitKey(index: Int): StringVisitor\n```
+//               signature_documentation scala def visitKey(index: Int): StringVisitor
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKey().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^^^ reference semanticdb maven . . upickle/
 //                                     ^^^^ reference semanticdb maven . . upickle/core/
 //                                          ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/StringVisitor.
     def visitKeyValue(s: Any): Unit = key = s.toString
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKeyValue().
 //                    display_name visitKeyValue
-//                    documentation ```scala\ndef visitKeyValue(s: Any): Unit\n```
+//                    signature_documentation scala def visitKeyValue(s: Any): Unit
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKeyValue().(s)
 //                      display_name s
-//                      documentation ```scala\ns: Any \n```
+//                      signature_documentation scala s: Any 
 //                       ^^^ reference semanticdb maven . . scala/Any#
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKeyValue().(s)
 //                                            ^^^^^^^^ reference semanticdb maven . . scala/Any#toString().
@@ -221,53 +221,53 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
     def visitValue(v: I, index: Int): Unit = vs += (key -> v)
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().
 //                 display_name visitValue
-//                 documentation ```scala\ndef visitValue(v: I, index: Int): Unit\n```
+//                 signature_documentation scala def visitValue(v: I, index: Int): Unit
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().(v)
 //                   display_name v
-//                   documentation ```scala\nv: I \n```
+//                   signature_documentation scala v: I 
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().(index)
 //                             display_name index
-//                             documentation ```scala\nindex: Int \n```
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             signature_documentation scala index: Int 
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                           ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
-//                                              ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Growable#`+=`().
+//                                              ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
 //                                                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
-//                                                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrowAssoc#`->`().
+//                                                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrowAssoc#`->`().
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().(v)
 
     def visitEnd(index: Int) = build(vs.result)
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitEnd().
 //               display_name visitEnd
-//               documentation ```scala\ndef visitEnd(index: Int): I\n```
+//               signature_documentation scala def visitEnd(index: Int): I
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitEnd().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
 //                                   ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
-//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Builder#result().
+//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Builder#result().
   }
   class AstArrVisitor[T[_]](build: T[I] => I)
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#
 //                    display_name AstArrVisitor
-//                    documentation ```scala\nclass AstArrVisitor[T]\n```
+//                    signature_documentation scala class AstArrVisitor[T]
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#[T]
 //                      display_name T
-//                      documentation ```scala\nT\n```
+//                      signature_documentation scala T
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().
 //                           display_name <init>
-//                           documentation ```scala\ndef this(build: (T[I]) => I)(factory: Factory[I, T[I]])\n```
+//                           signature_documentation scala def this(build: (T[I]) => I)(factory: Factory[I, T[I]])
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
 //                                display_name build
-//                                documentation ```scala\nprivate[this] val build: (T[I]) => I\n```
+//                                signature_documentation scala private[this] val build: (T[I]) => I
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(build)
 //                          _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(build)
 //                                display_name build
-//                                documentation ```scala\nbuild: (T[I]) => I \n```
+//                                signature_documentation scala build: (T[I]) => I 
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#[T]
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
@@ -275,11 +275,11 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
                            (implicit factory: Factory[I, T[I]]) extends ArrVisitor[I, I]{
 //                                   ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
 //                                           display_name factory
-//                                           documentation ```scala\nprivate[this] implicit val factory: Factory[I, T[I]]\n```
+//                                           signature_documentation scala private[this] implicit val factory: Factory[I, T[I]]
 //                                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(factory)
 //                                   _______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(factory)
 //                                           display_name factory
-//                                           documentation ```scala\nimplicit factory: Factory[I, T[I]] \n```
+//                                           signature_documentation scala implicit factory: Factory[I, T[I]] 
 //                                           relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/compat/package.Factory#
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
@@ -292,44 +292,44 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
     def subVisitor = AstTransformer.this
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#subVisitor().
 //                 display_name subVisitor
-//                 documentation ```scala\ndef subVisitor: AstTransformer[I]\n```
+//                 signature_documentation scala def subVisitor: AstTransformer[I]
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
     private[this] val vs = factory.newBuilder
 //                    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
 //                       display_name vs
-//                       documentation ```scala\nprivate[this] val vs: Builder[I, T[I]]\n```
+//                       signature_documentation scala private[this] val vs: Builder[I, T[I]]
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
-//                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/Factory#newBuilder().
+//                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/Factory#newBuilder().
     def visitValue(v: I, index: Int): Unit = vs += v
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().
 //                 display_name visitValue
-//                 documentation ```scala\ndef visitValue(v: I, index: Int): Unit\n```
+//                 signature_documentation scala def visitValue(v: I, index: Int): Unit
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().(v)
 //                   display_name v
-//                   documentation ```scala\nv: I \n```
+//                   signature_documentation scala v: I 
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().(index)
 //                             display_name index
-//                             documentation ```scala\nindex: Int \n```
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                             signature_documentation scala index: Int 
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                           ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
-//                                              ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Growable#`+=`().
+//                                              ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().(v)
 
     def visitEnd(index: Int) = build(vs.result())
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitEnd().
 //               display_name visitEnd
-//               documentation ```scala\ndef visitEnd(index: Int): I\n```
+//               signature_documentation scala def visitEnd(index: Int): I
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitEnd().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
 //                                   ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
-//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Builder#result().
+//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Builder#result().
   }
 }
diff --git a/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala b/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
index 8d962e625..cf8e68916 100644
--- a/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
@@ -4,8 +4,8 @@ package ujson
 import scala.annotation.{switch, tailrec}
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
-//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
+//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
+//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
 import java.nio.ByteBuffer
 //     ^^^^ reference semanticdb maven . . java/
 //          ^^^ reference semanticdb maven . . java/nio/
@@ -35,23 +35,23 @@ import upickle.core.{ObjArrVisitor, Visitor}
 final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#
 //                          display_name ByteArrayParser
-//                          documentation ```scala\nfinal class ByteArrayParser[J]\n```
+//                          signature_documentation scala final class ByteArrayParser[J]
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#[J]
 //                            display_name J
-//                            documentation ```scala\nJ\n```
+//                            signature_documentation scala J
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().
 //                              display_name <init>
-//                              documentation ```scala\ndef this(src: Array[Byte])\n```
+//                              signature_documentation scala def this(src: Array[Byte])
 //                             ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
 //                                 display_name src
-//                                 documentation ```scala\nprivate[this] val src: Array[Byte]\n```
+//                                 signature_documentation scala private[this] val src: Array[Byte]
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().(src)
 //                             ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().(src)
 //                                 display_name src
-//                                 documentation ```scala\nsrc: Array[Byte] \n```
+//                                 signature_documentation scala src: Array[Byte] 
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
-//                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                        ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                        ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                                       ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#`<init>`().
@@ -59,47 +59,47 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
   val srcLength = src.length
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
 //              display_name srcLength
-//              documentation ```scala\nval srcLength: Int\n```
+//              signature_documentation scala val srcLength: Int
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#length().
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#length().
   protected[this] final def close() = {}
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
 //                                display_name close
-//                                documentation ```scala\nfinal def close(): Unit\n```
+//                                signature_documentation scala final def close(): Unit
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 
   // Never grow the buffer since it's a directly using the original
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#growBuffer().
 //                        display_name growBuffer
-//                        documentation ```scala\ndef growBuffer(until: Int): Unit\n```
+//                        signature_documentation scala def growBuffer(until: Int): Unit
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#growBuffer().(until)
 //                              display_name until
-//                              documentation ```scala\nuntil: Int \n```
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                              signature_documentation scala until: Int 
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 
   def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
-//                       documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)\n```
+//                       signature_documentation scala def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(buffer)
 //                              display_name buffer
-//                              documentation ```scala\nbuffer: Array[Byte] \n```
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                              signature_documentation scala buffer: Array[Byte] 
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
-//                                                         documentation ```scala\nbufferOffset: Int \n```
-//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                         signature_documentation scala bufferOffset: Int 
+//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if(buffer == null) (src, srcLength == 0, srcLength)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(buffer)
 //            ^^ reference semanticdb maven jdk 11 java/lang/Object#`==`().
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
 //                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
-//                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
     else (src, true, -1)
 //        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
@@ -109,27 +109,27 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 object ByteArrayParser extends Transformer[Array[Byte]]{
 //     ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.
 //                     display_name ByteArrayParser
-//                     documentation ```scala\nobject ByteArrayParser\n```
+//                     signature_documentation scala object ByteArrayParser
 //                             ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
-//                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: Array[Byte], f: Visitor[_, T]) = new ByteArrayParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(j: Array[Byte], f: Visitor[local0, T[): T\n```
+//              signature_documentation scala def transform(j: Array[Byte], f: Visitor[local0, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(j)
 //                   display_name j
-//                   documentation ```scala\nj: Array[Byte] \n```
-//                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                   signature_documentation scala j: Array[Byte] 
+//                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(f)
 //                                   display_name f
-//                                   documentation ```scala\nf: Visitor[local0, T[ \n```
+//                                   signature_documentation scala f: Visitor[local0, T[ 
 //                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().[T]
 //                                                         ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#
diff --git a/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala b/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
index 65fdaea37..51e5d8e31 100644
--- a/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
@@ -10,8 +10,8 @@ import upickle.core.{ObjArrVisitor, Visitor}
 import scala.annotation.{switch, tailrec}
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
-//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
+//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
+//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
 import java.nio.ByteBuffer
 //     ^^^^ reference semanticdb maven . . java/
 //          ^^^ reference semanticdb maven . . java/nio/
@@ -35,20 +35,20 @@ import java.nio.charset.StandardCharsets
 final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#
 //                           display_name ByteBufferParser
-//                           documentation ```scala\nfinal class ByteBufferParser[J]\n```
+//                           signature_documentation scala final class ByteBufferParser[J]
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#[J]
 //                             display_name J
-//                             documentation ```scala\nJ\n```
+//                             signature_documentation scala J
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().
 //                               display_name <init>
-//                               documentation ```scala\ndef this(src: ByteBuffer)\n```
+//                               signature_documentation scala def this(src: ByteBuffer)
 //                              ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                  display_name src
-//                                  documentation ```scala\nprivate[this] val src: ByteBuffer\n```
+//                                  signature_documentation scala private[this] val src: ByteBuffer
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().(src)
 //                              ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().(src)
 //                                  display_name src
-//                                  documentation ```scala\nsrc: ByteBuffer \n```
+//                                  signature_documentation scala src: ByteBuffer 
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                   ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                                       ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#
@@ -57,23 +57,23 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
   private[this] final val start = src.position()
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#start.
 //                              display_name start
-//                              documentation ```scala\nprivate[this] final val start: Int\n```
+//                              signature_documentation scala private[this] final val start: Int
 //                                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                    ^^^^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#position().
   private[this] final val limit = src.limit() - start
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
 //                              display_name limit
-//                              documentation ```scala\nprivate[this] final val limit: Int\n```
+//                              signature_documentation scala private[this] final val limit: Int
 //                                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                    ^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#limit().
-//                                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#start.
 
 
   protected[this] final def close() = { src.position(start) }
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#close().
 //                                display_name close
-//                                documentation ```scala\nfinal def close(): Unit\n```
+//                                signature_documentation scala final def close(): Unit
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                          ^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#position().
@@ -81,27 +81,27 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#growBuffer().
 //                        display_name growBuffer
-//                        documentation ```scala\ndef growBuffer(until: Int): Unit\n```
+//                        signature_documentation scala def growBuffer(until: Int): Unit
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#growBuffer().(until)
 //                              display_name until
-//                              documentation ```scala\nuntil: Int \n```
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                              signature_documentation scala until: Int 
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
-//                       documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)\n```
+//                       signature_documentation scala def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(buffer)
 //                              display_name buffer
-//                              documentation ```scala\nbuffer: Array[Byte] \n```
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                              signature_documentation scala buffer: Array[Byte] 
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
-//                                                         documentation ```scala\nbufferOffset: Int \n```
-//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                         signature_documentation scala bufferOffset: Int 
+//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     if(buffer == null) (java.util.Arrays.copyOfRange(src.array(), start, src.limit()), limit == 0, limit)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(buffer)
@@ -116,7 +116,7 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                                                                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                                                           ^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#limit().
 //                                                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
-//                                                                                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//                                                                                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //                                                                                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
     else (src.array(), true, -1)
 //        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
@@ -127,25 +127,25 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 object ByteBufferParser extends Transformer[ByteBuffer]{
 //     ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.
 //                      display_name ByteBufferParser
-//                      documentation ```scala\nobject ByteBufferParser\n```
+//                      signature_documentation scala object ByteBufferParser
 //                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                          ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: ByteBuffer, f: Visitor[_, T]) = new ByteBufferParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(j: ByteBuffer, f: Visitor[local0, T[): T\n```
+//              signature_documentation scala def transform(j: ByteBuffer, f: Visitor[local0, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().(j)
 //                   display_name j
-//                   documentation ```scala\nj: ByteBuffer \n```
+//                   signature_documentation scala j: ByteBuffer 
 //                    ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().(f)
 //                                  display_name f
-//                                  documentation ```scala\nf: Visitor[local0, T[ \n```
+//                                  signature_documentation scala f: Visitor[local0, T[ 
 //                                   ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().[T]
 //                                                        ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#
diff --git a/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala b/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
index 57826ccc4..efcec6d2a 100644
--- a/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
@@ -16,20 +16,20 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //      ^^^^^ reference semanticdb maven . . ujson/
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#
 //                                            display_name CharSequenceParser
-//                                            documentation ```scala\nprotected[ujson] final class CharSequenceParser[J]\n```
+//                                            signature_documentation scala protected[ujson] final class CharSequenceParser[J]
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#[J]
 //                                              display_name J
-//                                              documentation ```scala\nJ\n```
+//                                              signature_documentation scala J
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().
 //                                                display_name <init>
-//                                                documentation ```scala\ndef this(cs: CharSequence)\n```
+//                                                signature_documentation scala def this(cs: CharSequence)
 //                                               ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                  display_name cs
-//                                                  documentation ```scala\nprivate[this] val cs: CharSequence\n```
+//                                                  signature_documentation scala private[this] val cs: CharSequence
 //                                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().(cs)
 //                                               __ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().(cs)
 //                                                  display_name cs
-//                                                  documentation ```scala\ncs: CharSequence \n```
+//                                                  signature_documentation scala cs: CharSequence 
 //                                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                                         ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#
@@ -38,27 +38,27 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#growBuffer().
 //                        display_name growBuffer
-//                        documentation ```scala\ndef growBuffer(until: Int): Unit\n```
+//                        signature_documentation scala def growBuffer(until: Int): Unit
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#growBuffer().(until)
 //                              display_name until
-//                              documentation ```scala\nuntil: Int \n```
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                              signature_documentation scala until: Int 
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
-//                       documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int): (Array[Char], Boolean, Int)\n```
+//                       signature_documentation scala def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int): (Array[Char], Boolean, Int)
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(buffer)
 //                              display_name buffer
-//                              documentation ```scala\nbuffer: Array[Char] \n```
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
+//                              signature_documentation scala buffer: Array[Char] 
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
-//                                                         documentation ```scala\nbufferOffset: Int \n```
-//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                         signature_documentation scala bufferOffset: Int 
+//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if(buffer == null) (cs.toString.toCharArray, cs.length == 0, cs.length)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(buffer)
 //            ^^ reference semanticdb maven jdk 11 java/lang/Object#`==`().
@@ -67,7 +67,7 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //                                  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/String#toCharArray().
 //                                               ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
-//                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //                                                               ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     else (buffer, true, -1)
@@ -76,32 +76,32 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
   final def close() = ()
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#close().
 //                display_name close
-//                documentation ```scala\nfinal def close(): Unit\n```
+//                signature_documentation scala final def close(): Unit
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
 }
 
 object CharSequenceParser extends Transformer[CharSequence]{
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.
 //                        display_name CharSequenceParser
-//                        documentation ```scala\nobject CharSequenceParser\n```
+//                        signature_documentation scala object CharSequenceParser
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                            ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: CharSequence, f: Visitor[_, T]) = new CharSequenceParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(j: CharSequence, f: Visitor[local0, T[): T\n```
+//              signature_documentation scala def transform(j: CharSequence, f: Visitor[local0, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().(j)
 //                   display_name j
-//                   documentation ```scala\nj: CharSequence \n```
+//                   signature_documentation scala j: CharSequence 
 //                    ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().(f)
 //                                    display_name f
-//                                    documentation ```scala\nf: Visitor[local0, T[ \n```
+//                                    signature_documentation scala f: Visitor[local0, T[ 
 //                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().[T]
 //                                                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#
diff --git a/tests/snapshots/src/main/generated/ujson/Exceptions.scala b/tests/snapshots/src/main/generated/ujson/Exceptions.scala
index d00e48a4d..3072e0513 100644
--- a/tests/snapshots/src/main/generated/ujson/Exceptions.scala
+++ b/tests/snapshots/src/main/generated/ujson/Exceptions.scala
@@ -5,97 +5,97 @@ package ujson
 sealed trait ParsingFailedException extends Exception
 //           ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParsingFailedException#
 //                                  display_name ParsingFailedException
-//                                  documentation ```scala\nsealed trait ParsingFailedException\n```
-//                                          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
+//                                  signature_documentation scala sealed trait ParsingFailedException
+//                                          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
 
 case class ParseException(clue: String, index: Int)
 //         ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        display_name ParseException
-//                        documentation ```scala\ncase class ParseException(clue: String, index: Int) extends Exception with ParsingFailedException\n```
+//                        signature_documentation scala case class ParseException(clue: String, index: Int) extends Exception with ParsingFailedException
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#productElementName().
 //                        display_name productElementName
-//                        documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                        signature_documentation scala def productElementName(x$1: Int): String
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
-//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //                        display_name apply
-//                        documentation ```scala\ndef apply(clue: String, index: Int): ParseException\n```
+//                        signature_documentation scala def apply(clue: String, index: Int): ParseException
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
-//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
+//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.
 //                        display_name ParseException
-//                        documentation ```scala\nobject ParseException\n```
+//                        signature_documentation scala object ParseException
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().
 //                        display_name copy
-//                        documentation ```scala\ndef copy(clue: String, index: Int): ParseException\n```
+//                        signature_documentation scala def copy(clue: String, index: Int): ParseException
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#productElement().
 //                        display_name productElement
-//                        documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                        signature_documentation scala def productElement(x$1: Int): Any
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
-//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().
 //                         display_name <init>
-//                         documentation ```scala\ndef this(clue: String, index: Int)\n```
+//                         signature_documentation scala def this(clue: String, index: Int)
 //                        ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             display_name clue
-//                             documentation ```scala\nval clue: String\n```
+//                             signature_documentation scala val clue: String
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                             display_name clue
-//                             documentation ```scala\nclue: String \n```
+//                             signature_documentation scala clue: String 
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             display_name clue
-//                             documentation ```scala\nclue: String \n```
+//                             signature_documentation scala clue: String 
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                             display_name clue
-//                             documentation ```scala\ndefault clue: String \n```
+//                             signature_documentation scala default clue: String 
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
-//                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            display_name index
-//                                            documentation ```scala\nval index: Int\n```
+//                                            signature_documentation scala val index: Int
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            display_name index
-//                                            documentation ```scala\nindex: Int \n```
+//                                            signature_documentation scala index: Int 
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
 //                                            display_name index
-//                                            documentation ```scala\nindex: Int \n```
+//                                            signature_documentation scala index: Int 
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            display_name index
-//                                            documentation ```scala\ndefault index: Int \n```
+//                                            signature_documentation scala default index: Int 
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
-//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
   extends Exception(clue + " at index " + index) with ParsingFailedException
-//        ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
+//        ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
 //                 ^ reference semanticdb maven jdk 11 java/lang/Exception#`<init>`(+1).
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                       ^ reference semanticdb maven jdk 11 java/lang/String#`+`().
@@ -106,66 +106,66 @@ case class ParseException(clue: String, index: Int)
 case class IncompleteParseException(msg: String)
 //         ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  display_name IncompleteParseException
-//                                  documentation ```scala\ncase class IncompleteParseException(msg: String) extends Exception with ParsingFailedException\n```
+//                                  signature_documentation scala case class IncompleteParseException(msg: String) extends Exception with ParsingFailedException
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#productElement().
 //                                  display_name productElement
-//                                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                                  signature_documentation scala def productElement(x$1: Int): Any
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
-//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                  display_name apply
-//                                  documentation ```scala\ndef apply(msg: String): IncompleteParseException\n```
+//                                  signature_documentation scala def apply(msg: String): IncompleteParseException
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
-//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
+//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().
 //                                  display_name copy
-//                                  documentation ```scala\ndef copy(msg: String): IncompleteParseException\n```
+//                                  signature_documentation scala def copy(msg: String): IncompleteParseException
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#productElementName().
 //                                  display_name productElementName
-//                                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                                  signature_documentation scala def productElementName(x$1: Int): String
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
-//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.
 //                                  display_name IncompleteParseException
-//                                  documentation ```scala\nobject IncompleteParseException\n```
+//                                  signature_documentation scala object IncompleteParseException
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().
 //                                   display_name <init>
-//                                   documentation ```scala\ndef this(msg: String)\n```
+//                                   signature_documentation scala def this(msg: String)
 //                                  ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                      display_name msg
-//                                      documentation ```scala\nval msg: String\n```
+//                                      signature_documentation scala val msg: String
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
 //                                      display_name msg
-//                                      documentation ```scala\nmsg: String \n```
+//                                      signature_documentation scala msg: String 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      display_name msg
-//                                      documentation ```scala\ndefault msg: String \n```
+//                                      signature_documentation scala default msg: String 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      display_name msg
-//                                      documentation ```scala\nmsg: String \n```
+//                                      signature_documentation scala msg: String 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
-//                                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
   extends Exception(msg) with ParsingFailedException
-//        ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
+//        ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
 //                 ^ reference semanticdb maven jdk 11 java/lang/Exception#`<init>`(+1).
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                            ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParsingFailedException#
diff --git a/tests/snapshots/src/main/generated/ujson/IndexedValue.scala b/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
index e2f072d07..ed80f4158 100644
--- a/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
+++ b/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
@@ -31,11 +31,11 @@ import upickle.core.{Visitor, ObjVisitor, ArrVisitor, Abort, AbortException}
 sealed trait IndexedValue {
 //           ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                        display_name IndexedValue
-//                        documentation ```scala\nsealed trait IndexedValue\n```
+//                        signature_documentation scala sealed trait IndexedValue
   def index: Int
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //          display_name index
-//          documentation ```scala\ndef index: Int\n```
+//          signature_documentation scala def index: Int
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
@@ -44,13 +44,13 @@ sealed trait IndexedValue {
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
-//           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 }
 
 object IndexedValue extends Transformer[IndexedValue]{
 //     ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                  display_name IndexedValue
-//                  documentation ```scala\nobject IndexedValue\n```
+//                  signature_documentation scala object IndexedValue
 //                          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                   ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
@@ -58,86 +58,86 @@ object IndexedValue extends Transformer[IndexedValue]{
   case class Str(index: Int, value0: java.lang.CharSequence) extends IndexedValue
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               display_name Str
-//               documentation ```scala\ncase class Str(index: Int, value0: CharSequence) extends IndexedValue\n```
+//               signature_documentation scala case class Str(index: Int, value0: CharSequence) extends IndexedValue
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().
 //               display_name copy
-//               documentation ```scala\ndef copy(index: Int, value0: CharSequence): Str\n```
+//               signature_documentation scala def copy(index: Int, value0: CharSequence): Str
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //               display_name apply
-//               documentation ```scala\ndef apply(index: Int, value0: CharSequence): Str\n```
+//               signature_documentation scala def apply(index: Int, value0: CharSequence): Str
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //               display_name Str
-//               documentation ```scala\nobject Str\n```
+//               signature_documentation scala object Str
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#productElement().
 //               display_name productElement
-//               documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//               signature_documentation scala def productElement(x$1: Int): Any
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#productElementName().
 //               display_name productElementName
-//               documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//               signature_documentation scala def productElementName(x$1: Int): String
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().
 //                display_name <init>
-//                documentation ```scala\ndef this(index: Int, value0: CharSequence)\n```
+//                signature_documentation scala def this(index: Int, value0: CharSequence)
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                     display_name index
-//                     documentation ```scala\nval index: Int\n```
+//                     signature_documentation scala val index: Int
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     display_name index
-//                     documentation ```scala\ndefault index: Int \n```
+//                     signature_documentation scala default index: Int 
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
+//                     signature_documentation scala index: Int 
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
+//                     signature_documentation scala index: Int 
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                                  display_name value0
-//                                  documentation ```scala\nval value0: CharSequence\n```
+//                                  signature_documentation scala val value0: CharSequence
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  display_name value0
-//                                  documentation ```scala\nvalue0: CharSequence \n```
+//                                  signature_documentation scala value0: CharSequence 
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
 //                                  display_name value0
-//                                  documentation ```scala\nvalue0: CharSequence \n```
+//                                  signature_documentation scala value0: CharSequence 
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  display_name value0
-//                                  documentation ```scala\ndefault value0: CharSequence \n```
+//                                  signature_documentation scala default value0: CharSequence 
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
@@ -149,64 +149,64 @@ object IndexedValue extends Transformer[IndexedValue]{
   case class Obj(index: Int, value0: (java.lang.CharSequence, IndexedValue)*) extends IndexedValue
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               display_name Obj
-//               documentation ```scala\ncase class Obj(index: Int, value0: (CharSequence, IndexedValue)*) extends IndexedValue\n```
+//               signature_documentation scala case class Obj(index: Int, value0: (CharSequence, IndexedValue)*) extends IndexedValue
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //               display_name apply
-//               documentation ```scala\ndef apply(index: Int, value0: (CharSequence, IndexedValue)*): Obj\n```
+//               signature_documentation scala def apply(index: Int, value0: (CharSequence, IndexedValue)*): Obj
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#productElement().
 //               display_name productElement
-//               documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//               signature_documentation scala def productElement(x$1: Int): Any
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //               display_name Obj
-//               documentation ```scala\nobject Obj\n```
+//               signature_documentation scala object Obj
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#productElementName().
 //               display_name productElementName
-//               documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//               signature_documentation scala def productElementName(x$1: Int): String
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().
 //                display_name <init>
-//                documentation ```scala\ndef this(index: Int, value0: (CharSequence, IndexedValue)*)\n```
+//                signature_documentation scala def this(index: Int, value0: (CharSequence, IndexedValue)*)
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //                     display_name index
-//                     documentation ```scala\nval index: Int\n```
+//                     signature_documentation scala val index: Int
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
+//                     signature_documentation scala index: Int 
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
+//                     signature_documentation scala index: Int 
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                                  display_name value0
-//                                  documentation ```scala\nval value0: (CharSequence, IndexedValue)*\n```
+//                                  signature_documentation scala val value0: (CharSequence, IndexedValue)*
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
 //                                  display_name value0
-//                                  documentation ```scala\nvalue0: (CharSequence, IndexedValue)* \n```
+//                                  signature_documentation scala value0: (CharSequence, IndexedValue)* 
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
 //                                  display_name value0
-//                                  documentation ```scala\nvalue0: (CharSequence, IndexedValue)* \n```
+//                                  signature_documentation scala value0: (CharSequence, IndexedValue)* 
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
 //                                    ^^^^ reference semanticdb maven . . java/
@@ -218,64 +218,64 @@ object IndexedValue extends Transformer[IndexedValue]{
   case class Arr(index: Int, value: IndexedValue*) extends IndexedValue
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               display_name Arr
-//               documentation ```scala\ncase class Arr(index: Int, value: IndexedValue*) extends IndexedValue\n```
+//               signature_documentation scala case class Arr(index: Int, value: IndexedValue*) extends IndexedValue
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#productElementName().
 //               display_name productElementName
-//               documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//               signature_documentation scala def productElementName(x$1: Int): String
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#productElement().
 //               display_name productElement
-//               documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//               signature_documentation scala def productElement(x$1: Int): Any
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //               display_name Arr
-//               documentation ```scala\nobject Arr\n```
+//               signature_documentation scala object Arr
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //               display_name apply
-//               documentation ```scala\ndef apply(index: Int, value: IndexedValue*): Arr\n```
+//               signature_documentation scala def apply(index: Int, value: IndexedValue*): Arr
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().
 //                display_name <init>
-//                documentation ```scala\ndef this(index: Int, value: IndexedValue*)\n```
+//                signature_documentation scala def this(index: Int, value: IndexedValue*)
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //                     display_name index
-//                     documentation ```scala\nval index: Int\n```
+//                     signature_documentation scala val index: Int
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
+//                     signature_documentation scala index: Int 
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
+//                     signature_documentation scala index: Int 
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
 //                                 display_name value
-//                                 documentation ```scala\nval value: IndexedValue*\n```
+//                                 signature_documentation scala val value: IndexedValue*
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
 //                           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
 //                                 display_name value
-//                                 documentation ```scala\nvalue: IndexedValue* \n```
+//                                 signature_documentation scala value: IndexedValue* 
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
 //                           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
 //                                 display_name value
-//                                 documentation ```scala\nvalue: IndexedValue* \n```
+//                                 signature_documentation scala value: IndexedValue* 
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
 //                                  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
@@ -284,454 +284,454 @@ object IndexedValue extends Transformer[IndexedValue]{
   case class Num(index: Int, s: CharSequence, decIndex: Int, expIndex: Int) extends IndexedValue
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               display_name Num
-//               documentation ```scala\ncase class Num(index: Int, s: CharSequence, decIndex: Int, expIndex: Int) extends IndexedValue\n```
+//               signature_documentation scala case class Num(index: Int, s: CharSequence, decIndex: Int, expIndex: Int) extends IndexedValue
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //               display_name Num
-//               documentation ```scala\nobject Num\n```
+//               signature_documentation scala object Num
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().
 //               display_name copy
-//               documentation ```scala\ndef copy(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num\n```
+//               signature_documentation scala def copy(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#productElement().
 //               display_name productElement
-//               documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//               signature_documentation scala def productElement(x$1: Int): Any
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#productElementName().
 //               display_name productElementName
-//               documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//               signature_documentation scala def productElementName(x$1: Int): String
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //               display_name apply
-//               documentation ```scala\ndef apply(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num\n```
+//               signature_documentation scala def apply(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function4#apply().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function4#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().
 //                display_name <init>
-//                documentation ```scala\ndef this(index: Int, s: CharSequence, decIndex: Int, expIndex: Int)\n```
+//                signature_documentation scala def this(index: Int, s: CharSequence, decIndex: Int, expIndex: Int)
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                     display_name index
-//                     documentation ```scala\nval index: Int\n```
+//                     signature_documentation scala val index: Int
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     display_name index
-//                     documentation ```scala\ndefault index: Int \n```
+//                     signature_documentation scala default index: Int 
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
+//                     signature_documentation scala index: Int 
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
+//                     signature_documentation scala index: Int 
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             display_name s
-//                             documentation ```scala\nval s: CharSequence\n```
+//                             signature_documentation scala val s: CharSequence
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                             display_name s
-//                             documentation ```scala\ns: CharSequence \n```
+//                             signature_documentation scala s: CharSequence 
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             display_name s
-//                             documentation ```scala\ns: CharSequence \n```
+//                             signature_documentation scala s: CharSequence 
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             display_name s
-//                             documentation ```scala\ndefault s: CharSequence \n```
+//                             signature_documentation scala default s: CharSequence 
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     display_name decIndex
-//                                                     documentation ```scala\nval decIndex: Int\n```
+//                                                     signature_documentation scala val decIndex: Int
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     display_name decIndex
-//                                                     documentation ```scala\ndefault decIndex: Int \n```
+//                                                     signature_documentation scala default decIndex: Int 
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                                     display_name decIndex
-//                                                     documentation ```scala\ndecIndex: Int \n```
+//                                                     signature_documentation scala decIndex: Int 
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     display_name decIndex
-//                                                     documentation ```scala\ndecIndex: Int \n```
+//                                                     signature_documentation scala decIndex: Int 
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
-//                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                           ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    display_name expIndex
-//                                                                    documentation ```scala\nval expIndex: Int\n```
+//                                                                    signature_documentation scala val expIndex: Int
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    display_name expIndex
-//                                                                    documentation ```scala\nexpIndex: Int \n```
+//                                                                    signature_documentation scala expIndex: Int 
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
 //                                                                    display_name expIndex
-//                                                                    documentation ```scala\nexpIndex: Int \n```
+//                                                                    signature_documentation scala expIndex: Int 
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    display_name expIndex
-//                                                                    documentation ```scala\ndefault expIndex: Int \n```
+//                                                                    signature_documentation scala default expIndex: Int 
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
-//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                                  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                                                              ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class NumRaw(index: Int, d: Double) extends IndexedValue
 //           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  display_name NumRaw
-//                  documentation ```scala\ncase class NumRaw(index: Int, d: Double) extends IndexedValue\n```
+//                  signature_documentation scala case class NumRaw(index: Int, d: Double) extends IndexedValue
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().
 //                  display_name copy
-//                  documentation ```scala\ndef copy(index: Int, d: Double): NumRaw\n```
+//                  signature_documentation scala def copy(index: Int, d: Double): NumRaw
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                  display_name NumRaw
-//                  documentation ```scala\nobject NumRaw\n```
+//                  signature_documentation scala object NumRaw
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#productElement().
 //                  display_name productElement
-//                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                  signature_documentation scala def productElement(x$1: Int): Any
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
-//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //                  display_name apply
-//                  documentation ```scala\ndef apply(index: Int, d: Double): NumRaw\n```
+//                  signature_documentation scala def apply(index: Int, d: Double): NumRaw
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
-//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
+//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#productElementName().
 //                  display_name productElementName
-//                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                  signature_documentation scala def productElementName(x$1: Int): String
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
-//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().
 //                   display_name <init>
-//                   documentation ```scala\ndef this(index: Int, d: Double)\n```
+//                   signature_documentation scala def this(index: Int, d: Double)
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        display_name index
-//                        documentation ```scala\nval index: Int\n```
+//                        signature_documentation scala val index: Int
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
 //                        display_name index
-//                        documentation ```scala\nindex: Int \n```
+//                        signature_documentation scala index: Int 
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        display_name index
-//                        documentation ```scala\nindex: Int \n```
+//                        signature_documentation scala index: Int 
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        display_name index
-//                        documentation ```scala\ndefault index: Int \n```
+//                        signature_documentation scala default index: Int 
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                display_name d
-//                                documentation ```scala\nval d: Double\n```
+//                                signature_documentation scala val d: Double
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                display_name d
-//                                documentation ```scala\ndefault d: Double \n```
+//                                signature_documentation scala default d: Double 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
 //                                display_name d
-//                                documentation ```scala\nd: Double \n```
+//                                signature_documentation scala d: Double 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                display_name d
-//                                documentation ```scala\nd: Double \n```
+//                                signature_documentation scala d: Double 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
-//                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
+//                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                             ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class False(index: Int) extends IndexedValue{
 //           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 display_name False
-//                 documentation ```scala\ncase class False(index: Int) extends IndexedValue\n```
+//                 signature_documentation scala case class False(index: Int) extends IndexedValue
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                 display_name False
-//                 documentation ```scala\nobject False\n```
+//                 signature_documentation scala object False
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#productElementName().
 //                 display_name productElementName
-//                 documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                 signature_documentation scala def productElementName(x$1: Int): String
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
-//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                 display_name apply
-//                 documentation ```scala\ndef apply(index: Int): False\n```
+//                 signature_documentation scala def apply(index: Int): False
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
-//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
+//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#productElement().
 //                 display_name productElement
-//                 documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                 signature_documentation scala def productElement(x$1: Int): Any
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
-//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().
 //                 display_name copy
-//                 documentation ```scala\ndef copy(index: Int): False\n```
+//                 signature_documentation scala def copy(index: Int): False
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().
 //                  display_name <init>
-//                  documentation ```scala\ndef this(index: Int)\n```
+//                  signature_documentation scala def this(index: Int)
 //                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                       display_name index
-//                       documentation ```scala\nval index: Int\n```
+//                       signature_documentation scala val index: Int
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
 //                       display_name index
-//                       documentation ```scala\nindex: Int \n```
+//                       signature_documentation scala index: Int 
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       display_name index
-//                       documentation ```scala\ndefault index: Int \n```
+//                       signature_documentation scala default index: Int 
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       display_name index
-//                       documentation ```scala\nindex: Int \n```
+//                       signature_documentation scala index: Int 
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                 ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = false
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#value().
 //            display_name value
-//            documentation ```scala\ndef value: Boolean\n```
+//            signature_documentation scala def value: Boolean
   }
   case class True(index: Int) extends IndexedValue{
 //           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                display_name True
-//                documentation ```scala\ncase class True(index: Int) extends IndexedValue\n```
+//                signature_documentation scala case class True(index: Int) extends IndexedValue
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#productElement().
 //                display_name productElement
-//                documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                signature_documentation scala def productElement(x$1: Int): Any
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                display_name True
-//                documentation ```scala\nobject True\n```
+//                signature_documentation scala object True
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().
 //                display_name copy
-//                documentation ```scala\ndef copy(index: Int): True\n```
+//                signature_documentation scala def copy(index: Int): True
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //                display_name apply
-//                documentation ```scala\ndef apply(index: Int): True\n```
+//                signature_documentation scala def apply(index: Int): True
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#productElementName().
 //                display_name productElementName
-//                documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                signature_documentation scala def productElementName(x$1: Int): String
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().
 //                 display_name <init>
-//                 documentation ```scala\ndef this(index: Int)\n```
+//                 signature_documentation scala def this(index: Int)
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                      display_name index
-//                      documentation ```scala\nval index: Int\n```
+//                      signature_documentation scala val index: Int
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
 //                      display_name index
-//                      documentation ```scala\nindex: Int \n```
+//                      signature_documentation scala index: Int 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      display_name index
-//                      documentation ```scala\nindex: Int \n```
+//                      signature_documentation scala index: Int 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      display_name index
-//                      documentation ```scala\ndefault index: Int \n```
+//                      signature_documentation scala default index: Int 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = true
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#value().
 //            display_name value
-//            documentation ```scala\ndef value: Boolean\n```
+//            signature_documentation scala def value: Boolean
   }
   case class Null(index: Int) extends IndexedValue{
 //           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                display_name Null
-//                documentation ```scala\ncase class Null(index: Int) extends IndexedValue\n```
+//                signature_documentation scala case class Null(index: Int) extends IndexedValue
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().
 //                display_name copy
-//                documentation ```scala\ndef copy(index: Int): Null\n```
+//                signature_documentation scala def copy(index: Int): Null
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#productElement().
 //                display_name productElement
-//                documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                signature_documentation scala def productElement(x$1: Int): Any
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#productElementName().
 //                display_name productElementName
-//                documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                signature_documentation scala def productElementName(x$1: Int): String
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //                display_name apply
-//                documentation ```scala\ndef apply(index: Int): Null\n```
+//                signature_documentation scala def apply(index: Int): Null
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                display_name Null
-//                documentation ```scala\nobject Null\n```
+//                signature_documentation scala object Null
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().
 //                 display_name <init>
-//                 documentation ```scala\ndef this(index: Int)\n```
+//                 signature_documentation scala def this(index: Int)
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                      display_name index
-//                      documentation ```scala\nval index: Int\n```
+//                      signature_documentation scala val index: Int
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      display_name index
-//                      documentation ```scala\nindex: Int \n```
+//                      signature_documentation scala index: Int 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
 //                      display_name index
-//                      documentation ```scala\nindex: Int \n```
+//                      signature_documentation scala index: Int 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      display_name index
-//                      documentation ```scala\ndefault index: Int \n```
+//                      signature_documentation scala default index: Int 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = null
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#value().
 //            display_name value
-//            documentation ```scala\ndef value: Null\n```
+//            signature_documentation scala def value: Null
   }
 
   def transform[T](j: IndexedValue, f: Visitor[_, T]): T = try{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(j: IndexedValue, f: Visitor[local16, T[): T\n```
+//              signature_documentation scala def transform(j: IndexedValue, f: Visitor[local16, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(j)
 //                   display_name j
-//                   documentation ```scala\nj: IndexedValue \n```
+//                   signature_documentation scala j: IndexedValue 
 //                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                    display_name f
-//                                    documentation ```scala\nf: Visitor[local16, T[ \n```
+//                                    signature_documentation scala f: Visitor[local16, T[ 
 //                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().[T]
 //                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().[T]
@@ -742,7 +742,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                           ^ definition local 17
 //                             display_name i
-//                             documentation ```scala\ni: Int \n```
+//                             signature_documentation scala i: Int 
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //                                             ^ reference local 17
@@ -751,7 +751,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                           ^ definition local 18
 //                             display_name i
-//                             documentation ```scala\ni: Int \n```
+//                             signature_documentation scala i: Int 
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //                                             ^ reference local 18
@@ -760,7 +760,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                            ^ definition local 19
 //                              display_name i
-//                              documentation ```scala\ni: Int \n```
+//                              signature_documentation scala i: Int 
 //                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //                                               ^ reference local 19
@@ -769,10 +769,10 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //                          ^ definition local 20
 //                            display_name i
-//                            documentation ```scala\ni: Int \n```
+//                            signature_documentation scala i: Int 
 //                             ^ definition local 21
 //                               display_name s
-//                               documentation ```scala\ns: CharSequence \n```
+//                               signature_documentation scala s: CharSequence 
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                 ^ reference local 21
@@ -782,16 +782,16 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //                          ^ definition local 22
 //                            display_name i
-//                            documentation ```scala\ni: Int \n```
+//                            signature_documentation scala i: Int 
 //                             ^ definition local 23
 //                               display_name s
-//                               documentation ```scala\ns: CharSequence \n```
+//                               signature_documentation scala s: CharSequence 
 //                                ^ definition local 24
 //                                  display_name d
-//                                  documentation ```scala\nd: Int \n```
+//                                  signature_documentation scala d: Int 
 //                                   ^ definition local 25
 //                                     display_name e
-//                                     documentation ```scala\ne: Int \n```
+//                                     signature_documentation scala e: Int 
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                           ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                                                   ^ reference local 23
@@ -803,10 +803,10 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                             ^ definition local 26
 //                               display_name i
-//                               documentation ```scala\ni: Int \n```
+//                               signature_documentation scala i: Int 
 //                                ^ definition local 27
 //                                  display_name d
-//                                  documentation ```scala\nd: Double \n```
+//                                  signature_documentation scala d: Double 
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                                                     ^ reference local 27
@@ -816,21 +816,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //                          ^ definition local 28
 //                            display_name i
-//                            documentation ```scala\ni: Int \n```
+//                            signature_documentation scala i: Int 
 //                             ^^^^^ definition local 29
 //                                   display_name items
-//                                   documentation ```scala\nitems: Seq[IndexedValue] \n```
+//                                   signature_documentation scala items: Seq[IndexedValue] 
         val ctx = f.visitArray(-1, -1).narrow
 //          ^^^ definition local 30
 //              display_name ctx
-//              documentation ```scala\nctx: ArrVisitor[Any, T] \n```
+//              signature_documentation scala ctx: ArrVisitor[Any, T] 
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                                     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#narrow().
         for(item <- items) try ctx.visitValue(transform(item, ctx.subVisitor), item.index) catch reject(item.index)
 //          ^^^^ definition local 31
 //               display_name item
-//               documentation ```scala\nitem: IndexedValue \n```
+//               signature_documentation scala item: IndexedValue 
 //                  ^^^^^ reference local 29
 //                             ^^^ reference local 30
 //                                 ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
@@ -852,29 +852,29 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //                          ^ definition local 34
 //                            display_name i
-//                            documentation ```scala\ni: Int \n```
+//                            signature_documentation scala i: Int 
 //                             ^^^^^ definition local 35
 //                                   display_name items
-//                                   documentation ```scala\nitems: Seq[(CharSequence, IndexedValue)] \n```
+//                                   signature_documentation scala items: Seq[(CharSequence, IndexedValue)] 
         val ctx = f.visitObject(-1, -1).narrow
 //          ^^^ definition local 36
 //              display_name ctx
-//              documentation ```scala\nctx: ObjVisitor[Any, T] \n```
+//              signature_documentation scala ctx: ObjVisitor[Any, T] 
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                                      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#narrow().
         for((k, item) <- items) {
 //           ^ definition local 37
 //             display_name k
-//             documentation ```scala\nk: CharSequence \n```
+//             signature_documentation scala k: CharSequence 
 //              ^^^^ definition local 38
 //                   display_name item
-//                   documentation ```scala\nitem: IndexedValue \n```
-//                       ^^^^^ reference local 35
+//                   signature_documentation scala item: IndexedValue 
+//                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#withFilter().
           val keyVisitor = try ctx.visitKey(i) catch reject(i)
 //            ^^^^^^^^^^ definition local 40
 //                       display_name keyVisitor
-//                       documentation ```scala\nkeyVisitor: Visitor[local41, Any[ \n```
+//                       signature_documentation scala keyVisitor: Visitor[local41, Any[ 
 //                             ^^^ reference local 36
 //                                 ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                                          ^ reference local 34
@@ -915,7 +915,7 @@ object IndexedValue extends Transformer[IndexedValue]{
   object Builder extends JsVisitor[IndexedValue, IndexedValue]{
 //       ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
 //               display_name Builder
-//               documentation ```scala\nobject Builder\n```
+//               signature_documentation scala object Builder
 //                       ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                               ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
@@ -923,19 +923,19 @@ object IndexedValue extends Transformer[IndexedValue]{
     def visitArray(length: Int, i: Int) = new ArrVisitor[IndexedValue, IndexedValue.Arr] {
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().
 //                 display_name visitArray
-//                 documentation ```scala\ndef visitArray(length: Int, i: Int): { def subVisitor: Builder }\n```
+//                 signature_documentation scala def visitArray(length: Int, i: Int): { def subVisitor: Builder }
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(length)
 //                        display_name length
-//                        documentation ```scala\nlength: Int \n```
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                        signature_documentation scala length: Int 
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(i)
 //                                display_name i
-//                                documentation ```scala\ni: Int \n```
-//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                signature_documentation scala i: Int 
+//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^ definition local 49
 //                                              display_name $anon
-//                                              documentation ```scala\nfinal class $anon\n```
+//                                              signature_documentation scala final class $anon
 //                                            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                       ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                                     ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -944,70 +944,70 @@ object IndexedValue extends Transformer[IndexedValue]{
       val out = mutable.Buffer.empty[IndexedValue]
 //        ^^^ definition local 50
 //            display_name out
-//            documentation ```scala\nprivate val out: Buffer[IndexedValue]\n```
+//            signature_documentation scala private val out: Buffer[IndexedValue]
 //              ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer.
-//                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/SeqFactory.Delegate#empty().
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer.
+//                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/SeqFactory.Delegate#empty().
 //                                   ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
       def subVisitor = Builder
 //        ^^^^^^^^^^ definition local 48
 //                   display_name subVisitor
-//                   documentation ```scala\ndef subVisitor: Builder\n```
+//                   signature_documentation scala def subVisitor: Builder
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitValue(v: IndexedValue, index: Int): Unit = {
 //        ^^^^^^^^^^ definition local 51
 //                   display_name visitValue
-//                   documentation ```scala\ndef visitValue(v: IndexedValue, index: Int): Unit\n```
+//                   signature_documentation scala def visitValue(v: IndexedValue, index: Int): Unit
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                   ^ definition local 53
 //                     display_name v
-//                     documentation ```scala\nv: IndexedValue \n```
+//                     signature_documentation scala v: IndexedValue 
 //                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                    ^^^^^ definition local 54
 //                                          display_name index
-//                                          documentation ```scala\nindex: Int \n```
-//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                          signature_documentation scala index: Int 
+//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
         out.append(v)
 //      ^^^ reference local 50
-//          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer#append().
+//          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer#append().
 //                 ^ reference local 53
       }
       def visitEnd(index: Int): IndexedValue.Arr = IndexedValue.Arr(i, out.toSeq:_*)
 //        ^^^^^^^^ definition local 52
 //                 display_name visitEnd
-//                 documentation ```scala\ndef visitEnd(index: Int): Arr\n```
+//                 signature_documentation scala def visitEnd(index: Int): Arr
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                 ^^^^^ definition local 55
 //                       display_name index
-//                       documentation ```scala\nindex: Int \n```
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                       signature_documentation scala index: Int 
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(i)
 //                                                                     ^^^ reference local 50
-//                                                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#toSeq().
+//                                                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#toSeq().
     }
 
     def visitObject(length: Int, i: Int) = new ObjVisitor[IndexedValue, IndexedValue.Obj] {
 //      ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().
 //                  display_name visitObject
-//                  documentation ```scala\ndef visitObject(length: Int, i: Int): { def subVisitor: Builder; def visitKey(index: Int): Builder }\n```
+//                  signature_documentation scala def visitObject(length: Int, i: Int): { def subVisitor: Builder; def visitKey(index: Int): Builder }
 //                  relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                  ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(length)
 //                         display_name length
-//                         documentation ```scala\nlength: Int \n```
-//                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                         signature_documentation scala length: Int 
+//                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(i)
 //                                 display_name i
-//                                 documentation ```scala\ni: Int \n```
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                 signature_documentation scala i: Int 
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^ definition local 59
 //                                               display_name $anon
-//                                               documentation ```scala\nfinal class $anon\n```
+//                                               signature_documentation scala final class $anon
 //                                             ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -1016,44 +1016,44 @@ object IndexedValue extends Transformer[IndexedValue]{
       val out = mutable.Buffer.empty[(String, IndexedValue)]
 //        ^^^ definition local 60
 //            display_name out
-//            documentation ```scala\nprivate val out: Buffer[(String, IndexedValue)]\n```
+//            signature_documentation scala private val out: Buffer[(String, IndexedValue)]
 //              ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer.
-//                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/SeqFactory.Delegate#empty().
-//                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer.
+//                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/SeqFactory.Delegate#empty().
+//                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                            ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
       var currentKey: String = _
 //        ^^^^^^^^^^ definition local 61
 //                   display_name currentKey
-//                   documentation ```scala\nprivate var currentKey: String\n```
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                   signature_documentation scala private var currentKey: String
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
       def subVisitor = Builder
 //        ^^^^^^^^^^ definition local 56
 //                   display_name subVisitor
-//                   documentation ```scala\ndef subVisitor: Builder\n```
+//                   signature_documentation scala def subVisitor: Builder
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitKey(index: Int) = IndexedValue.Builder
 //        ^^^^^^^^ definition local 57
 //                 display_name visitKey
-//                 documentation ```scala\ndef visitKey(index: Int): Builder\n```
+//                 signature_documentation scala def visitKey(index: Int): Builder
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                 ^^^^^ definition local 58
 //                       display_name index
-//                       documentation ```scala\nindex: Int \n```
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                       signature_documentation scala index: Int 
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                               ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitKeyValue(s: Any): Unit = currentKey = s.asInstanceOf[IndexedValue.Str].value0.toString
 //        ^^^^^^^^^^^^^ definition local 63
 //                      display_name visitKeyValue
-//                      documentation ```scala\ndef visitKeyValue(s: Any): Unit\n```
+//                      signature_documentation scala def visitKeyValue(s: Any): Unit
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                      ^ definition local 67
 //                        display_name s
-//                        documentation ```scala\ns: Any \n```
+//                        signature_documentation scala s: Any 
 //                         ^^^ reference semanticdb maven . . scala/Any#
-//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                      ^^^^^^^^^^ reference local 62
 //                                                   ^ reference local 67
 //                                                     ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
@@ -1064,50 +1064,50 @@ object IndexedValue extends Transformer[IndexedValue]{
       def visitValue(v: IndexedValue, index: Int): Unit = {
 //        ^^^^^^^^^^ definition local 64
 //                   display_name visitValue
-//                   documentation ```scala\ndef visitValue(v: IndexedValue, index: Int): Unit\n```
+//                   signature_documentation scala def visitValue(v: IndexedValue, index: Int): Unit
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                   ^ definition local 68
 //                     display_name v
-//                     documentation ```scala\nv: IndexedValue \n```
+//                     signature_documentation scala v: IndexedValue 
 //                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                    ^^^^^ definition local 69
 //                                          display_name index
-//                                          documentation ```scala\nindex: Int \n```
-//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                          signature_documentation scala index: Int 
+//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
         out.append((currentKey, v))
 //      ^^^ reference local 60
-//          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer#append().
+//          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer#append().
 //                  ^^^^^^^^^^ reference local 61
 //                              ^ reference local 68
       }
       def visitEnd(index: Int): IndexedValue.Obj = IndexedValue.Obj(i, out.toSeq:_*)
 //        ^^^^^^^^ definition local 65
 //                 display_name visitEnd
-//                 documentation ```scala\ndef visitEnd(index: Int): Obj\n```
+//                 signature_documentation scala def visitEnd(index: Int): Obj
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                 ^^^^^ definition local 70
 //                       display_name index
-//                       documentation ```scala\nindex: Int \n```
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                       signature_documentation scala index: Int 
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(i)
 //                                                                     ^^^ reference local 60
-//                                                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#toSeq().
+//                                                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#toSeq().
     }
 
     def visitNull(i: Int) = IndexedValue.Null(i)
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitNull().
 //                display_name visitNull
-//                documentation ```scala\ndef visitNull(i: Int): Null\n```
+//                signature_documentation scala def visitNull(i: Int): Null
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitNull().(i)
 //                  display_name i
-//                  documentation ```scala\ni: Int \n```
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                  signature_documentation scala i: Int 
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                          ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitNull().(i)
@@ -1115,12 +1115,12 @@ object IndexedValue extends Transformer[IndexedValue]{
     def visitFalse(i: Int) = IndexedValue.False(i)
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFalse().
 //                 display_name visitFalse
-//                 documentation ```scala\ndef visitFalse(i: Int): False\n```
+//                 signature_documentation scala def visitFalse(i: Int): False
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFalse().(i)
 //                   display_name i
-//                   documentation ```scala\ni: Int \n```
-//                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                   signature_documentation scala i: Int 
+//                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFalse().(i)
@@ -1128,12 +1128,12 @@ object IndexedValue extends Transformer[IndexedValue]{
     def visitTrue(i: Int) = IndexedValue.True(i)
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitTrue().
 //                display_name visitTrue
-//                documentation ```scala\ndef visitTrue(i: Int): True\n```
+//                signature_documentation scala def visitTrue(i: Int): True
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitTrue().(i)
 //                  display_name i
-//                  documentation ```scala\ni: Int \n```
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                  signature_documentation scala i: Int 
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                          ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitTrue().(i)
@@ -1141,24 +1141,24 @@ object IndexedValue extends Transformer[IndexedValue]{
     def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, i: Int) = IndexedValue.Num(i, s, decIndex, expIndex)
 //      ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().
 //                              display_name visitFloat64StringParts
-//                              documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, i: Int): Num\n```
+//                              signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, i: Int): Num
 //                              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(s)
 //                                display_name s
-//                                documentation ```scala\ns: CharSequence \n```
+//                                signature_documentation scala s: CharSequence 
 //                                 ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(decIndex)
 //                                                        display_name decIndex
-//                                                        documentation ```scala\ndecIndex: Int \n```
-//                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                        signature_documentation scala decIndex: Int 
+//                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                              ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(expIndex)
 //                                                                       display_name expIndex
-//                                                                       documentation ```scala\nexpIndex: Int \n```
-//                                                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                       signature_documentation scala expIndex: Int 
+//                                                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(i)
 //                                                                               display_name i
-//                                                                               documentation ```scala\ni: Int \n```
-//                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                               signature_documentation scala i: Int 
+//                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                                       ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                                                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //                                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(i)
@@ -1168,17 +1168,17 @@ object IndexedValue extends Transformer[IndexedValue]{
     override def visitFloat64(d: Double, i: Int) = IndexedValue.NumRaw(i, d)
 //               ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().
 //                            display_name visitFloat64
-//                            documentation ```scala\ndef visitFloat64(d: Double, i: Int): NumRaw\n```
+//                            signature_documentation scala def visitFloat64(d: Double, i: Int): NumRaw
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(d)
 //                              display_name d
-//                              documentation ```scala\nd: Double \n```
-//                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
+//                              signature_documentation scala d: Double 
+//                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(i)
 //                                         display_name i
-//                                         documentation ```scala\ni: Int \n```
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                         signature_documentation scala i: Int 
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(i)
@@ -1187,16 +1187,16 @@ object IndexedValue extends Transformer[IndexedValue]{
     def visitString(s: CharSequence, i: Int) = IndexedValue.Str(i, s)
 //      ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().
 //                  display_name visitString
-//                  documentation ```scala\ndef visitString(s: CharSequence, i: Int): Str\n```
+//                  signature_documentation scala def visitString(s: CharSequence, i: Int): Str
 //                  relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().(s)
 //                    display_name s
-//                    documentation ```scala\ns: CharSequence \n```
+//                    signature_documentation scala s: CharSequence 
 //                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().(i)
 //                                     display_name i
-//                                     documentation ```scala\ni: Int \n```
-//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                     signature_documentation scala i: Int 
+//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().(i)
diff --git a/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala b/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
index f20e8a786..5ef31b3b6 100644
--- a/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
@@ -31,21 +31,21 @@ import upickle.core.{BufferingInputStreamParser, ObjArrVisitor, Visitor}
 final class InputStreamParser[J](val inputStream: java.io.InputStream,
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#
 //                            display_name InputStreamParser
-//                            documentation ```scala\nfinal class InputStreamParser[J]\n```
+//                            signature_documentation scala final class InputStreamParser[J]
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#[J]
 //                              display_name J
-//                              documentation ```scala\nJ\n```
+//                              signature_documentation scala J
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().
 //                                display_name <init>
-//                                documentation ```scala\ndef this(inputStream: InputStream, minBufferStartSize: Int, maxBufferStartSize: Int)\n```
+//                                signature_documentation scala def this(inputStream: InputStream, minBufferStartSize: Int, maxBufferStartSize: Int)
 //                                   ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#inputStream.
 //                                               display_name inputStream
-//                                               documentation ```scala\nval inputStream: InputStream\n```
+//                                               signature_documentation scala val inputStream: InputStream
 //                                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(inputStream)
 //                                               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#inputStream().
 //                                   ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(inputStream)
 //                                               display_name inputStream
-//                                               documentation ```scala\ninputStream: InputStream \n```
+//                                               signature_documentation scala inputStream: InputStream 
 //                                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#inputStream.
 //                                                ^^^^ reference semanticdb maven . . java/
 //                                                     ^^ reference semanticdb maven . . java/io/
@@ -53,12 +53,12 @@ final class InputStreamParser[J](val inputStream: java.io.InputStream,
                                  val minBufferStartSize: Int = BufferingInputStreamParser.defaultMinBufferStartSize,
 //                                   ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#minBufferStartSize.
 //                                                      display_name minBufferStartSize
-//                                                      documentation ```scala\nval minBufferStartSize: Int\n```
+//                                                      signature_documentation scala val minBufferStartSize: Int
 //                                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(minBufferStartSize)
 //                                                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#minBufferStartSize().
 //                                   __________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(minBufferStartSize)
 //                                                      display_name minBufferStartSize
-//                                                      documentation ```scala\ndefault minBufferStartSize: Int \n```
+//                                                      signature_documentation scala default minBufferStartSize: Int 
 //                                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#minBufferStartSize.
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser.
@@ -66,12 +66,12 @@ final class InputStreamParser[J](val inputStream: java.io.InputStream,
                                  val maxBufferStartSize: Int = BufferingInputStreamParser.defaultMaxBufferStartSize)
 //                                   ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#maxBufferStartSize.
 //                                                      display_name maxBufferStartSize
-//                                                      documentation ```scala\nval maxBufferStartSize: Int\n```
+//                                                      signature_documentation scala val maxBufferStartSize: Int
 //                                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(maxBufferStartSize)
 //                                                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#maxBufferStartSize().
 //                                   __________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(maxBufferStartSize)
 //                                                      display_name maxBufferStartSize
-//                                                      documentation ```scala\ndefault maxBufferStartSize: Int \n```
+//                                                      signature_documentation scala default maxBufferStartSize: Int 
 //                                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#maxBufferStartSize.
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser.
@@ -86,14 +86,14 @@ extends ByteParser[J] with upickle.core.BufferingInputStreamParser{
   protected[this] final def close() = {}
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#close().
 //                                display_name close
-//                                documentation ```scala\nfinal def close(): Unit\n```
+//                                signature_documentation scala final def close(): Unit
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 }
 
 object InputStreamParser extends Transformer[java.io.InputStream]{
 //     ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.
 //                       display_name InputStreamParser
-//                       documentation ```scala\nobject InputStreamParser\n```
+//                       signature_documentation scala object InputStreamParser
 //                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                           ^^^^ reference semanticdb maven . . java/
 //                                                ^^ reference semanticdb maven . . java/io/
@@ -102,26 +102,26 @@ object InputStreamParser extends Transformer[java.io.InputStream]{
   def transform[T](j: java.io.InputStream, f: Visitor[_, T]) = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(j: InputStream, f: Visitor[local0, T[): T\n```
+//              signature_documentation scala def transform(j: InputStream, f: Visitor[local0, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().(j)
 //                   display_name j
-//                   documentation ```scala\nj: InputStream \n```
+//                   signature_documentation scala j: InputStream 
 //                    ^^^^ reference semanticdb maven . . java/
 //                         ^^ reference semanticdb maven . . java/io/
 //                            ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/InputStream#
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().(f)
 //                                           display_name f
-//                                           documentation ```scala\nf: Visitor[local0, T[ \n```
+//                                           signature_documentation scala f: Visitor[local0, T[ 
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
     val p = new InputStreamParser[T](j)
 //      ^ definition local 1
 //        display_name p
-//        documentation ```scala\np: InputStreamParser[T] \n```
+//        signature_documentation scala p: InputStreamParser[T] 
 //              ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
 //                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().
diff --git a/tests/snapshots/src/main/generated/ujson/JsVisitor.scala b/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
index a49451f27..894280cf6 100644
--- a/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
+++ b/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
@@ -16,20 +16,20 @@ import upickle.core.{ArrVisitor, ObjVisitor, Visitor}
 trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //              display_name JsVisitor
-//              documentation ```scala\ntrait JsVisitor[T, J]\n```
+//              signature_documentation scala trait JsVisitor[T, J]
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[T]
 //                 display_name T
-//                 documentation ```scala\nT\n```
+//                 signature_documentation scala T
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                     display_name J
-//                     documentation ```scala\nJ\n```
+//                     signature_documentation scala J
 //                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[T]
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
   def visitFloat64(d: Double, index: Int): J = {
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                 display_name visitFloat64
-//                 documentation ```scala\ndef visitFloat64(d: Double, index: Int): J\n```
+//                 signature_documentation scala def visitFloat64(d: Double, index: Int): J
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().
@@ -37,22 +37,22 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
 //                   display_name d
-//                   documentation ```scala\nd: Double \n```
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
+//                   signature_documentation scala d: Double 
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(index)
 //                                  display_name index
-//                                  documentation ```scala\nindex: Int \n```
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                  signature_documentation scala index: Int 
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val i = d.toLong
 //      ^ definition local 0
 //        display_name i
-//        documentation ```scala\ni: Long \n```
+//        signature_documentation scala i: Long 
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
-//            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toLong().
+//            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toLong().
     if(i == d) visitFloat64StringParts(i.toString, -1, -1, index)
 //     ^ reference local 0
-//       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`==`(+6).
+//       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`==`(+6).
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
 //             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                     ^ reference local 0
@@ -69,16 +69,16 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitFloat32(d: Float, index: Int): J = visitFloat64(d, index)
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().
 //                 display_name visitFloat32
-//                 documentation ```scala\ndef visitFloat32(d: Float, index: Int): J\n```
+//                 signature_documentation scala def visitFloat32(d: Float, index: Int): J
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat32().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(d)
 //                   display_name d
-//                   documentation ```scala\nd: Float \n```
-//                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Float#
+//                   signature_documentation scala d: Float 
+//                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Float#
 //                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(index)
 //                                 display_name index
-//                                 documentation ```scala\nindex: Int \n```
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                 signature_documentation scala index: Int 
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                            ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(d)
@@ -86,16 +86,16 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitInt32(i: Int, index: Int): J = visitFloat64(i, index)
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().
 //               display_name visitInt32
-//               documentation ```scala\ndef visitInt32(i: Int, index: Int): J\n```
+//               signature_documentation scala def visitInt32(i: Int, index: Int): J
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitInt32().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(i)
 //                 display_name i
-//                 documentation ```scala\ni: Int \n```
-//                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                 signature_documentation scala i: Int 
+//                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(index)
 //                             display_name index
-//                             documentation ```scala\nindex: Int \n```
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                             signature_documentation scala index: Int 
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(i)
@@ -103,27 +103,27 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitInt64(i: Long, index: Int): J = {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().
 //               display_name visitInt64
-//               documentation ```scala\ndef visitInt64(i: Long, index: Int): J\n```
+//               signature_documentation scala def visitInt64(i: Long, index: Int): J
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitInt64().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
 //                 display_name i
-//                 documentation ```scala\ni: Long \n```
-//                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
+//                 signature_documentation scala i: Long 
+//                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(index)
 //                              display_name index
-//                              documentation ```scala\nindex: Int \n```
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                              signature_documentation scala index: Int 
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     if (math.abs(i) > math.pow(2, 53) || i == -9223372036854775808L) visitString(i.toString, index)
 //      ^^^^ reference semanticdb maven . . scala/math/
-//           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/math/package.abs(+1).
+//           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/math/package.abs(+1).
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
-//                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`>`(+6).
+//                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`>`(+6).
 //                    ^^^^ reference semanticdb maven . . scala/math/
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/math/package.pow().
-//                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/math/package.pow().
+//                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
-//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`==`(+4).
+//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`==`(+4).
 //                                                                   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
 //                                                                                 ^^^^^^^^ reference semanticdb maven . . scala/Any#toString().
@@ -136,25 +136,25 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitUInt64(i: Long, index: Int): J = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().
 //                display_name visitUInt64
-//                documentation ```scala\ndef visitUInt64(i: Long, index: Int): J\n```
+//                signature_documentation scala def visitUInt64(i: Long, index: Int): J
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitUInt64().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(i)
 //                  display_name i
-//                  documentation ```scala\ni: Long \n```
-//                   ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
+//                  signature_documentation scala i: Long 
+//                   ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
 //                         ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(index)
 //                               display_name index
-//                               documentation ```scala\nindex: Int \n```
-//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                               signature_documentation scala index: Int 
+//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     if (i > math.pow(2, 53) || i < 0) visitString(java.lang.Long.toUnsignedString(i), index)
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(i)
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`>`(+6).
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`>`(+6).
 //          ^^^^ reference semanticdb maven . . scala/math/
-//               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/math/package.pow().
-//                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/math/package.pow().
+//                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(i)
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`<`(+3).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`<`(+3).
 //                                    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                ^^^^ reference semanticdb maven . . java/
 //                                                     ^^^^ reference semanticdb maven . . java/lang/
@@ -171,16 +171,16 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitFloat64String(s: String, index: Int): J = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().
 //                       display_name visitFloat64String
-//                       documentation ```scala\ndef visitFloat64String(s: String, index: Int): J\n```
+//                       signature_documentation scala def visitFloat64String(s: String, index: Int): J
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64String().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().(s)
 //                         display_name s
-//                         documentation ```scala\ns: String \n```
-//                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                         signature_documentation scala s: String 
+//                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().(index)
 //                                        display_name index
-//                                        documentation ```scala\nindex: Int \n```
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                        signature_documentation scala index: Int 
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     visitFloat64StringParts(
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
@@ -198,7 +198,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
         case n => n
 //           ^ definition local 1
 //             display_name n
-//             documentation ```scala\nn: Int \n```
+//             signature_documentation scala n: Int 
 //                ^ reference local 1
       },
       -1
@@ -208,40 +208,40 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitBinary(bytes: Array[Byte], offset: Int, len: Int, index: Int): J = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().
 //                display_name visitBinary
-//                documentation ```scala\ndef visitBinary(bytes: Array[Byte], offset: Int, len: Int, index: Int): J\n```
+//                signature_documentation scala def visitBinary(bytes: Array[Byte], offset: Int, len: Int, index: Int): J
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitBinary().
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(bytes)
 //                      display_name bytes
-//                      documentation ```scala\nbytes: Array[Byte] \n```
-//                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                      signature_documentation scala bytes: Array[Byte] 
+//                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(offset)
 //                                           display_name offset
-//                                           documentation ```scala\noffset: Int \n```
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           signature_documentation scala offset: Int 
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
 //                                                     display_name len
-//                                                     documentation ```scala\nlen: Int \n```
-//                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                     signature_documentation scala len: Int 
+//                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
 //                                                                 display_name index
-//                                                                 documentation ```scala\nindex: Int \n```
-//                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                 signature_documentation scala index: Int 
+//                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val arr = visitArray(len, index)
 //      ^^^ definition local 2
 //          display_name arr
-//          documentation ```scala\narr: ArrVisitor[T, J] \n```
+//          signature_documentation scala arr: ArrVisitor[T, J] 
 //            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
     var i = 0
 //      ^ definition local 3
 //        display_name i
-//        documentation ```scala\ni: Int \n```
+//        signature_documentation scala i: Int 
     while (i < len){
 //         ^ reference local 3
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+3).
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+3).
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
       arr.visitValue(arr.subVisitor.visitInt32(bytes(offset + i), index).asInstanceOf[T], index)
 //    ^^^ reference local 2
@@ -251,7 +251,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitInt32().
 //                                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(bytes)
 //                                                   ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(offset)
-//                                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
 //                                                            ^ reference local 3
 //                                                                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
 //                                                                       ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
@@ -259,7 +259,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                                                                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
       i += 1
 //    ^ reference local 3
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
     }
     arr.visitEnd(index)
 //  ^^^ reference local 2
@@ -270,19 +270,19 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int): J = visitFloat64StringParts(s, decIndex, expIndex, -1)
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().
 //                            display_name visitFloat64StringParts
-//                            documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int): J\n```
+//                            signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int): J
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(s)
 //                              display_name s
-//                              documentation ```scala\ns: CharSequence \n```
+//                              signature_documentation scala s: CharSequence 
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(decIndex)
 //                                                      display_name decIndex
-//                                                      documentation ```scala\ndecIndex: Int \n```
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                      signature_documentation scala decIndex: Int 
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
-//                                                                     documentation ```scala\nexpIndex: Int \n```
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                     signature_documentation scala expIndex: Int 
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                                                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(s)
@@ -292,34 +292,34 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitExt(tag: Byte, bytes: Array[Byte], offset: Int, len: Int, index: Int): J = {
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().
 //             display_name visitExt
-//             documentation ```scala\ndef visitExt(tag: Byte, bytes: Array[Byte], offset: Int, len: Int, index: Int): J\n```
+//             signature_documentation scala def visitExt(tag: Byte, bytes: Array[Byte], offset: Int, len: Int, index: Int): J
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitExt().
 //             ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(tag)
 //                 display_name tag
-//                 documentation ```scala\ntag: Byte \n```
-//                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                 signature_documentation scala tag: Byte 
+//                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(bytes)
 //                              display_name bytes
-//                              documentation ```scala\nbytes: Array[Byte] \n```
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                              signature_documentation scala bytes: Array[Byte] 
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(offset)
 //                                                   display_name offset
-//                                                   documentation ```scala\noffset: Int \n```
-//                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                   signature_documentation scala offset: Int 
+//                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(len)
 //                                                             display_name len
-//                                                             documentation ```scala\nlen: Int \n```
-//                                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                             signature_documentation scala len: Int 
+//                                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                   ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(index)
 //                                                                         display_name index
-//                                                                         documentation ```scala\nindex: Int \n```
-//                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                         signature_documentation scala index: Int 
+//                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val arr = visitArray(-1, index)
 //      ^^^ definition local 5
 //          display_name arr
-//          documentation ```scala\narr: ArrVisitor[T, J] \n```
+//          signature_documentation scala arr: ArrVisitor[T, J] 
 //            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(index)
     arr.visitValue(visitFloat64(tag, index).asInstanceOf[T], -1)
@@ -348,16 +348,16 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
   def visitChar(s: Char, index: Int) = visitString(s.toString, index)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().
 //              display_name visitChar
-//              documentation ```scala\ndef visitChar(s: Char, index: Int): J\n```
+//              signature_documentation scala def visitChar(s: Char, index: Int): J
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitChar().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(s)
 //                display_name s
-//                documentation ```scala\ns: Char \n```
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
+//                signature_documentation scala s: Char 
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(index)
 //                             display_name index
-//                             documentation ```scala\nindex: Int \n```
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                             signature_documentation scala index: Int 
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(s)
 //                                                   ^^^^^^^^ reference semanticdb maven . . scala/Any#toString().
diff --git a/tests/snapshots/src/main/generated/ujson/Readable.scala b/tests/snapshots/src/main/generated/ujson/Readable.scala
index 47be075a7..a93858cb2 100644
--- a/tests/snapshots/src/main/generated/ujson/Readable.scala
+++ b/tests/snapshots/src/main/generated/ujson/Readable.scala
@@ -19,19 +19,19 @@ import upickle.core.{Visitor, ObjArrVisitor}
 trait Readable {
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //             display_name Readable
-//             documentation ```scala\ntrait Readable\n```
+//             signature_documentation scala trait Readable
   def transform[T](f: Visitor[_, T]): T
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(f: Visitor[local0, T[): T\n```
+//              signature_documentation scala def transform(f: Visitor[local0, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().(f)
 //                   display_name f
-//                   documentation ```scala\nf: Visitor[local0, T[ \n```
+//                   signature_documentation scala f: Visitor[local0, T[ 
 //                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().[T]
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().[T]
@@ -40,93 +40,93 @@ trait Readable {
 object Readable extends ReadableLowPri{
 //     ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.
 //              display_name Readable
-//              documentation ```scala\nobject Readable\n```
+//              signature_documentation scala object Readable
 //                      ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#
 //                                    ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class fromTransformer[T](t: T, w: Transformer[T]) extends Readable{
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           display_name fromTransformer
-//                           documentation ```scala\ncase class fromTransformer(t: T, w: Transformer[T])[T] extends Readable\n```
+//                           signature_documentation scala case class fromTransformer(t: T, w: Transformer[T])[T] extends Readable
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().
 //                           display_name copy
-//                           documentation ```scala\ndef copy(t: T, w: Transformer[T]): fromTransformer[T]\n```
+//                           signature_documentation scala def copy(t: T, w: Transformer[T]): fromTransformer[T]
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#productElement().
 //                           display_name productElement
-//                           documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                           signature_documentation scala def productElement(x$1: Int): Any
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
-//                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //                           display_name apply
-//                           documentation ```scala\ndef apply(t: T, w: Transformer[T]): fromTransformer[T]\n```
+//                           signature_documentation scala def apply(t: T, w: Transformer[T]): fromTransformer[T]
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.
 //                           display_name fromTransformer
-//                           documentation ```scala\nobject fromTransformer\n```
+//                           signature_documentation scala object fromTransformer
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#productElementName().
 //                           display_name productElementName
-//                           documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                           signature_documentation scala def productElementName(x$1: Int): String
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
-//                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#[T]
 //                             display_name T
-//                             documentation ```scala\nT\n```
+//                             signature_documentation scala T
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().
 //                               display_name <init>
-//                               documentation ```scala\ndef this(t: T, w: Transformer[T])\n```
+//                               signature_documentation scala def this(t: T, w: Transformer[T])
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                display_name t
-//                                documentation ```scala\nval t: T\n```
+//                                signature_documentation scala val t: T
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                display_name t
-//                                documentation ```scala\ndefault t: T \n```
+//                                signature_documentation scala default t: T 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                display_name t
-//                                documentation ```scala\nt: T \n```
+//                                signature_documentation scala t: T 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                                display_name t
-//                                documentation ```scala\nt: T \n```
+//                                signature_documentation scala t: T 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#[T]
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
 //                                      display_name w
-//                                      documentation ```scala\nval w: Transformer[T]\n```
+//                                      signature_documentation scala val w: Transformer[T]
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      display_name w
-//                                      documentation ```scala\ndefault w: Transformer[T] \n```
+//                                      signature_documentation scala default w: Transformer[T] 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      display_name w
-//                                      documentation ```scala\nw: Transformer[T] \n```
+//                                      signature_documentation scala w: Transformer[T] 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                      display_name w
-//                                      documentation ```scala\nw: Transformer[T] \n```
+//                                      signature_documentation scala w: Transformer[T] 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
@@ -137,14 +137,14 @@ object Readable extends ReadableLowPri{
     def transform[T](f: Visitor[_, T]): T = {
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().
 //                display_name transform
-//                documentation ```scala\ndef transform(f: Visitor[local1, T[): T\n```
+//                signature_documentation scala def transform(f: Visitor[local1, T[): T
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().[T]
 //                  display_name T
-//                  documentation ```scala\nT\n```
+//                  signature_documentation scala T
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().(f)
 //                     display_name f
-//                     documentation ```scala\nf: Visitor[local1, T[ \n```
+//                     signature_documentation scala f: Visitor[local1, T[ 
 //                      ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().[T]
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().[T]
@@ -158,13 +158,13 @@ object Readable extends ReadableLowPri{
   implicit def fromString(s: String): fromTransformer[String] = new fromTransformer(s, StringParser)
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromString().
 //                        display_name fromString
-//                        documentation ```scala\nimplicit def fromString(s: String): fromTransformer[String]\n```
+//                        signature_documentation scala implicit def fromString(s: String): fromTransformer[String]
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromString().(s)
 //                          display_name s
-//                          documentation ```scala\ns: String \n```
-//                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                          signature_documentation scala s: String 
+//                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
-//                                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromString().(s)
@@ -172,10 +172,10 @@ object Readable extends ReadableLowPri{
   implicit def fromCharSequence(s: CharSequence): fromTransformer[CharSequence] = new fromTransformer(s, CharSequenceParser)
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromCharSequence().
 //                              display_name fromCharSequence
-//                              documentation ```scala\nimplicit def fromCharSequence(s: CharSequence): fromTransformer[CharSequence]\n```
+//                              signature_documentation scala implicit def fromCharSequence(s: CharSequence): fromTransformer[CharSequence]
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromCharSequence().(s)
 //                                display_name s
-//                                documentation ```scala\ns: CharSequence \n```
+//                                signature_documentation scala s: CharSequence 
 //                                 ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                                ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
@@ -186,10 +186,10 @@ object Readable extends ReadableLowPri{
   implicit def fromPath(s: java.nio.file.Path): Readable = new Readable {
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromPath().
 //                      display_name fromPath
-//                      documentation ```scala\nimplicit def fromPath(s: Path): Readable\n```
+//                      signature_documentation scala implicit def fromPath(s: Path): Readable
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromPath().(s)
 //                        display_name s
-//                        documentation ```scala\ns: Path \n```
+//                        signature_documentation scala s: Path 
 //                         ^^^^ reference semanticdb maven . . java/
 //                              ^^^ reference semanticdb maven . . java/nio/
 //                                  ^^^^ reference semanticdb maven . . java/nio/file/
@@ -197,26 +197,26 @@ object Readable extends ReadableLowPri{
 //                                              ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                             ^ definition local 3
 //                                                               display_name $anon
-//                                                               documentation ```scala\nfinal class $anon\n```
+//                                                               signature_documentation scala final class $anon
 //                                                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     override def transform[T](f: Visitor[_, T]) = {
 //               ^^^^^^^^^ definition local 4
 //                         display_name transform
-//                         documentation ```scala\ndef transform(f: Visitor[local7, local6[): local6\n```
+//                         signature_documentation scala def transform(f: Visitor[local7, local6[): local6
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                         ^ definition local 6
 //                           display_name T
-//                           documentation ```scala\nT\n```
+//                           signature_documentation scala T
 //                            ^ definition local 5
 //                              display_name f
-//                              documentation ```scala\nf: Visitor[local7, local6[ \n```
+//                              signature_documentation scala f: Visitor[local7, local6[ 
 //                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                          ^ reference local 6
       val inputStream = java.nio.file.Files.newInputStream(s)
 //        ^^^^^^^^^^^ definition local 8
 //                    display_name inputStream
-//                    documentation ```scala\ninputStream: InputStream \n```
+//                    signature_documentation scala inputStream: InputStream 
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^^ reference semanticdb maven . . java/nio/
 //                               ^^^^ reference semanticdb maven . . java/nio/file/
@@ -236,10 +236,10 @@ object Readable extends ReadableLowPri{
   implicit def fromFile(s: java.io.File): Readable = fromPath(s.toPath)
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromFile().
 //                      display_name fromFile
-//                      documentation ```scala\nimplicit def fromFile(s: File): Readable\n```
+//                      signature_documentation scala implicit def fromFile(s: File): Readable
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromFile().(s)
 //                        display_name s
-//                        documentation ```scala\ns: File \n```
+//                        signature_documentation scala s: File 
 //                         ^^^^ reference semanticdb maven . . java/
 //                              ^^ reference semanticdb maven . . java/io/
 //                                 ^^^^ reference semanticdb maven jdk 11 java/io/File#
@@ -250,10 +250,10 @@ object Readable extends ReadableLowPri{
   implicit def fromByteBuffer(s: ByteBuffer): fromTransformer[ByteBuffer] = new fromTransformer(s, ByteBufferParser)
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteBuffer().
 //                            display_name fromByteBuffer
-//                            documentation ```scala\nimplicit def fromByteBuffer(s: ByteBuffer): fromTransformer[ByteBuffer]\n```
+//                            signature_documentation scala implicit def fromByteBuffer(s: ByteBuffer): fromTransformer[ByteBuffer]
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteBuffer().(s)
 //                              display_name s
-//                              documentation ```scala\ns: ByteBuffer \n```
+//                              signature_documentation scala s: ByteBuffer 
 //                               ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                            ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
@@ -264,15 +264,15 @@ object Readable extends ReadableLowPri{
   implicit def fromByteArray(s: Array[Byte]): fromTransformer[Array[Byte]] = new fromTransformer(s, ByteArrayParser)
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteArray().
 //                           display_name fromByteArray
-//                           documentation ```scala\nimplicit def fromByteArray(s: Array[Byte]): fromTransformer[Array[Byte]]\n```
+//                           signature_documentation scala implicit def fromByteArray(s: Array[Byte]): fromTransformer[Array[Byte]]
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteArray().(s)
 //                             display_name s
-//                             documentation ```scala\ns: Array[Byte] \n```
-//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                             signature_documentation scala s: Array[Byte] 
+//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
-//                                                            ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                                                            ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                                                               ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().
 //                                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteArray().(s)
@@ -282,41 +282,41 @@ object Readable extends ReadableLowPri{
 trait ReadableLowPri{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#
 //                   display_name ReadableLowPri
-//                   documentation ```scala\ntrait ReadableLowPri\n```
+//                   signature_documentation scala trait ReadableLowPri
   implicit def fromReadable[T](s: T)(implicit conv: T => geny.Readable): Readable = new Readable{
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().
 //                          display_name fromReadable
-//                          documentation ```scala\nimplicit def fromReadable(s: T)(conv: (T) => Readable): Readable\n```
+//                          signature_documentation scala implicit def fromReadable(s: T)(conv: (T) => Readable): Readable
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
 //                            display_name T
-//                            documentation ```scala\nT\n```
+//                            signature_documentation scala T
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().(s)
 //                               display_name s
-//                               documentation ```scala\ns: T \n```
+//                               signature_documentation scala s: T 
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
 //                                            ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().(conv)
 //                                                 display_name conv
-//                                                 documentation ```scala\nimplicit conv: (T) => Readable \n```
+//                                                 signature_documentation scala implicit conv: (T) => Readable 
 //                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
 //                                                       ^^^^ reference semanticdb maven . . geny/
 //                                                            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Readable#
 //                                                                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                                                      ^ definition local 9
 //                                                                                        display_name $anon
-//                                                                                        documentation ```scala\nfinal class $anon\n```
+//                                                                                        signature_documentation scala final class $anon
 //                                                                                      ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                                                              ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def transform[T](f: Visitor[_, T]): T = conv(s).readBytesThrough(InputStreamParser.transform(_, f))
 //      ^^^^^^^^^ definition local 10
 //                display_name transform
-//                documentation ```scala\ndef transform(f: Visitor[local13, local12[): local12\n```
+//                signature_documentation scala def transform(f: Visitor[local13, local12[): local12
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                ^ definition local 12
 //                  display_name T
-//                  documentation ```scala\nT\n```
+//                  signature_documentation scala T
 //                   ^ definition local 11
 //                     display_name f
-//                     documentation ```scala\nf: Visitor[local13, local12[ \n```
+//                     signature_documentation scala f: Visitor[local13, local12[ 
 //                      ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                 ^ reference local 12
 //                                      ^ reference local 12
diff --git a/tests/snapshots/src/main/generated/ujson/Renderer.scala b/tests/snapshots/src/main/generated/ujson/Renderer.scala
index 54b97fed8..6447c2447 100644
--- a/tests/snapshots/src/main/generated/ujson/Renderer.scala
+++ b/tests/snapshots/src/main/generated/ujson/Renderer.scala
@@ -22,85 +22,85 @@ import scala.annotation.switch
 case class BytesRenderer(indent: Int = -1, escapeUnicode: Boolean = false)
 //         ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       display_name BytesRenderer
-//                       documentation ```scala\ncase class BytesRenderer(indent: Int, escapeUnicode: Boolean) extends BaseByteRenderer[ByteArrayOutputStream]\n```
+//                       signature_documentation scala case class BytesRenderer(indent: Int, escapeUnicode: Boolean) extends BaseByteRenderer[ByteArrayOutputStream]
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#productElement().
 //                       display_name productElement
-//                       documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                       signature_documentation scala def productElement(x$1: Int): Any
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#productElementName().
 //                       display_name productElementName
-//                       documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                       signature_documentation scala def productElementName(x$1: Int): String
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.
 //                       display_name BytesRenderer
-//                       documentation ```scala\nobject BytesRenderer\n```
+//                       signature_documentation scala object BytesRenderer
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().
 //                       display_name copy
-//                       documentation ```scala\ndef copy(indent: Int, escapeUnicode: Boolean): BytesRenderer\n```
+//                       signature_documentation scala def copy(indent: Int, escapeUnicode: Boolean): BytesRenderer
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //                       display_name apply
-//                       documentation ```scala\ndef apply(indent: Int, escapeUnicode: Boolean): BytesRenderer\n```
+//                       signature_documentation scala def apply(indent: Int, escapeUnicode: Boolean): BytesRenderer
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().
 //                        display_name <init>
-//                        documentation ```scala\ndef this(indent: Int, escapeUnicode: Boolean)\n```
+//                        signature_documentation scala def this(indent: Int, escapeUnicode: Boolean)
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                              display_name indent
-//                              documentation ```scala\nval indent: Int\n```
+//                              signature_documentation scala val indent: Int
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              display_name indent
-//                              documentation ```scala\ndefault indent: Int \n```
+//                              signature_documentation scala default indent: Int 
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              display_name indent
-//                              documentation ```scala\ndefault indent: Int \n```
+//                              signature_documentation scala default indent: Int 
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                              display_name indent
-//                              documentation ```scala\ndefault indent: Int \n```
+//                              signature_documentation scala default indent: Int 
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                         ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                                       display_name escapeUnicode
-//                                                       documentation ```scala\nval escapeUnicode: Boolean\n```
+//                                                       signature_documentation scala val escapeUnicode: Boolean
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       display_name escapeUnicode
-//                                                       documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                                       signature_documentation scala default escapeUnicode: Boolean 
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
 //                                                       display_name escapeUnicode
-//                                                       documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                                       signature_documentation scala default escapeUnicode: Boolean 
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       display_name escapeUnicode
-//                                                       documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                                       signature_documentation scala default escapeUnicode: Boolean 
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
@@ -118,60 +118,60 @@ case class BytesRenderer(indent: Int = -1, escapeUnicode: Boolean = false)
 case class StringRenderer(indent: Int = -1,
 //         ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        display_name StringRenderer
-//                        documentation ```scala\ncase class StringRenderer(indent: Int, escapeUnicode: Boolean) extends BaseCharRenderer[StringWriter]\n```
+//                        signature_documentation scala case class StringRenderer(indent: Int, escapeUnicode: Boolean) extends BaseCharRenderer[StringWriter]
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
 //                        display_name StringRenderer
-//                        documentation ```scala\nobject StringRenderer\n```
+//                        signature_documentation scala object StringRenderer
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().
 //                        display_name copy
-//                        documentation ```scala\ndef copy(indent: Int, escapeUnicode: Boolean): StringRenderer\n```
+//                        signature_documentation scala def copy(indent: Int, escapeUnicode: Boolean): StringRenderer
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //                        display_name apply
-//                        documentation ```scala\ndef apply(indent: Int, escapeUnicode: Boolean): StringRenderer\n```
+//                        signature_documentation scala def apply(indent: Int, escapeUnicode: Boolean): StringRenderer
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#productElement().
 //                        display_name productElement
-//                        documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                        signature_documentation scala def productElement(x$1: Int): Any
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#productElementName().
 //                        display_name productElementName
-//                        documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                        signature_documentation scala def productElementName(x$1: Int): String
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().
 //                         display_name <init>
-//                         documentation ```scala\ndef this(indent: Int, escapeUnicode: Boolean)\n```
+//                         signature_documentation scala def this(indent: Int, escapeUnicode: Boolean)
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
 //                               display_name indent
-//                               documentation ```scala\nval indent: Int\n```
+//                               signature_documentation scala val indent: Int
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               display_name indent
-//                               documentation ```scala\ndefault indent: Int \n```
+//                               signature_documentation scala default indent: Int 
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               display_name indent
-//                               documentation ```scala\ndefault indent: Int \n```
+//                               signature_documentation scala default indent: Int 
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                               display_name indent
-//                               documentation ```scala\ndefault indent: Int \n```
+//                               signature_documentation scala default indent: Int 
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
@@ -179,25 +179,25 @@ case class StringRenderer(indent: Int = -1,
                           escapeUnicode: Boolean = false)
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                                      display_name escapeUnicode
-//                                      documentation ```scala\nval escapeUnicode: Boolean\n```
+//                                      signature_documentation scala val escapeUnicode: Boolean
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
 //                                      display_name escapeUnicode
-//                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                      signature_documentation scala default escapeUnicode: Boolean 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      display_name escapeUnicode
-//                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                      signature_documentation scala default escapeUnicode: Boolean 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      display_name escapeUnicode
-//                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                      signature_documentation scala default escapeUnicode: Boolean 
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
@@ -215,60 +215,60 @@ case class StringRenderer(indent: Int = -1,
 case class Renderer(out: java.io.Writer,
 //         ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  display_name Renderer
-//                  documentation ```scala\ncase class Renderer(out: Writer, indent: Int, escapeUnicode: Boolean) extends BaseCharRenderer[Writer]\n```
+//                  signature_documentation scala case class Renderer(out: Writer, indent: Int, escapeUnicode: Boolean) extends BaseCharRenderer[Writer]
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.
 //                  display_name Renderer
-//                  documentation ```scala\nobject Renderer\n```
+//                  signature_documentation scala object Renderer
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //                  display_name apply
-//                  documentation ```scala\ndef apply(out: Writer, indent: Int, escapeUnicode: Boolean): Renderer\n```
+//                  signature_documentation scala def apply(out: Writer, indent: Int, escapeUnicode: Boolean): Renderer
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function3#apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#productElementName().
 //                  display_name productElementName
-//                  documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                  signature_documentation scala def productElementName(x$1: Int): String
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().
 //                  display_name copy
-//                  documentation ```scala\ndef copy(out: Writer, indent: Int, escapeUnicode: Boolean): Renderer\n```
+//                  signature_documentation scala def copy(out: Writer, indent: Int, escapeUnicode: Boolean): Renderer
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#productElement().
 //                  display_name productElement
-//                  documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                  signature_documentation scala def productElement(x$1: Int): Any
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().
 //                   display_name <init>
-//                   documentation ```scala\ndef this(out: Writer, indent: Int, escapeUnicode: Boolean)\n```
+//                   signature_documentation scala def this(out: Writer, indent: Int, escapeUnicode: Boolean)
 //                  ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                      display_name out
-//                      documentation ```scala\nval out: Writer\n```
+//                      signature_documentation scala val out: Writer
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
 //                      display_name out
-//                      documentation ```scala\nout: Writer \n```
+//                      signature_documentation scala out: Writer 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      display_name out
-//                      documentation ```scala\ndefault out: Writer \n```
+//                      signature_documentation scala default out: Writer 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      display_name out
-//                      documentation ```scala\nout: Writer \n```
+//                      signature_documentation scala out: Writer 
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
@@ -278,25 +278,25 @@ case class Renderer(out: java.io.Writer,
                     indent: Int = -1,
 //                  ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
 //                         display_name indent
-//                         documentation ```scala\nval indent: Int\n```
+//                         signature_documentation scala val indent: Int
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         display_name indent
-//                         documentation ```scala\ndefault indent: Int \n```
+//                         signature_documentation scala default indent: Int 
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         display_name indent
-//                         documentation ```scala\ndefault indent: Int \n```
+//                         signature_documentation scala default indent: Int 
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                         display_name indent
-//                         documentation ```scala\ndefault indent: Int \n```
+//                         signature_documentation scala default indent: Int 
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
@@ -304,25 +304,25 @@ case class Renderer(out: java.io.Writer,
                     escapeUnicode: Boolean = false)
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                                display_name escapeUnicode
-//                                documentation ```scala\nval escapeUnicode: Boolean\n```
+//                                signature_documentation scala val escapeUnicode: Boolean
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
 //                                display_name escapeUnicode
-//                                documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                signature_documentation scala default escapeUnicode: Boolean 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                display_name escapeUnicode
-//                                documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                signature_documentation scala default escapeUnicode: Boolean 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                display_name escapeUnicode
-//                                documentation ```scala\ndefault escapeUnicode: Boolean \n```
+//                                signature_documentation scala default escapeUnicode: Boolean 
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
diff --git a/tests/snapshots/src/main/generated/ujson/StringParser.scala b/tests/snapshots/src/main/generated/ujson/StringParser.scala
index 6a9754b85..f948aa61d 100644
--- a/tests/snapshots/src/main/generated/ujson/StringParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/StringParser.scala
@@ -24,62 +24,62 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //      ^^^^^ reference semanticdb maven . . ujson/
 //                         ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#
 //                                      display_name StringParser
-//                                      documentation ```scala\nprotected[ujson] final class StringParser[J]\n```
+//                                      signature_documentation scala protected[ujson] final class StringParser[J]
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#[J]
 //                                        display_name J
-//                                        documentation ```scala\nJ\n```
+//                                        signature_documentation scala J
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().
 //                                          display_name <init>
-//                                          documentation ```scala\ndef this(s: String)\n```
+//                                          signature_documentation scala def this(s: String)
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                                           display_name s
-//                                           documentation ```scala\nprivate[this] val s: String\n```
+//                                           signature_documentation scala private[this] val s: String
 //                                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().(s)
 //                                         _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().(s)
 //                                           display_name s
-//                                           documentation ```scala\ns: String \n```
+//                                           signature_documentation scala s: String 
 //                                           relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
-//                                            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#[J]
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#`<init>`().
   private[this] val sLength = s.length
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#sLength.
 //                          display_name sLength
-//                          documentation ```scala\nprivate[this] val sLength: Int\n```
+//                          signature_documentation scala private[this] val sLength: Int
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#length().
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#growBuffer().
 //                        display_name growBuffer
-//                        documentation ```scala\ndef growBuffer(until: Int): Unit\n```
+//                        signature_documentation scala def growBuffer(until: Int): Unit
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#growBuffer().(until)
 //                              display_name until
-//                              documentation ```scala\nuntil: Int \n```
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                              signature_documentation scala until: Int 
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
-//                       documentation ```scala\ndef readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int): (Array[Char], Boolean, Int)\n```
+//                       signature_documentation scala def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int): (Array[Char], Boolean, Int)
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(buffer)
 //                              display_name buffer
-//                              documentation ```scala\nbuffer: Array[Char] \n```
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
+//                              signature_documentation scala buffer: Array[Char] 
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
-//                                                         documentation ```scala\nbufferOffset: Int \n```
-//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                         signature_documentation scala bufferOffset: Int 
+//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if(buffer == null) (s.toCharArray, sLength == 0, sLength)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(buffer)
 //            ^^ reference semanticdb maven jdk 11 java/lang/Object#`==`().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                        ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/String#toCharArray().
 //                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#sLength.
-//                                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
+//                                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
 //                                                   ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#sLength.
     else (buffer, true, -1)
 //        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(buffer)
@@ -87,32 +87,32 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
   final def close() = ()
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#close().
 //                display_name close
-//                documentation ```scala\nfinal def close(): Unit\n```
+//                signature_documentation scala final def close(): Unit
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
 }
 
 object StringParser extends Transformer[String]{
 //     ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.
 //                  display_name StringParser
-//                  documentation ```scala\nobject StringParser\n```
+//                  signature_documentation scala object StringParser
 //                          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
-//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                             ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: String, f: Visitor[_, T]) = new StringParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(j: String, f: Visitor[local0, T[): T\n```
+//              signature_documentation scala def transform(j: String, f: Visitor[local0, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().(j)
 //                   display_name j
-//                   documentation ```scala\nj: String \n```
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                   signature_documentation scala j: String 
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().(f)
 //                              display_name f
-//                              documentation ```scala\nf: Visitor[local0, T[ \n```
+//                              signature_documentation scala f: Visitor[local0, T[ 
 //                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().[T]
 //                                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#
diff --git a/tests/snapshots/src/main/generated/ujson/Transformer.scala b/tests/snapshots/src/main/generated/ujson/Transformer.scala
index a283c3a06..63857eacc 100644
--- a/tests/snapshots/src/main/generated/ujson/Transformer.scala
+++ b/tests/snapshots/src/main/generated/ujson/Transformer.scala
@@ -9,14 +9,14 @@ import upickle.core.Visitor
 trait Transformer[I] {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                display_name Transformer
-//                documentation ```scala\ntrait Transformer[I]\n```
+//                signature_documentation scala trait Transformer[I]
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
 //                  display_name I
-//                  documentation ```scala\nI\n```
+//                  signature_documentation scala I
   def transform[T](j: I, f: Visitor[_, T]): T
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(j: I, f: Visitor[local0, T[): T\n```
+//              signature_documentation scala def transform(j: I, f: Visitor[local0, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().
@@ -26,27 +26,27 @@ trait Transformer[I] {
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().(j)
 //                   display_name j
-//                   documentation ```scala\nj: I \n```
+//                   signature_documentation scala j: I 
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().(f)
 //                         display_name f
-//                         documentation ```scala\nf: Visitor[local0, T[ \n```
+//                         signature_documentation scala f: Visitor[local0, T[ 
 //                          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
   def transformable[T](j: I) = Readable.fromTransformer(j, this)
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().
 //                  display_name transformable
-//                  documentation ```scala\ndef transformable(j: I): fromTransformer[I]\n```
+//                  signature_documentation scala def transformable(j: I): fromTransformer[I]
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().[T]
 //                    display_name T
-//                    documentation ```scala\nT\n```
+//                    signature_documentation scala T
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().(j)
 //                       display_name j
-//                       documentation ```scala\nj: I \n```
+//                       signature_documentation scala j: I 
 //                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
 //                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.
 //                                      ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.
diff --git a/tests/snapshots/src/main/generated/ujson/Value.scala b/tests/snapshots/src/main/generated/ujson/Value.scala
index 814909465..2a38468b6 100644
--- a/tests/snapshots/src/main/generated/ujson/Value.scala
+++ b/tests/snapshots/src/main/generated/ujson/Value.scala
@@ -26,26 +26,26 @@ import scala.collection.mutable.ArrayBuffer
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/collection/
 //                      ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                              ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
-//                              ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer.
+//                              ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
+//                              ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer.
 
 sealed trait Value extends Readable with geny.Writable{
 //           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                 display_name Value
-//                 documentation ```scala\nsealed trait Value\n```
+//                 signature_documentation scala sealed trait Value
 //                         ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                       ^^^^ reference semanticdb maven . . geny/
 //                                            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#
   override def httpContentType = Some("application/json")
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#httpContentType().
 //                             display_name httpContentType
-//                             documentation ```scala\ndef httpContentType: Some[String]\n```
+//                             signature_documentation scala def httpContentType: Some[String]
 //                             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#httpContentType().
-//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
   def value: Any
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //          display_name value
-//          documentation ```scala\ndef value: Any\n```
+//          signature_documentation scala def value: Any
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
@@ -63,13 +63,13 @@ sealed trait Value extends Readable with geny.Writable{
   def str = this match{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#str().
 //        display_name str
-//        documentation ```scala\ndef str: String\n```
+//        signature_documentation scala def str: String
     case ujson.Str(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //                 ^^^^^ definition local 0
 //                       display_name value
-//                       documentation ```scala\nvalue: String \n```
+//                       signature_documentation scala value: String 
 //                           ^^^^^ reference local 0
     case _ => throw Value.InvalidData(this, "Expected ujson.Str")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -82,16 +82,16 @@ sealed trait Value extends Readable with geny.Writable{
   def strOpt = this match{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#strOpt().
 //           display_name strOpt
-//           documentation ```scala\ndef strOpt: Option[String]\n```
+//           signature_documentation scala def strOpt: Option[String]
     case Str(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //           ^^^^^ definition local 1
 //                 display_name value
-//                 documentation ```scala\nvalue: String \n```
-//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                 signature_documentation scala value: String 
+//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                          ^^^^^ reference local 1
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
   }
 
   /**
@@ -101,13 +101,13 @@ sealed trait Value extends Readable with geny.Writable{
   def obj = this match{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#obj().
 //        display_name obj
-//        documentation ```scala\ndef obj: LinkedHashMap[String, Value]\n```
+//        signature_documentation scala def obj: LinkedHashMap[String, Value]
     case ujson.Obj(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                 ^^^^^ definition local 2
 //                       display_name value
-//                       documentation ```scala\nvalue: LinkedHashMap[String, Value] \n```
+//                       signature_documentation scala value: LinkedHashMap[String, Value] 
 //                           ^^^^^ reference local 2
     case _ => throw Value.InvalidData(this, "Expected ujson.Obj")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -119,16 +119,16 @@ sealed trait Value extends Readable with geny.Writable{
   def objOpt = this match{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#objOpt().
 //           display_name objOpt
-//           documentation ```scala\ndef objOpt: Option[LinkedHashMap[String, Value]]\n```
+//           signature_documentation scala def objOpt: Option[LinkedHashMap[String, Value]]
     case Obj(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //           ^^^^^ definition local 3
 //                 display_name value
-//                 documentation ```scala\nvalue: LinkedHashMap[String, Value] \n```
-//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                 signature_documentation scala value: LinkedHashMap[String, Value] 
+//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                          ^^^^^ reference local 3
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
   }
   /**
     * Returns the elements of this [[Value]], fails if it is not
@@ -137,13 +137,13 @@ sealed trait Value extends Readable with geny.Writable{
   def arr = this match{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#arr().
 //        display_name arr
-//        documentation ```scala\ndef arr: ArrayBuffer[Value]\n```
+//        signature_documentation scala def arr: ArrayBuffer[Value]
     case ujson.Arr(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //                 ^^^^^ definition local 4
 //                       display_name value
-//                       documentation ```scala\nvalue: ArrayBuffer[Value] \n```
+//                       signature_documentation scala value: ArrayBuffer[Value] 
 //                           ^^^^^ reference local 4
     case _ => throw Value.InvalidData(this, "Expected ujson.Arr")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -155,16 +155,16 @@ sealed trait Value extends Readable with geny.Writable{
   def arrOpt = this match{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#arrOpt().
 //           display_name arrOpt
-//           documentation ```scala\ndef arrOpt: Option[ArrayBuffer[Value]]\n```
+//           signature_documentation scala def arrOpt: Option[ArrayBuffer[Value]]
     case Arr(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //           ^^^^^ definition local 5
 //                 display_name value
-//                 documentation ```scala\nvalue: ArrayBuffer[Value] \n```
-//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                 signature_documentation scala value: ArrayBuffer[Value] 
+//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                          ^^^^^ reference local 5
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
   }
   /**
     * Returns the `Double` value of this [[Value]], fails if it is not
@@ -173,13 +173,13 @@ sealed trait Value extends Readable with geny.Writable{
   def num = this match{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#num().
 //        display_name num
-//        documentation ```scala\ndef num: Double\n```
+//        signature_documentation scala def num: Double
     case ujson.Num(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //                 ^^^^^ definition local 6
 //                       display_name value
-//                       documentation ```scala\nvalue: Double \n```
+//                       signature_documentation scala value: Double 
 //                           ^^^^^ reference local 6
     case _ => throw Value.InvalidData(this, "Expected ujson.Num")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -191,16 +191,16 @@ sealed trait Value extends Readable with geny.Writable{
   def numOpt = this match{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#numOpt().
 //           display_name numOpt
-//           documentation ```scala\ndef numOpt: Option[Double]\n```
+//           signature_documentation scala def numOpt: Option[Double]
     case Num(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //           ^^^^^ definition local 7
 //                 display_name value
-//                 documentation ```scala\nvalue: Double \n```
-//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                 signature_documentation scala value: Double 
+//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                          ^^^^^ reference local 7
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
   }
   /**
     * Returns the `Boolean` value of this [[Value]], fails if it is not
@@ -209,13 +209,13 @@ sealed trait Value extends Readable with geny.Writable{
   def bool = this match{
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#bool().
 //         display_name bool
-//         documentation ```scala\ndef bool: Boolean\n```
+//         signature_documentation scala def bool: Boolean
     case ujson.Bool(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
 //                  ^^^^^ definition local 8
 //                        display_name value
-//                        documentation ```scala\nvalue: Boolean \n```
+//                        signature_documentation scala value: Boolean 
 //                            ^^^^^ reference local 8
     case _ => throw Value.InvalidData(this, "Expected ujson.Bool")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -227,16 +227,16 @@ sealed trait Value extends Readable with geny.Writable{
   def boolOpt = this match{
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#boolOpt().
 //            display_name boolOpt
-//            documentation ```scala\ndef boolOpt: Option[Boolean]\n```
+//            signature_documentation scala def boolOpt: Option[Boolean]
     case Bool(value) => Some(value)
 //       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
 //            ^^^^^ definition local 9
 //                  display_name value
-//                  documentation ```scala\nvalue: Boolean \n```
-//                      ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                  signature_documentation scala value: Boolean 
+//                      ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                           ^^^^^ reference local 9
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
   }
   /**
     * Returns true if the value of this [[Value]] is ujson.Null, false otherwise
@@ -244,7 +244,7 @@ sealed trait Value extends Readable with geny.Writable{
   def isNull = this match {
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#isNull().
 //           display_name isNull
-//           documentation ```scala\ndef isNull: Boolean\n```
+//           signature_documentation scala def isNull: Boolean
     case ujson.Null => true
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
@@ -254,10 +254,10 @@ sealed trait Value extends Readable with geny.Writable{
   def apply(s: Value.Selector): Value = s(this)
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#apply().
 //          display_name apply
-//          documentation ```scala\ndef apply(s: Selector): Value\n```
+//          signature_documentation scala def apply(s: Selector): Value
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#apply().(s)
 //            display_name s
-//            documentation ```scala\ns: Selector \n```
+//            signature_documentation scala s: Selector 
 //             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                   ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -265,17 +265,17 @@ sealed trait Value extends Readable with geny.Writable{
   def update(s: Value.Selector, v: Value): Unit = s(this) = v
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().
 //           display_name update
-//           documentation ```scala\ndef update(s: Selector, v: Value): Unit\n```
+//           signature_documentation scala def update(s: Selector, v: Value): Unit
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(s)
 //             display_name s
-//             documentation ```scala\ns: Selector \n```
+//             signature_documentation scala s: Selector 
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(v)
 //                                display_name v
-//                                documentation ```scala\nv: Value \n```
+//                                signature_documentation scala v: Value 
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(s)
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(v)
 
@@ -289,18 +289,18 @@ sealed trait Value extends Readable with geny.Writable{
   def update(s: Value.Selector, f: Value => Value): Unit = s(this) = f(s(this))
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).
 //           display_name update
-//           documentation ```scala\ndef update(s: Selector, f: (Value) => Value): Unit\n```
+//           signature_documentation scala def update(s: Selector, f: (Value) => Value): Unit
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(s)
 //             display_name s
-//             documentation ```scala\ns: Selector \n```
+//             signature_documentation scala s: Selector 
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(f)
 //                                display_name f
-//                                documentation ```scala\nf: (Value) => Value \n```
+//                                signature_documentation scala f: (Value) => Value 
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(s)
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(f)
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(s)
@@ -308,14 +308,14 @@ sealed trait Value extends Readable with geny.Writable{
   def transform[T](f: Visitor[_, T]) = Value.transform(this, f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(f: Visitor[local10, T[): T\n```
+//              signature_documentation scala def transform(f: Visitor[local10, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().(f)
 //                   display_name f
-//                   documentation ```scala\nf: Visitor[local10, T[ \n```
+//                   signature_documentation scala f: Visitor[local10, T[ 
 //                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().[T]
 //                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -324,22 +324,22 @@ sealed trait Value extends Readable with geny.Writable{
   override def toString = render()
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#toString().
 //                      display_name toString
-//                      documentation ```scala\ndef toString(): String\n```
+//                      signature_documentation scala def toString(): String
 //                      relationship is_reference is_implementation semanticdb maven . . scala/Any#toString().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 //                        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().
   def render(indent: Int = -1, escapeUnicode: Boolean = false) = this.transform(StringRenderer(indent, escapeUnicode)).toString
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().
 //           display_name render
-//           documentation ```scala\ndef render(indent: Int, escapeUnicode: Boolean): String\n```
+//           signature_documentation scala def render(indent: Int, escapeUnicode: Boolean): String
 //           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(indent)
 //                  display_name indent
-//                  documentation ```scala\ndefault indent: Int \n```
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                  signature_documentation scala default indent: Int 
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(escapeUnicode)
 //                                           display_name escapeUnicode
-//                                           documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                                            ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                           signature_documentation scala default escapeUnicode: Boolean 
+//                                            ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                                    ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //                                                                              ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
 //                                                                                             ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(indent)
@@ -349,22 +349,22 @@ sealed trait Value extends Readable with geny.Writable{
   def writeBytesTo(out: java.io.OutputStream, indent: Int = -1, escapeUnicode: Boolean = false): Unit = {
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().
 //                 display_name writeBytesTo
-//                 documentation ```scala\ndef writeBytesTo(out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit\n```
+//                 signature_documentation scala def writeBytesTo(out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit
 //                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(out)
 //                     display_name out
-//                     documentation ```scala\nout: OutputStream \n```
+//                     signature_documentation scala out: OutputStream 
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^ reference semanticdb maven . . java/io/
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(indent)
 //                                                   display_name indent
-//                                                   documentation ```scala\ndefault indent: Int \n```
-//                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                   signature_documentation scala default indent: Int 
+//                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                              ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(escapeUnicode)
 //                                                                            display_name escapeUnicode
-//                                                                            documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                                                                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
-//                                                                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                                                            signature_documentation scala default escapeUnicode: Boolean 
+//                                                                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                                                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     this.transform(new ujson.BaseByteRenderer(out, indent, escapeUnicode))
 //       ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //                     ^^^^^ reference semanticdb maven . . ujson/
@@ -377,15 +377,15 @@ sealed trait Value extends Readable with geny.Writable{
   def writeBytesTo(out: java.io.OutputStream): Unit = writeBytesTo(out, -1, false)
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo(+1).
 //                 display_name writeBytesTo
-//                 documentation ```scala\ndef writeBytesTo(out: OutputStream): Unit\n```
+//                 signature_documentation scala def writeBytesTo(out: OutputStream): Unit
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#writeBytesTo().
 //                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo(+1).(out)
 //                     display_name out
-//                     documentation ```scala\nout: OutputStream \n```
+//                     signature_documentation scala out: OutputStream 
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^ reference semanticdb maven . . java/io/
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
-//                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().
 //                                                                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo(+1).(out)
 }
@@ -399,77 +399,77 @@ sealed trait Value extends Readable with geny.Writable{
 object Value extends AstTransformer[Value]{
 //     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //           display_name Value
-//           documentation ```scala\nobject Value\n```
+//           signature_documentation scala object Value
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
 //                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                        ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   type Value = ujson.Value
 //     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //           display_name Value
-//           documentation ```scala\ntype Value >: Value <: Value\n```
+//           signature_documentation scala type Value >: Value <: Value
 //             ^^^^^ reference semanticdb maven . . ujson/
 //                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
   sealed trait Selector{
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                      display_name Selector
-//                      documentation ```scala\nsealed trait Selector\n```
+//                      signature_documentation scala sealed trait Selector
     def apply(x: Value): Value
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
 //            display_name apply
-//            documentation ```scala\ndef apply(x: Value): Value\n```
+//            signature_documentation scala def apply(x: Value): Value
 //            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().
 //            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().(x)
 //              display_name x
-//              documentation ```scala\nx: Value \n```
+//              signature_documentation scala x: Value 
 //               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
     def update(x: Value, y: Value): Unit
 //      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
 //             display_name update
-//             documentation ```scala\ndef update(x: Value, y: Value): Unit\n```
+//             signature_documentation scala def update(x: Value, y: Value): Unit
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().(x)
 //               display_name x
-//               documentation ```scala\nx: Value \n```
+//               signature_documentation scala x: Value 
 //                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().(y)
 //                         display_name y
-//                         documentation ```scala\ny: Value \n```
+//                         signature_documentation scala y: Value 
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
-//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
   }
   object Selector{
 //       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.
 //                display_name Selector
-//                documentation ```scala\nobject Selector\n```
+//                signature_documentation scala object Selector
     implicit class IntSelector(i: Int) extends Selector{
 //                 ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#
 //                             display_name IntSelector
-//                             documentation ```scala\nimplicit class IntSelector\n```
+//                             signature_documentation scala implicit class IntSelector
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().
 //                              display_name <init>
-//                              documentation ```scala\ndef this(i: Int)\n```
+//                              signature_documentation scala def this(i: Int)
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#i.
 //                               display_name i
-//                               documentation ```scala\nprivate[this] val i: Int\n```
+//                               signature_documentation scala private[this] val i: Int
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().(i)
 //                             _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().(i)
 //                               display_name i
-//                               documentation ```scala\ni: Int \n```
+//                               signature_documentation scala i: Int 
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#i.
-//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       def apply(x: Value): Value = x.arr(i)
 //        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().
 //              display_name apply
-//              documentation ```scala\ndef apply(x: Value): Value\n```
+//              signature_documentation scala def apply(x: Value): Value
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().(x)
 //                display_name x
-//                documentation ```scala\nx: Value \n```
+//                signature_documentation scala x: Value 
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().(x)
@@ -478,15 +478,15 @@ object Value extends AstTransformer[Value]{
       def update(x: Value, y: Value) = x.arr(i) = y
 //        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().
 //               display_name update
-//               documentation ```scala\ndef update(x: Value, y: Value): Unit\n```
+//               signature_documentation scala def update(x: Value, y: Value): Unit
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(x)
 //                 display_name x
-//                 documentation ```scala\nx: Value \n```
+//                 signature_documentation scala x: Value 
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(y)
 //                           display_name y
-//                           documentation ```scala\ny: Value \n```
+//                           signature_documentation scala y: Value 
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(x)
 //                                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#arr().
@@ -496,29 +496,29 @@ object Value extends AstTransformer[Value]{
     implicit class StringSelector(i: String) extends Selector{
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#
 //                                display_name StringSelector
-//                                documentation ```scala\nimplicit class StringSelector\n```
+//                                signature_documentation scala implicit class StringSelector
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().
 //                                 display_name <init>
-//                                 documentation ```scala\ndef this(i: String)\n```
+//                                 signature_documentation scala def this(i: String)
 //                                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#i.
 //                                  display_name i
-//                                  documentation ```scala\nprivate[this] val i: String\n```
+//                                  signature_documentation scala private[this] val i: String
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().(i)
 //                                _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().(i)
 //                                  display_name i
-//                                  documentation ```scala\ni: String \n```
+//                                  signature_documentation scala i: String 
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#i.
-//                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                   ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                                                           ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       def apply(x: Value): Value = x.obj(i)
 //        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().
 //              display_name apply
-//              documentation ```scala\ndef apply(x: Value): Value\n```
+//              signature_documentation scala def apply(x: Value): Value
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().(x)
 //                display_name x
-//                documentation ```scala\nx: Value \n```
+//                signature_documentation scala x: Value 
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().(x)
@@ -527,15 +527,15 @@ object Value extends AstTransformer[Value]{
       def update(x: Value, y: Value) = x.obj(i) = y
 //        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().
 //               display_name update
-//               documentation ```scala\ndef update(x: Value, y: Value): Unit\n```
+//               signature_documentation scala def update(x: Value, y: Value): Unit
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(x)
 //                 display_name x
-//                 documentation ```scala\nx: Value \n```
+//                 signature_documentation scala x: Value 
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(y)
 //                           display_name y
-//                           documentation ```scala\ny: Value \n```
+//                           signature_documentation scala y: Value 
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(x)
 //                                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#obj().
@@ -545,186 +545,186 @@ object Value extends AstTransformer[Value]{
   }
 
   @deprecated("use ujson.Str")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val Str = ujson.Str
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
 //        display_name Str
-//        documentation ```scala\n@deprecated\nval Str: Str.type\n```
+//        signature_documentation scala @deprecated\nval Str: Str.type
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
   @deprecated("use ujson.Str")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   type Str = ujson.Str
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
 //         display_name Str
-//         documentation ```scala\ntype Str >: Str <: Str\n```
+//         signature_documentation scala type Str >: Str <: Str
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
   @deprecated("use ujson.Obj")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val Obj = ujson.Obj
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj.
 //        display_name Obj
-//        documentation ```scala\n@deprecated\nval Obj: Obj.type\n```
+//        signature_documentation scala @deprecated\nval Obj: Obj.type
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
   @deprecated("use ujson.Obj")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   type Obj = ujson.Obj
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj#
 //         display_name Obj
-//         documentation ```scala\ntype Obj >: Obj <: Obj\n```
+//         signature_documentation scala type Obj >: Obj <: Obj
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
   @deprecated("use ujson.Arr")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val Arr = ujson.Arr
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr.
 //        display_name Arr
-//        documentation ```scala\n@deprecated\nval Arr: Arr.type\n```
+//        signature_documentation scala @deprecated\nval Arr: Arr.type
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
   @deprecated("use ujson.Arr")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   type Arr = ujson.Arr
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr#
 //         display_name Arr
-//         documentation ```scala\ntype Arr >: Arr <: Arr\n```
+//         signature_documentation scala type Arr >: Arr <: Arr
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
   @deprecated("use ujson.Num")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val Num = ujson.Num
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //        display_name Num
-//        documentation ```scala\n@deprecated\nval Num: Num.type\n```
+//        signature_documentation scala @deprecated\nval Num: Num.type
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
   @deprecated("use ujson.Num")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   type Num = ujson.Num
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //         display_name Num
-//         documentation ```scala\ntype Num >: Num <: Num\n```
+//         signature_documentation scala type Num >: Num <: Num
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
   @deprecated("use ujson.Bool")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val Bool = ujson.Bool
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool.
 //         display_name Bool
-//         documentation ```scala\n@deprecated\nval Bool: Bool.type\n```
+//         signature_documentation scala @deprecated\nval Bool: Bool.type
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
   @deprecated("use ujson.Bool")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   type Bool = ujson.Bool
 //     ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool#
 //          display_name Bool
-//          documentation ```scala\ntype Bool >: Bool <: Bool\n```
+//          signature_documentation scala type Bool >: Bool <: Bool
 //            ^^^^^ reference semanticdb maven . . ujson/
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
   @deprecated("use ujson.True")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val True = ujson.True
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.True.
 //         display_name True
-//         documentation ```scala\n@deprecated\nval True: True.type\n```
+//         signature_documentation scala @deprecated\nval True: True.type
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
   @deprecated("use ujson.False")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val False = ujson.False
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.False.
 //          display_name False
-//          documentation ```scala\n@deprecated\nval False: False.type\n```
+//          signature_documentation scala @deprecated\nval False: False.type
 //            ^^^^^ reference semanticdb maven . . ujson/
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
   @deprecated("use ujson.Null")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val Null = ujson.Null
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
 //         display_name Null
-//         documentation ```scala\n@deprecated\nval Null: Null.type\n```
+//         signature_documentation scala @deprecated\nval Null: Null.type
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
   implicit def JsonableSeq[T](items: TraversableOnce[T])
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().
 //                         display_name JsonableSeq
-//                         documentation ```scala\nimplicit def JsonableSeq(items: TraversableOnce[T])(f: (T) => Value): Arr\n```
+//                         signature_documentation scala implicit def JsonableSeq(items: TraversableOnce[T])(f: (T) => Value): Arr
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
 //                           display_name T
-//                           documentation ```scala\nT\n```
+//                           signature_documentation scala T
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(items)
 //                                  display_name items
-//                                  documentation ```scala\nitems: TraversableOnce[T] \n```
-//                                   ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
+//                                  signature_documentation scala items: TraversableOnce[T] 
+//                                   ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
                              (implicit f: T => Value): Arr = Arr.from(items.map(f))
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(f)
 //                                       display_name f
-//                                       documentation ```scala\nimplicit f: (T) => Value \n```
+//                                       signature_documentation scala implicit f: (T) => Value 
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
 //                                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr#
 //                                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr.
 //                                                               ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().
 //                                                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(items)
-//                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#map().
+//                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceExtensionMethods#map().
 //                                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(f)
   implicit def JsonableDict[T](items: TraversableOnce[(String, T)])
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().
 //                          display_name JsonableDict
-//                          documentation ```scala\nimplicit def JsonableDict(items: TraversableOnce[(String, T)])(f: (T) => Value): Obj\n```
+//                          signature_documentation scala implicit def JsonableDict(items: TraversableOnce[(String, T)])(f: (T) => Value): Obj
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
 //                            display_name T
-//                            documentation ```scala\nT\n```
+//                            signature_documentation scala T
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(items)
 //                                   display_name items
-//                                   documentation ```scala\nitems: TraversableOnce[(String, T)] \n```
-//                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
-//                                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                   signature_documentation scala items: TraversableOnce[(String, T)] 
+//                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
+//                                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
                               (implicit f: T => Value): Obj = Obj.from(items.map(x => (x._1, f(x._2))))
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(f)
 //                                        display_name f
-//                                        documentation ```scala\nimplicit f: (T) => Value \n```
+//                                        signature_documentation scala implicit f: (T) => Value 
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj#
 //                                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj.
 //                                                                ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().
 //                                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(items)
-//                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#map().
+//                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceExtensionMethods#map().
 //                                                                               ^ definition local 11
 //                                                                                 display_name x
-//                                                                                 documentation ```scala\nx: (String, T) \n```
+//                                                                                 signature_documentation scala x: (String, T) 
 //                                                                                     ^ reference local 11
-//                                                                                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
+//                                                                                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(f)
 //                                                                                             ^ reference local 11
-//                                                                                               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
+//                                                                                               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_2.
   implicit def JsonableBoolean(i: Boolean): Bool = if (i) ujson.True else ujson.False
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().
 //                             display_name JsonableBoolean
-//                             documentation ```scala\nimplicit def JsonableBoolean(i: Boolean): Bool\n```
+//                             signature_documentation scala implicit def JsonableBoolean(i: Boolean): Bool
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().(i)
 //                               display_name i
-//                               documentation ```scala\ni: Boolean \n```
-//                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                               signature_documentation scala i: Boolean 
+//                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                          ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool#
 //                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().(i)
 //                                                        ^^^^^ reference semanticdb maven . . ujson/
@@ -734,44 +734,44 @@ object Value extends AstTransformer[Value]{
   implicit def JsonableByte(i: Byte): Num = Num(i)
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().
 //                          display_name JsonableByte
-//                          documentation ```scala\nimplicit def JsonableByte(i: Byte): Num\n```
+//                          signature_documentation scala implicit def JsonableByte(i: Byte): Num
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().(i)
 //                            display_name i
-//                            documentation ```scala\ni: Byte \n```
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
+//                            signature_documentation scala i: Byte 
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().(i)
   implicit def JsonableShort(i: Short): Num = Num(i)
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().
 //                           display_name JsonableShort
-//                           documentation ```scala\nimplicit def JsonableShort(i: Short): Num\n```
+//                           signature_documentation scala implicit def JsonableShort(i: Short): Num
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().(i)
 //                             display_name i
-//                             documentation ```scala\ni: Short \n```
-//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Short#
+//                             signature_documentation scala i: Short 
+//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Short#
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().(i)
   implicit def JsonableInt(i: Int): Num = Num(i)
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().
 //                         display_name JsonableInt
-//                         documentation ```scala\nimplicit def JsonableInt(i: Int): Num\n```
+//                         signature_documentation scala implicit def JsonableInt(i: Int): Num
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().(i)
 //                           display_name i
-//                           documentation ```scala\ni: Int \n```
-//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                           signature_documentation scala i: Int 
+//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().(i)
   implicit def JsonableLong(i: Long): Str = Str(i.toString)
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableLong().
 //                          display_name JsonableLong
-//                          documentation ```scala\nimplicit def JsonableLong(i: Long): Str\n```
+//                          signature_documentation scala implicit def JsonableLong(i: Long): Str
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableLong().(i)
 //                            display_name i
-//                            documentation ```scala\ni: Long \n```
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
+//                            signature_documentation scala i: Long 
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
 //                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableLong().(i)
@@ -779,42 +779,42 @@ object Value extends AstTransformer[Value]{
   implicit def JsonableFloat(i: Float): Num = Num(i)
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().
 //                           display_name JsonableFloat
-//                           documentation ```scala\nimplicit def JsonableFloat(i: Float): Num\n```
+//                           signature_documentation scala implicit def JsonableFloat(i: Float): Num
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().(i)
 //                             display_name i
-//                             documentation ```scala\ni: Float \n```
-//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Float#
+//                             signature_documentation scala i: Float 
+//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Float#
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().(i)
   implicit def JsonableDouble(i: Double): Num = Num(i)
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().
 //                            display_name JsonableDouble
-//                            documentation ```scala\nimplicit def JsonableDouble(i: Double): Num\n```
+//                            signature_documentation scala implicit def JsonableDouble(i: Double): Num
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().(i)
 //                              display_name i
-//                              documentation ```scala\ni: Double \n```
-//                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
+//                              signature_documentation scala i: Double 
+//                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().(i)
   implicit def JsonableNull(i: Null): Null.type = Null
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableNull().
 //                          display_name JsonableNull
-//                          documentation ```scala\nimplicit def JsonableNull(i: Null): Null.type\n```
+//                          signature_documentation scala implicit def JsonableNull(i: Null): Null.type
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableNull().(i)
 //                            display_name i
-//                            documentation ```scala\ni: Null \n```
+//                            signature_documentation scala i: Null 
 //                             ^^^^ reference semanticdb maven . . scala/Null#
 //                                    ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
 //                                                ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
   implicit def JsonableString(s: CharSequence): Str = Str(s.toString)
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableString().
 //                            display_name JsonableString
-//                            documentation ```scala\nimplicit def JsonableString(s: CharSequence): Str\n```
+//                            signature_documentation scala implicit def JsonableString(s: CharSequence): Str
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableString().(s)
 //                              display_name s
-//                              documentation ```scala\ns: CharSequence \n```
+//                              signature_documentation scala s: CharSequence 
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
 //                                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
@@ -825,18 +825,18 @@ object Value extends AstTransformer[Value]{
   def transform[T](j: Value, f: Visitor[_, T]): T = {
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(j: Value, f: Visitor[local12, T[): T\n```
+//              signature_documentation scala def transform(j: Value, f: Visitor[local12, T[): T
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(j)
 //                   display_name j
-//                   documentation ```scala\nj: Value \n```
+//                   signature_documentation scala j: Value 
 //                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                             display_name f
-//                             documentation ```scala\nf: Visitor[local12, T[ \n```
+//                             signature_documentation scala f: Visitor[local12, T[ 
 //                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().[T]
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().[T]
@@ -862,7 +862,7 @@ object Value extends AstTransformer[Value]{
 //               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //                   ^ definition local 13
 //                     display_name s
-//                     documentation ```scala\ns: String \n```
+//                     signature_documentation scala s: String 
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                           ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                       ^ reference local 13
@@ -871,7 +871,7 @@ object Value extends AstTransformer[Value]{
 //               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //                   ^ definition local 14
 //                     display_name d
-//                     documentation ```scala\nd: Double \n```
+//                     signature_documentation scala d: Double 
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                           ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                                        ^ reference local 14
@@ -880,7 +880,7 @@ object Value extends AstTransformer[Value]{
 //               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //                   ^^^^^ definition local 15
 //                         display_name items
-//                         documentation ```scala\nitems: ArrayBuffer[Value] \n```
+//                         signature_documentation scala items: ArrayBuffer[Value] 
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                                               ^^^^^ reference local 15
@@ -889,7 +889,7 @@ object Value extends AstTransformer[Value]{
 //               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                   ^^^^^ definition local 16
 //                         display_name items
-//                         documentation ```scala\nitems: LinkedHashMap[String, Value] \n```
+//                         signature_documentation scala items: LinkedHashMap[String, Value] 
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().
 //                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                                                ^^^^^ reference local 16
@@ -899,22 +899,22 @@ object Value extends AstTransformer[Value]{
   def visitArray(length: Int, index: Int) = new AstArrVisitor[ArrayBuffer](xs => ujson.Arr(xs))
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().
 //               display_name visitArray
-//               documentation ```scala\ndef visitArray(length: Int, index: Int): AstArrVisitor[ArrayBuffer]\n```
+//               signature_documentation scala def visitArray(length: Int, index: Int): AstArrVisitor[ArrayBuffer]
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().(length)
 //                      display_name length
-//                      documentation ```scala\nlength: Int \n```
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                      signature_documentation scala length: Int 
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().(index)
 //                                  display_name index
-//                                  documentation ```scala\nindex: Int \n```
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                  signature_documentation scala index: Int 
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#
-//                                                            ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
+//                                                            ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().
 //                                                                         ^^ definition local 17
 //                                                                            display_name xs
-//                                                                            documentation ```scala\nxs: ArrayBuffer[Value] \n```
+//                                                                            signature_documentation scala xs: ArrayBuffer[Value] 
 //                                                                               ^^^^^ reference semanticdb maven . . ujson/
 //                                                                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //                                                                                         ^^ reference local 17
@@ -922,25 +922,25 @@ object Value extends AstTransformer[Value]{
   def visitObject(length: Int, index: Int) = new AstObjVisitor[mutable.LinkedHashMap[String, Value]](xs => ujson.Obj(xs))
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().
 //                display_name visitObject
-//                documentation ```scala\ndef visitObject(length: Int, index: Int): AstObjVisitor[LinkedHashMap[String, Value]]\n```
+//                signature_documentation scala def visitObject(length: Int, index: Int): AstObjVisitor[LinkedHashMap[String, Value]]
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().(length)
 //                       display_name length
-//                       documentation ```scala\nlength: Int \n```
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                       signature_documentation scala length: Int 
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().(index)
 //                                   display_name index
-//                                   documentation ```scala\nindex: Int \n```
-//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                   signature_documentation scala index: Int 
+//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#
 //                                                             ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                                                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
-//                                                                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
+//                                                                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                                                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().
 //                                                                                                   ^^ definition local 18
 //                                                                                                      display_name xs
-//                                                                                                      documentation ```scala\nxs: LinkedHashMap[String, Value] \n```
+//                                                                                                      signature_documentation scala xs: LinkedHashMap[String, Value] 
 //                                                                                                         ^^^^^ reference semanticdb maven . . ujson/
 //                                                                                                               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                                                                                                                   ^^ reference local 18
@@ -948,72 +948,72 @@ object Value extends AstTransformer[Value]{
   def visitNull(index: Int) = ujson.Null
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitNull().
 //              display_name visitNull
-//              documentation ```scala\ndef visitNull(index: Int): Null\n```
+//              signature_documentation scala def visitNull(index: Int): Null
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitNull().(index)
 //                    display_name index
-//                    documentation ```scala\nindex: Int \n```
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                    signature_documentation scala index: Int 
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^^ reference semanticdb maven . . ujson/
 //                                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
 
   def visitFalse(index: Int) = ujson.False
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFalse().
 //               display_name visitFalse
-//               documentation ```scala\ndef visitFalse(index: Int): False\n```
+//               signature_documentation scala def visitFalse(index: Int): False
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFalse().(index)
 //                     display_name index
-//                     documentation ```scala\nindex: Int \n```
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                     signature_documentation scala index: Int 
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ reference semanticdb maven . . ujson/
 //                                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
 
   def visitTrue(index: Int) = True
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitTrue().
 //              display_name visitTrue
-//              documentation ```scala\ndef visitTrue(index: Int): True\n```
+//              signature_documentation scala def visitTrue(index: Int): True
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitTrue().(index)
 //                    display_name index
-//                    documentation ```scala\nindex: Int \n```
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                    signature_documentation scala index: Int 
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.True.
 
 
   override def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int) = {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().
 //                                     display_name visitFloat64StringParts
-//                                     documentation ```scala\ndef visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): Num\n```
+//                                     signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): Num
 //                                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(s)
 //                                       display_name s
-//                                       documentation ```scala\ns: CharSequence \n```
+//                                       signature_documentation scala s: CharSequence 
 //                                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(decIndex)
 //                                                               display_name decIndex
-//                                                               documentation ```scala\ndecIndex: Int \n```
-//                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                               signature_documentation scala decIndex: Int 
+//                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                     ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(expIndex)
 //                                                                              display_name expIndex
-//                                                                              documentation ```scala\nexpIndex: Int \n```
-//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                              signature_documentation scala expIndex: Int 
+//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(index)
 //                                                                                          display_name index
-//                                                                                          documentation ```scala\nindex: Int \n```
-//                                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                                                          signature_documentation scala index: Int 
+//                                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     ujson.Num(
 //  ^^^^^ reference semanticdb maven . . ujson/
 //        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
       if (decIndex != -1 || expIndex != -1) s.toString.toDouble
 //        ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(decIndex)
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+3).
-//                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+3).
+//                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
 //                          ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(expIndex)
-//                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+3).
+//                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+3).
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(s)
 //                                            ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#toString().
-//                                                     ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/StringOps#toDouble().
+//                                                     ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/StringOps#toDouble().
       else Util.parseIntegralNum(s, decIndex, expIndex, index)
 //         ^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Util.
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Util.parseIntegralNum().
@@ -1027,17 +1027,17 @@ object Value extends AstTransformer[Value]{
   override def visitFloat64(d: Double, index: Int) = ujson.Num(d)
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().
 //                          display_name visitFloat64
-//                          documentation ```scala\ndef visitFloat64(d: Double, index: Int): Num\n```
+//                          signature_documentation scala def visitFloat64(d: Double, index: Int): Num
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(d)
 //                            display_name d
-//                            documentation ```scala\nd: Double \n```
-//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
+//                            signature_documentation scala d: Double 
+//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(index)
 //                                           display_name index
-//                                           documentation ```scala\nindex: Int \n```
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           signature_documentation scala index: Int 
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^ reference semanticdb maven . . ujson/
 //                                                         ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(d)
@@ -1045,16 +1045,16 @@ object Value extends AstTransformer[Value]{
   def visitString(s: CharSequence, index: Int) = ujson.Str(s.toString)
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().
 //                display_name visitString
-//                documentation ```scala\ndef visitString(s: CharSequence, index: Int): Str\n```
+//                signature_documentation scala def visitString(s: CharSequence, index: Int): Str
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().(s)
 //                  display_name s
-//                  documentation ```scala\ns: CharSequence \n```
+//                  signature_documentation scala s: CharSequence 
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().(index)
 //                                       display_name index
-//                                       documentation ```scala\nindex: Int \n```
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                       signature_documentation scala index: Int 
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^^^^^ reference semanticdb maven . . ujson/
 //                                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().(s)
@@ -1071,93 +1071,93 @@ object Value extends AstTransformer[Value]{
   case class InvalidData(data: Value, msg: String)
 //           ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       display_name InvalidData
-//                       documentation ```scala\ncase class InvalidData(data: Value, msg: String) extends Exception\n```
+//                       signature_documentation scala case class InvalidData(data: Value, msg: String) extends Exception
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().
 //                       display_name copy
-//                       documentation ```scala\ndef copy(data: Value, msg: String): InvalidData\n```
+//                       signature_documentation scala def copy(data: Value, msg: String): InvalidData
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.
 //                       display_name InvalidData
-//                       documentation ```scala\nobject InvalidData\n```
+//                       signature_documentation scala object InvalidData
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //                       display_name apply
-//                       documentation ```scala\ndef apply(data: Value, msg: String): InvalidData\n```
+//                       signature_documentation scala def apply(data: Value, msg: String): InvalidData
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
-//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
+//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#productElementName().
 //                       display_name productElementName
-//                       documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//                       signature_documentation scala def productElementName(x$1: Int): String
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
-//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#productElement().
 //                       display_name productElement
-//                       documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                       signature_documentation scala def productElement(x$1: Int): Any
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
-//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().
 //                        display_name <init>
-//                        documentation ```scala\ndef this(data: Value, msg: String)\n```
+//                        signature_documentation scala def this(data: Value, msg: String)
 //                       ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                            display_name data
-//                            documentation ```scala\nval data: Value\n```
+//                            signature_documentation scala val data: Value
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                            display_name data
-//                            documentation ```scala\ndata: Value \n```
+//                            signature_documentation scala data: Value 
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            display_name data
-//                            documentation ```scala\ndata: Value \n```
+//                            signature_documentation scala data: Value 
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            display_name data
-//                            documentation ```scala\ndefault data: Value \n```
+//                            signature_documentation scala default data: Value 
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
 //                                        display_name msg
-//                                        documentation ```scala\nval msg: String\n```
+//                                        signature_documentation scala val msg: String
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        display_name msg
-//                                        documentation ```scala\nmsg: String \n```
+//                                        signature_documentation scala msg: String 
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        display_name msg
-//                                        documentation ```scala\ndefault msg: String \n```
+//                                        signature_documentation scala default msg: String 
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                        display_name msg
-//                                        documentation ```scala\nmsg: String \n```
+//                                        signature_documentation scala msg: String 
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
-//                                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
     extends Exception(s"$msg (data: $data)")
-//          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
+//          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
 //                   ^ reference semanticdb maven jdk 11 java/lang/Exception#`<init>`(+1).
-//                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
+//                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
 //                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                   ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 }
@@ -1165,116 +1165,116 @@ object Value extends AstTransformer[Value]{
 case class Str(value: String) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             display_name Str
-//             documentation ```scala\ncase class Str(value: String) extends Value\n```
+//             signature_documentation scala case class Str(value: String) extends Value
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#productElement().
 //             display_name productElement
-//             documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//             signature_documentation scala def productElement(x$1: Int): Any
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().
 //             display_name copy
-//             documentation ```scala\ndef copy(value: String): Str\n```
+//             signature_documentation scala def copy(value: String): Str
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //             display_name Str
-//             documentation ```scala\nobject Str\n```
+//             signature_documentation scala object Str
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#productElementName().
 //             display_name productElementName
-//             documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//             signature_documentation scala def productElementName(x$1: Int): String
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //             display_name apply
-//             documentation ```scala\ndef apply(value: String): Str\n```
+//             signature_documentation scala def apply(value: String): Str
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().
 //              display_name <init>
-//              documentation ```scala\ndef this(value: String)\n```
+//              signature_documentation scala def this(value: String)
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //                   display_name value
-//                   documentation ```scala\nval value: String\n```
+//                   signature_documentation scala val value: String
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
 //                   display_name value
-//                   documentation ```scala\nvalue: String \n```
+//                   signature_documentation scala value: String 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   display_name value
-//                   documentation ```scala\nvalue: String \n```
+//                   signature_documentation scala value: String 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   display_name value
-//                   documentation ```scala\ndefault value: String \n```
+//                   signature_documentation scala default value: String 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //             display_name Obj
-//             documentation ```scala\ncase class Obj(value: LinkedHashMap[String, Value]) extends Value\n```
+//             signature_documentation scala case class Obj(value: LinkedHashMap[String, Value]) extends Value
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#productElementName().
 //             display_name productElementName
-//             documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//             signature_documentation scala def productElementName(x$1: Int): String
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#productElement().
 //             display_name productElement
-//             documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//             signature_documentation scala def productElement(x$1: Int): Any
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().
 //             display_name copy
-//             documentation ```scala\ndef copy(value: LinkedHashMap[String, Value]): Obj\n```
+//             signature_documentation scala def copy(value: LinkedHashMap[String, Value]): Obj
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().
 //              display_name <init>
-//              documentation ```scala\ndef this(value: LinkedHashMap[String, Value])\n```
+//              signature_documentation scala def this(value: LinkedHashMap[String, Value])
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //                   display_name value
-//                   documentation ```scala\nval value: LinkedHashMap[String, Value]\n```
+//                   signature_documentation scala val value: LinkedHashMap[String, Value]
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //                   display_name value
-//                   documentation ```scala\nvalue: LinkedHashMap[String, Value] \n```
+//                   signature_documentation scala value: LinkedHashMap[String, Value] 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   display_name value
-//                   documentation ```scala\nvalue: LinkedHashMap[String, Value] \n```
+//                   signature_documentation scala value: LinkedHashMap[String, Value] 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   display_name value
-//                   documentation ```scala\ndefault value: LinkedHashMap[String, Value] \n```
+//                   signature_documentation scala default value: LinkedHashMap[String, Value] 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //                    ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                            ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
-//                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                            ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
+//                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 
@@ -1282,28 +1282,28 @@ case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
 object Obj{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //         display_name Obj
-//         documentation ```scala\nobject Obj\n```
+//         signature_documentation scala object Obj
 //     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).
 //         display_name apply
-//         documentation ```scala\ndef apply(value: LinkedHashMap[String, Value]): Obj\n```
+//         signature_documentation scala def apply(value: LinkedHashMap[String, Value]): Obj
 //         relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
   implicit def from(items: TraversableOnce[(String, Value)]): Obj = {
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().
 //                  display_name from
-//                  documentation ```scala\nimplicit def from(items: TraversableOnce[(String, Value)]): Obj\n```
+//                  signature_documentation scala implicit def from(items: TraversableOnce[(String, Value)]): Obj
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().(items)
 //                        display_name items
-//                        documentation ```scala\nitems: TraversableOnce[(String, Value)] \n```
-//                         ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
-//                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                        signature_documentation scala items: TraversableOnce[(String, Value)] 
+//                         ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
+//                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
     Obj(mutable.LinkedHashMap(items.toSeq:_*))
 //  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //      ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//              ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap.
+//              ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap.
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().(items)
-//                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#toSeq().
+//                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceExtensionMethods#toSeq().
   }
   // Weird telescoped version of `apply(items: (String, Value)*)`, to avoid
   // type inference issues due to overloading the existing `apply` method
@@ -1312,55 +1312,55 @@ object Obj{
   def apply[V](item: (String, V),
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().
 //          display_name apply
-//          documentation ```scala\ndef apply(item: (String, V), items: (String, Value)*)(conv: (V) => Value): Obj\n```
+//          signature_documentation scala def apply(item: (String, V), items: (String, Value)*)(conv: (V) => Value): Obj
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
 //            display_name V
-//            documentation ```scala\nV\n```
+//            signature_documentation scala V
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(item)
 //                  display_name item
-//                  documentation ```scala\nitem: (String, V) \n```
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                  signature_documentation scala item: (String, V) 
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
                         items: (String, Value)*)(implicit conv: V => Value): Obj = {
 //                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(items)
 //                            display_name items
-//                            documentation ```scala\nitems: (String, Value)* \n```
-//                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                            signature_documentation scala items: (String, Value)* 
+//                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                        ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(conv)
 //                                                             display_name conv
-//                                                             documentation ```scala\nimplicit conv: (V) => Value \n```
+//                                                             signature_documentation scala implicit conv: (V) => Value 
 //                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
 //                                                                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
     val map = new mutable.LinkedHashMap[String, Value]()
 //      ^^^ definition local 22
 //          display_name map
-//          documentation ```scala\nmap: LinkedHashMap[String, Value] \n```
+//          signature_documentation scala map: LinkedHashMap[String, Value] 
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                        ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
-//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                        ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
+//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#`<init>`().
+//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#`<init>`().
     map.put(item._1, conv(item._2))
 //  ^^^ reference local 22
-//      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#put().
+//      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#put().
 //          ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(item)
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
 //                   ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(conv)
 //                        ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(item)
-//                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
+//                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_2.
     for (i <- items) map.put(i._1, i._2)
 //       ^ definition local 23
 //         display_name i
-//         documentation ```scala\ni: (String, Value) \n```
+//         signature_documentation scala i: (String, Value) 
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(items)
 //                   ^^^ reference local 22
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#put().
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#put().
 //                           ^ reference local 23
-//                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
+//                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
 //                                 ^ reference local 23
-//                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
+//                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_2.
     Obj(map)
 //  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //      ^^^ reference local 22
@@ -1369,62 +1369,62 @@ object Obj{
   def apply(): Obj = Obj(new mutable.LinkedHashMap[String, Value]())
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+1).
 //          display_name apply
-//          documentation ```scala\ndef apply(): Obj\n```
+//          signature_documentation scala def apply(): Obj
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //                   ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                           ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                                   ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
-//                                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                   ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
+//                                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#`<init>`().
+//                                                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#`<init>`().
 }
 case class Arr(value: ArrayBuffer[Value]) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //             display_name Arr
-//             documentation ```scala\ncase class Arr(value: ArrayBuffer[Value]) extends Value\n```
+//             signature_documentation scala case class Arr(value: ArrayBuffer[Value]) extends Value
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#productElement().
 //             display_name productElement
-//             documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//             signature_documentation scala def productElement(x$1: Int): Any
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#productElementName().
 //             display_name productElementName
-//             documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//             signature_documentation scala def productElementName(x$1: Int): String
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().
 //             display_name copy
-//             documentation ```scala\ndef copy(value: ArrayBuffer[Value]): Arr\n```
+//             signature_documentation scala def copy(value: ArrayBuffer[Value]): Arr
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().
 //              display_name <init>
-//              documentation ```scala\ndef this(value: ArrayBuffer[Value])\n```
+//              signature_documentation scala def this(value: ArrayBuffer[Value])
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //                   display_name value
-//                   documentation ```scala\nval value: ArrayBuffer[Value]\n```
+//                   signature_documentation scala val value: ArrayBuffer[Value]
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   display_name value
-//                   documentation ```scala\nvalue: ArrayBuffer[Value] \n```
+//                   signature_documentation scala value: ArrayBuffer[Value] 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   display_name value
-//                   documentation ```scala\ndefault value: ArrayBuffer[Value] \n```
+//                   signature_documentation scala default value: ArrayBuffer[Value] 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //                   display_name value
-//                   documentation ```scala\nvalue: ArrayBuffer[Value] \n```
+//                   signature_documentation scala value: ArrayBuffer[Value] 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
-//                    ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
+//                    ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
 //                                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 
@@ -1432,46 +1432,46 @@ case class Arr(value: ArrayBuffer[Value]) extends Value
 object Arr{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //         display_name Arr
-//         documentation ```scala\nobject Arr\n```
+//         signature_documentation scala object Arr
 //     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).
 //         display_name apply
-//         documentation ```scala\ndef apply(value: ArrayBuffer[Value]): Arr\n```
+//         signature_documentation scala def apply(value: ArrayBuffer[Value]): Arr
 //         relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
   implicit def from[T](items: TraversableOnce[T])(implicit conv: T => Value): Arr = {
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().
 //                  display_name from
-//                  documentation ```scala\nimplicit def from(items: TraversableOnce[T])(conv: (T) => Value): Arr\n```
+//                  signature_documentation scala implicit def from(items: TraversableOnce[T])(conv: (T) => Value): Arr
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                    display_name T
-//                    documentation ```scala\nT\n```
+//                    signature_documentation scala T
 //                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(items)
 //                           display_name items
-//                           documentation ```scala\nitems: TraversableOnce[T] \n```
-//                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
+//                           signature_documentation scala items: TraversableOnce[T] 
+//                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                                                         ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(conv)
 //                                                              display_name conv
-//                                                              documentation ```scala\nimplicit conv: (T) => Value \n```
+//                                                              signature_documentation scala implicit conv: (T) => Value 
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                                                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
     val buf = new mutable.ArrayBuffer[Value]()
 //      ^^^ definition local 25
 //          display_name buf
-//          documentation ```scala\nbuf: ArrayBuffer[Value] \n```
+//          signature_documentation scala buf: ArrayBuffer[Value] 
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
+//                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#`<init>`(+1).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#`<init>`(+1).
     items.foreach{ item =>
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(items)
-//        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#foreach().
+//        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceExtensionMethods#foreach().
 //                 ^^^^ definition local 26
 //                      display_name item
-//                      documentation ```scala\nitem: T \n```
+//                      signature_documentation scala item: T 
       buf += (conv(item): Value)
 //    ^^^ reference local 25
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Growable#`+=`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
 //            ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(conv)
 //                 ^^^^ reference local 26
 //                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -1484,31 +1484,31 @@ object Arr{
   def apply(items: Value*): Arr = {
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().
 //          display_name apply
-//          documentation ```scala\ndef apply(items: Value*): Arr\n```
+//          signature_documentation scala def apply(items: Value*): Arr
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().(items)
 //                display_name items
-//                documentation ```scala\nitems: Value* \n```
+//                signature_documentation scala items: Value* 
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
     val buf = new mutable.ArrayBuffer[Value](items.length)
 //      ^^^ definition local 27
 //          display_name buf
-//          documentation ```scala\nbuf: ArrayBuffer[Value] \n```
+//          signature_documentation scala buf: ArrayBuffer[Value] 
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
+//                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#`<init>`(+2).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#`<init>`(+2).
 //                                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().(items)
-//                                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/SeqOps#length().
+//                                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/SeqOps#length().
     items.foreach{ item =>
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().(items)
-//        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#foreach().
+//        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#foreach().
 //                 ^^^^ definition local 28
 //                      display_name item
-//                      documentation ```scala\nitem: Value \n```
+//                      signature_documentation scala item: Value 
       buf += item
 //    ^^^ reference local 27
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Growable#`+=`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
 //           ^^^^ reference local 28
     }
     Arr(buf)
@@ -1519,97 +1519,97 @@ object Arr{
 case class Num(value: Double) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             display_name Num
-//             documentation ```scala\ncase class Num(value: Double) extends Value\n```
+//             signature_documentation scala case class Num(value: Double) extends Value
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#productElement().
 //             display_name productElement
-//             documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//             signature_documentation scala def productElement(x$1: Int): Any
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().
 //             display_name copy
-//             documentation ```scala\ndef copy(value: Double): Num\n```
+//             signature_documentation scala def copy(value: Double): Num
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //             display_name apply
-//             documentation ```scala\ndef apply(value: Double): Num\n```
+//             signature_documentation scala def apply(value: Double): Num
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#productElementName().
 //             display_name productElementName
-//             documentation ```scala\ndef productElementName(x$1: Int): String\n```
+//             signature_documentation scala def productElementName(x$1: Int): String
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //             display_name Num
-//             documentation ```scala\nobject Num\n```
+//             signature_documentation scala object Num
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().
 //              display_name <init>
-//              documentation ```scala\ndef this(value: Double)\n```
+//              signature_documentation scala def this(value: Double)
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //                   display_name value
-//                   documentation ```scala\nval value: Double\n```
+//                   signature_documentation scala val value: Double
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
 //                   display_name value
-//                   documentation ```scala\nvalue: Double \n```
+//                   signature_documentation scala value: Double 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   display_name value
-//                   documentation ```scala\ndefault value: Double \n```
+//                   signature_documentation scala default value: Double 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   display_name value
-//                   documentation ```scala\nvalue: Double \n```
+//                   signature_documentation scala value: Double 
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 sealed abstract class Bool extends Value{
 //                    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                         display_name Bool
-//                         documentation ```scala\nabstract sealed class Bool\n```
+//                         signature_documentation scala abstract sealed class Bool
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
 //                           display_name <init>
-//                           documentation ```scala\ndef this()\n```
+//                           signature_documentation scala def this()
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def value: Boolean
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          display_name value
-//          documentation ```scala\ndef value: Boolean\n```
+//          signature_documentation scala def value: Boolean
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
-//           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 }
 object Bool{
 //     ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
 //          display_name Bool
-//          documentation ```scala\nobject Bool\n```
+//          signature_documentation scala object Bool
   def apply(value: Boolean): Bool = if (value) True else False
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().
 //          display_name apply
-//          documentation ```scala\ndef apply(value: Boolean): Bool\n```
+//          signature_documentation scala def apply(value: Boolean): Bool
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().(value)
 //                display_name value
-//                documentation ```scala\nvalue: Boolean \n```
-//                 ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                signature_documentation scala value: Boolean 
+//                 ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                           ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().(value)
 //                                             ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
@@ -1617,67 +1617,67 @@ object Bool{
   def unapply(bool: Bool): Option[Boolean] = Some(bool.value)
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.unapply().
 //            display_name unapply
-//            documentation ```scala\ndef unapply(bool: Bool): Option[Boolean]\n```
+//            signature_documentation scala def unapply(bool: Bool): Option[Boolean]
 //            ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.unapply().(bool)
 //                 display_name bool
-//                 documentation ```scala\nbool: Bool \n```
+//                 signature_documentation scala bool: Bool 
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
-//                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Option#
-//                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
-//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
+//                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Option#
+//                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                                                ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.unapply().(bool)
 //                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 }
 case object False extends Bool{
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
 //                display_name False
-//                documentation ```scala\ncase object False\n```
+//                signature_documentation scala case object False
 //          _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.productElement().
 //                display_name productElement
-//                documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//                signature_documentation scala def productElement(x$1: Int): Any
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                        ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
   def value = false
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
 //          display_name value
-//          documentation ```scala\ndef value: Boolean\n```
+//          signature_documentation scala def value: Boolean
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
 case object True extends Bool{
 //          ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
 //               display_name True
-//               documentation ```scala\ncase object True\n```
+//               signature_documentation scala case object True
 //          ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.productElement().
 //               display_name productElement
-//               documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//               signature_documentation scala def productElement(x$1: Int): Any
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
   def value = true
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.value().
 //          display_name value
-//          documentation ```scala\ndef value: Boolean\n```
+//          signature_documentation scala def value: Boolean
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
 case object Null extends Value{
 //          ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
 //               display_name Null
-//               documentation ```scala\ncase object Null\n```
+//               signature_documentation scala case object Null
 //          ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.productElement().
 //               display_name productElement
-//               documentation ```scala\ndef productElement(x$1: Int): Any\n```
+//               signature_documentation scala def productElement(x$1: Int): Any
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                            ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def value = null
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.value().
 //          display_name value
-//          documentation ```scala\ndef value: Null\n```
+//          signature_documentation scala def value: Null
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
diff --git a/tests/snapshots/src/main/generated/ujson/package.scala b/tests/snapshots/src/main/generated/ujson/package.scala
index 3273ae5b6..9014606b2 100644
--- a/tests/snapshots/src/main/generated/ujson/package.scala
+++ b/tests/snapshots/src/main/generated/ujson/package.scala
@@ -6,21 +6,21 @@ import upickle.core.NoOpVisitor
 package object ujson{
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.
 //                   display_name ujson
-//                   documentation ```scala\npackage object ujson\n```
+//                   signature_documentation scala package object ujson
   def transform[T](t: Readable, v: upickle.core.Visitor[_, T]) = t.transform(v)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //              display_name transform
-//              documentation ```scala\ndef transform(t: Readable, v: Visitor[local0, T[): T\n```
+//              signature_documentation scala def transform(t: Readable, v: Visitor[local0, T[): T
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().[T]
 //                display_name T
-//                documentation ```scala\nT\n```
+//                signature_documentation scala T
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().(t)
 //                   display_name t
-//                   documentation ```scala\nt: Readable \n```
+//                   signature_documentation scala t: Readable 
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().(v)
 //                                display_name v
-//                                documentation ```scala\nv: Visitor[local0, T[ \n```
+//                                signature_documentation scala v: Visitor[local0, T[ 
 //                                 ^^^^^^^ reference semanticdb maven . . upickle/
 //                                         ^^^^ reference semanticdb maven . . upickle/core/
 //                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
@@ -35,15 +35,15 @@ package object ujson{
   def read(s: Readable, trace: Boolean = false): Value.Value =
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().
 //         display_name read
-//         documentation ```scala\ndef read(s: Readable, trace: Boolean): Value\n```
+//         signature_documentation scala def read(s: Readable, trace: Boolean): Value
 //         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().(s)
 //           display_name s
-//           documentation ```scala\ns: Readable \n```
+//           signature_documentation scala s: Readable 
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().(trace)
 //                            display_name trace
-//                            documentation ```scala\ndefault trace: Boolean \n```
-//                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                            signature_documentation scala default trace: Boolean 
+//                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
     upickle.core.TraceVisitor.withTrace(trace, Value)(transform(s, _))
@@ -59,10 +59,10 @@ package object ujson{
   def copy(t: Value.Value): Value.Value = transform(t, Value)
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.copy().
 //         display_name copy
-//         documentation ```scala\ndef copy(t: Value): Value\n```
+//         signature_documentation scala def copy(t: Value): Value
 //         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.copy().(t)
 //           display_name t
-//           documentation ```scala\nt: Value \n```
+//           signature_documentation scala t: Value 
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -77,27 +77,27 @@ package object ujson{
   def write(t: Value.Value,
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().
 //          display_name write
-//          documentation ```scala\ndef write(t: Value, indent: Int, escapeUnicode: Boolean): String\n```
+//          signature_documentation scala def write(t: Value, indent: Int, escapeUnicode: Boolean): String
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(t)
 //            display_name t
-//            documentation ```scala\nt: Value \n```
+//            signature_documentation scala t: Value 
 //             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
             indent: Int = -1,
 //          ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(indent)
 //                 display_name indent
-//                 documentation ```scala\ndefault indent: Int \n```
-//                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                 signature_documentation scala default indent: Int 
+//                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
             escapeUnicode: Boolean = false): String = {
 //          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(escapeUnicode)
 //                        display_name escapeUnicode
-//                        documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                         ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
-//                                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                        signature_documentation scala default escapeUnicode: Boolean 
+//                         ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
     val writer = new java.io.StringWriter
 //      ^^^^^^ definition local 1
 //             display_name writer
-//             documentation ```scala\nwriter: StringWriter \n```
+//             signature_documentation scala writer: StringWriter 
 //                   ^^^^ reference semanticdb maven . . java/
 //                        ^^ reference semanticdb maven . . java/io/
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/StringWriter#
@@ -119,30 +119,30 @@ package object ujson{
   def writeTo(t: Value.Value,
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().
 //            display_name writeTo
-//            documentation ```scala\ndef writeTo(t: Value, out: Writer, indent: Int, escapeUnicode: Boolean): Unit\n```
+//            signature_documentation scala def writeTo(t: Value, out: Writer, indent: Int, escapeUnicode: Boolean): Unit
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(t)
 //              display_name t
-//              documentation ```scala\nt: Value \n```
+//              signature_documentation scala t: Value 
 //               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
               out: java.io.Writer,
 //            ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(out)
 //                display_name out
-//                documentation ```scala\nout: Writer \n```
+//                signature_documentation scala out: Writer 
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/io/Writer#
               indent: Int = -1,
 //            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(indent)
 //                   display_name indent
-//                   documentation ```scala\ndefault indent: Int \n```
-//                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                   signature_documentation scala default indent: Int 
+//                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
               escapeUnicode: Boolean = false): Unit = {
 //            ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(escapeUnicode)
 //                          display_name escapeUnicode
-//                          documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
-//                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                          signature_documentation scala default escapeUnicode: Boolean 
+//                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     transform(t, Renderer(out, indent, escapeUnicode))
 //  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(t)
@@ -154,30 +154,30 @@ package object ujson{
   def writeToOutputStream(t: Value.Value,
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().
 //                        display_name writeToOutputStream
-//                        documentation ```scala\ndef writeToOutputStream(t: Value, out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit\n```
+//                        signature_documentation scala def writeToOutputStream(t: Value, out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(t)
 //                          display_name t
-//                          documentation ```scala\nt: Value \n```
+//                          signature_documentation scala t: Value 
 //                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
                           out: java.io.OutputStream,
 //                        ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(out)
 //                            display_name out
-//                            documentation ```scala\nout: OutputStream \n```
+//                            signature_documentation scala out: OutputStream 
 //                             ^^^^ reference semanticdb maven . . java/
 //                                  ^^ reference semanticdb maven . . java/io/
 //                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
                           indent: Int = -1,
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(indent)
 //                               display_name indent
-//                               documentation ```scala\ndefault indent: Int \n```
-//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                               signature_documentation scala default indent: Int 
+//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                           escapeUnicode: Boolean = false): Unit = {
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(escapeUnicode)
 //                                      display_name escapeUnicode
-//                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
-//                                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                      signature_documentation scala default escapeUnicode: Boolean 
+//                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     transform(t, new BaseByteRenderer(out, indent, escapeUnicode))
 //  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(t)
@@ -191,26 +191,26 @@ package object ujson{
   def writeToByteArray(t: Value.Value,
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().
 //                     display_name writeToByteArray
-//                     documentation ```scala\ndef writeToByteArray(t: Value, indent: Int, escapeUnicode: Boolean): Array[Byte]\n```
+//                     signature_documentation scala def writeToByteArray(t: Value, indent: Int, escapeUnicode: Boolean): Array[Byte]
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(t)
 //                       display_name t
-//                       documentation ```scala\nt: Value \n```
+//                       signature_documentation scala t: Value 
 //                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(indent)
 //                            display_name indent
-//                            documentation ```scala\ndefault indent: Int \n```
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                            signature_documentation scala default indent: Int 
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                        escapeUnicode: Boolean = false) = {
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(escapeUnicode)
 //                                   display_name escapeUnicode
-//                                   documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                   signature_documentation scala default escapeUnicode: Boolean 
+//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
     val baos = new java.io.ByteArrayOutputStream
 //      ^^^^ definition local 2
 //           display_name baos
-//           documentation ```scala\nbaos: ByteArrayOutputStream \n```
+//           signature_documentation scala baos: ByteArrayOutputStream 
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
 //                         ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/ByteArrayOutputStream#
@@ -232,12 +232,12 @@ package object ujson{
   def validate(s: Readable): Unit = transform(s, NoOpVisitor)
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.validate().
 //             display_name validate
-//             documentation ```scala\ndef validate(s: Readable): Unit\n```
+//             signature_documentation scala def validate(s: Readable): Unit
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.validate().(s)
 //               display_name s
-//               documentation ```scala\ns: Readable \n```
+//               signature_documentation scala s: Readable 
 //                ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
-//                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.validate().(s)
 //                                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/NoOpVisitor.
@@ -248,24 +248,24 @@ package object ujson{
   def reformat(s: Readable, indent: Int = -1, escapeUnicode: Boolean = false): String = {
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().
 //             display_name reformat
-//             documentation ```scala\ndef reformat(s: Readable, indent: Int, escapeUnicode: Boolean): String\n```
+//             signature_documentation scala def reformat(s: Readable, indent: Int, escapeUnicode: Boolean): String
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(s)
 //               display_name s
-//               documentation ```scala\ns: Readable \n```
+//               signature_documentation scala s: Readable 
 //                ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                          ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(indent)
 //                                 display_name indent
-//                                 documentation ```scala\ndefault indent: Int \n```
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                 signature_documentation scala default indent: Int 
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(escapeUnicode)
 //                                                          display_name escapeUnicode
-//                                                          documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                                                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
-//                                                                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
+//                                                          signature_documentation scala default escapeUnicode: Boolean 
+//                                                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                                                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
     val writer = new java.io.StringWriter()
 //      ^^^^^^ definition local 3
 //             display_name writer
-//             documentation ```scala\nwriter: StringWriter \n```
+//             signature_documentation scala writer: StringWriter 
 //                   ^^^^ reference semanticdb maven . . java/
 //                        ^^ reference semanticdb maven . . java/io/
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/StringWriter#
@@ -287,26 +287,26 @@ package object ujson{
   def reformatTo(s: Readable, out: java.io.Writer, indent: Int = -1, escapeUnicode: Boolean = false): Unit = {
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().
 //               display_name reformatTo
-//               documentation ```scala\ndef reformatTo(s: Readable, out: Writer, indent: Int, escapeUnicode: Boolean): Unit\n```
+//               signature_documentation scala def reformatTo(s: Readable, out: Writer, indent: Int, escapeUnicode: Boolean): Unit
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(s)
 //                 display_name s
-//                 documentation ```scala\ns: Readable \n```
+//                 signature_documentation scala s: Readable 
 //                  ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                            ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(out)
 //                                display_name out
-//                                documentation ```scala\nout: Writer \n```
+//                                signature_documentation scala out: Writer 
 //                                 ^^^^ reference semanticdb maven . . java/
 //                                      ^^ reference semanticdb maven . . java/io/
 //                                         ^^^^^^ reference semanticdb maven jdk 11 java/io/Writer#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(indent)
 //                                                        display_name indent
-//                                                        documentation ```scala\ndefault indent: Int \n```
-//                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                        signature_documentation scala default indent: Int 
+//                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                   ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(escapeUnicode)
 //                                                                                 display_name escapeUnicode
-//                                                                                 documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                                                                                  ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
-//                                                                                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                                                                 signature_documentation scala default escapeUnicode: Boolean 
+//                                                                                  ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                                                                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     transform(s, Renderer(out, indent, escapeUnicode))
 //  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(s)
@@ -322,29 +322,29 @@ package object ujson{
   def reformatToOutputStream(s: Readable,
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().
 //                           display_name reformatToOutputStream
-//                           documentation ```scala\ndef reformatToOutputStream(s: Readable, out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit\n```
+//                           signature_documentation scala def reformatToOutputStream(s: Readable, out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(s)
 //                             display_name s
-//                             documentation ```scala\ns: Readable \n```
+//                             signature_documentation scala s: Readable 
 //                              ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
                              out: java.io.OutputStream,
 //                           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(out)
 //                               display_name out
-//                               documentation ```scala\nout: OutputStream \n```
+//                               signature_documentation scala out: OutputStream 
 //                                ^^^^ reference semanticdb maven . . java/
 //                                     ^^ reference semanticdb maven . . java/io/
 //                                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
                              indent: Int = -1,
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(indent)
 //                                  display_name indent
-//                                  documentation ```scala\ndefault indent: Int \n```
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                  signature_documentation scala default indent: Int 
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                              escapeUnicode: Boolean = false): Unit = {
 //                           ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(escapeUnicode)
 //                                         display_name escapeUnicode
-//                                         documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                                          ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
-//                                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
+//                                         signature_documentation scala default escapeUnicode: Boolean 
+//                                          ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     transform(s, new BaseByteRenderer(out, indent, escapeUnicode))
 //  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(s)
@@ -357,25 +357,25 @@ package object ujson{
   def reformatToByteArray(s: Readable,
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().
 //                        display_name reformatToByteArray
-//                        documentation ```scala\ndef reformatToByteArray(s: Readable, indent: Int, escapeUnicode: Boolean): Array[Byte]\n```
+//                        signature_documentation scala def reformatToByteArray(s: Readable, indent: Int, escapeUnicode: Boolean): Array[Byte]
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(s)
 //                          display_name s
-//                          documentation ```scala\ns: Readable \n```
+//                          signature_documentation scala s: Readable 
 //                           ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
                           indent: Int = -1,
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(indent)
 //                               display_name indent
-//                               documentation ```scala\ndefault indent: Int \n```
-//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                               signature_documentation scala default indent: Int 
+//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                           escapeUnicode: Boolean = false) = {
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(escapeUnicode)
 //                                      display_name escapeUnicode
-//                                      documentation ```scala\ndefault escapeUnicode: Boolean \n```
-//                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                      signature_documentation scala default escapeUnicode: Boolean 
+//                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
     val baos = new java.io.ByteArrayOutputStream
 //      ^^^^ definition local 4
 //           display_name baos
-//           documentation ```scala\nbaos: ByteArrayOutputStream \n```
+//           signature_documentation scala baos: ByteArrayOutputStream 
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
 //                         ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/ByteArrayOutputStream#
@@ -392,19 +392,19 @@ package object ujson{
   }
   // End ujson
   @deprecated("use ujson.Value")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   type Js = Value
 //     ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.Js#
 //        display_name Js
-//        documentation ```scala\ntype Js >: Value <: Value\n```
+//        signature_documentation scala type Js >: Value <: Value
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
   @deprecated("use ujson.Value")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
   val Js = Value
 //    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.Js.
 //       display_name Js
-//       documentation ```scala\n@deprecated\nval Js: \n```
+//       signature_documentation scala @deprecated\nval Js: 
 //         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 }

From e5039f3c9643f7c7fc5646ac5be14e8e063cd780 Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Thu, 4 Jan 2024 14:47:04 +0100
Subject: [PATCH 05/11] Add back SemanticDB SymbolInformation::owner field

SemanticDB used to have a SymbolInformation::owner field with id 15.
This re-introduces the field with the same semantics under the name
enclosing_symbol.

To be able to re-use the field 15, this moves the out-of-spec
definition_relationships field to id 21.
---
 semanticdb-java/src/main/protobuf/semanticdb.proto | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/semanticdb-java/src/main/protobuf/semanticdb.proto b/semanticdb-java/src/main/protobuf/semanticdb.proto
index 4fefea160..99857524a 100644
--- a/semanticdb-java/src/main/protobuf/semanticdb.proto
+++ b/semanticdb-java/src/main/protobuf/semanticdb.proto
@@ -114,7 +114,7 @@ message SymbolInformation {
     ENUM = 0x4000;
     DEFAULT = 0x8000;
   }
-  reserved 2, 6, 7, 8, 9, 10, 11, 12, 14;//  15;
+  reserved 2, 6, 7, 8, 9, 10, 11, 12, 14;
   string symbol = 1;
   Language language = 16;
   Kind kind = 3;
@@ -127,9 +127,10 @@ message SymbolInformation {
   Access access = 18;
   repeated string overridden_symbols = 19;
   Documentation documentation = 20;
+  string enclosing_symbol = 15;
 
   // -- OUT OF SPEC -- //
-  repeated string definition_relationships = 15;
+  repeated string definition_relationships = 21;
   // -- OUT OF SPEC -- //
 }
 

From aa368d488a7f8722b11f4e3f6b313e03e52ed95c Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Thu, 4 Jan 2024 14:59:29 +0100
Subject: [PATCH 06/11] Forward enclosing_symbol from SemanticDB to SCIP

This also adds support to the ScipPrinters testing utility.
---
 .../scala/com/sourcegraph/scip_java/ScipPrinters.scala     | 7 +++++++
 .../com/sourcegraph/scip_semanticdb/ScipSemanticdb.java    | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
index 6664d0f67..56b633a14 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
@@ -186,6 +186,13 @@ object ScipPrinters {
             .append(info.getSignatureDocumentation.getText.replace("\n", "\\n").replace("\t", "\\t"))
             .append("\n")
         }
+        if (!info.getEnclosingSymbol.isEmpty) {
+          out
+            .append(prefix)
+            .append("enclosing_symbol ")
+            .append(info.getEnclosingSymbol)
+            .append("\n")
+        }
         0.until(info.getDocumentationCount)
           .foreach { n =>
             val documentation = info.getDocumentation(n)
diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
index b0d2d05b0..2f3211966 100644
--- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
@@ -133,6 +133,9 @@ private void processTypedDocument(
             Scip.SymbolInformation.newBuilder().setSymbol(typedSymbol(info.getSymbol(), pkg));
 
         scipInfo.setDisplayName(info.getDisplayName());
+        if (!info.getEnclosingSymbol().isEmpty()) {
+          scipInfo.setEnclosingSymbol(typedSymbol(info.getEnclosingSymbol(), pkg));
+        }
 
         // TODO: this can be removed once https://github.com/sourcegraph/sourcegraph/issues/50927 is
         // fixed.

From 6b497533b48f7ace84f3aaf1b39af898b7740cf7 Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Thu, 4 Jan 2024 15:00:14 +0100
Subject: [PATCH 07/11] Populate SymbolInformation::enclosing_symbol in
 semanticdb-javac

This only populates the enclosing_symbol for local symbols, and updates
the tests accordingly.
---
 .../semanticdb_javac/SemanticdbVisitor.java   |   4 +
 .../airbnb/epoxy/AsyncEpoxyController.java    |   4 +
 .../com/airbnb/epoxy/AsyncEpoxyDiffer.java    |  33 +++++
 .../com/airbnb/epoxy/BaseEpoxyAdapter.java    |  44 +++++++
 .../airbnb/epoxy/BaseEpoxyTouchCallback.java  |   4 +
 .../com/airbnb/epoxy/BoundViewHolders.java    |   4 +
 .../generated/com/airbnb/epoxy/Carousel.java  |  68 +++++++++++
 .../com/airbnb/epoxy/ControllerHelper.java    |   6 +
 .../airbnb/epoxy/ControllerHelperLookup.java  |  12 ++
 .../com/airbnb/epoxy/ControllerModelList.java |   7 ++
 .../com/airbnb/epoxy/DebugTimer.java          |   3 +
 .../com/airbnb/epoxy/DiffHelper.java          |  43 +++++++
 .../com/airbnb/epoxy/DiffPayload.java         |  17 +++
 .../com/airbnb/epoxy/DiffResult.java          |  11 ++
 .../com/airbnb/epoxy/EpoxyAdapter.java        |  43 +++++++
 .../com/airbnb/epoxy/EpoxyAsyncUtil.java      |   5 +
 .../com/airbnb/epoxy/EpoxyController.java     |  79 ++++++++++++
 .../airbnb/epoxy/EpoxyControllerAdapter.java  |  38 ++++++
 .../com/airbnb/epoxy/EpoxyDiffLogger.java     |  13 ++
 .../com/airbnb/epoxy/EpoxyDragCallback.java   |   9 ++
 .../com/airbnb/epoxy/EpoxyHolder.java         |   2 +
 .../epoxy/EpoxyItemSpacingDecorator.java      |  39 ++++++
 .../com/airbnb/epoxy/EpoxyModel.java          |  62 ++++++++++
 .../com/airbnb/epoxy/EpoxyModelGroup.java     |  59 +++++++++
 .../airbnb/epoxy/EpoxyModelTouchCallback.java |  65 ++++++++++
 .../airbnb/epoxy/EpoxyModelWithHolder.java    |  18 +++
 .../com/airbnb/epoxy/EpoxyModelWithView.java  |   2 +
 .../com/airbnb/epoxy/EpoxySwipeCallback.java  |  13 ++
 .../com/airbnb/epoxy/EpoxyTouchHelper.java    | 114 ++++++++++++++++++
 .../epoxy/EpoxyTouchHelperCallback.java       |  82 +++++++++++++
 .../com/airbnb/epoxy/EpoxyViewHolder.java     |  12 ++
 .../com/airbnb/epoxy/GeneratedModel.java      |   5 +
 .../com/airbnb/epoxy/HandlerExecutor.java     |   2 +
 .../com/airbnb/epoxy/HiddenEpoxyModel.java    |   3 +
 .../generated/com/airbnb/epoxy/IdUtils.java   |   5 +
 .../com/airbnb/epoxy/IllegalEpoxyUsage.java   |   1 +
 .../airbnb/epoxy/ImmutableModelException.java |   8 ++
 .../com/airbnb/epoxy/ListenersUtils.java      |   5 +
 .../com/airbnb/epoxy/MainThreadExecutor.java  |   1 +
 .../generated/com/airbnb/epoxy/ModelList.java |  68 +++++++++++
 .../com/airbnb/epoxy/ModelState.java          |   4 +
 .../generated/com/airbnb/epoxy/NoOpTimer.java |   1 +
 .../com/airbnb/epoxy/NotifyBlocker.java       |  12 ++
 .../airbnb/epoxy/OnModelBoundListener.java    |   3 +
 .../epoxy/OnModelBuildFinishedListener.java   |   1 +
 .../epoxy/OnModelCheckedChangeListener.java   |   5 +
 .../airbnb/epoxy/OnModelClickListener.java    |   4 +
 .../epoxy/OnModelLongClickListener.java       |   4 +
 .../airbnb/epoxy/OnModelUnboundListener.java  |   2 +
 .../OnModelVisibilityChangedListener.java     |   6 +
 ...OnModelVisibilityStateChangedListener.java |   3 +
 .../epoxy/QuantityStringResAttribute.java     |   9 ++
 .../com/airbnb/epoxy/SimpleEpoxyAdapter.java  |  24 ++++
 .../airbnb/epoxy/SimpleEpoxyController.java   |   1 +
 .../com/airbnb/epoxy/SimpleEpoxyModel.java    |  11 ++
 .../com/airbnb/epoxy/StringAttributeData.java |  13 ++
 .../airbnb/epoxy/StyleBuilderCallback.java    |   1 +
 .../generated/com/airbnb/epoxy/Timer.java     |   1 +
 .../airbnb/epoxy/Typed2EpoxyController.java   |   9 ++
 .../airbnb/epoxy/Typed3EpoxyController.java   |  11 ++
 .../airbnb/epoxy/Typed4EpoxyController.java   |  13 ++
 .../airbnb/epoxy/TypedEpoxyController.java    |   7 ++
 .../generated/com/airbnb/epoxy/UpdateOp.java  |   9 ++
 .../com/airbnb/epoxy/UpdateOpHelper.java      |  24 ++++
 .../com/airbnb/epoxy/ViewHolderState.java     |  27 +++++
 .../com/airbnb/epoxy/ViewTypeManager.java     |   9 ++
 ...rappedEpoxyModelCheckedChangeListener.java |   7 ++
 .../main/java/minimized/AnonymousClasses.java |   4 +
 .../src/main/java/minimized/Arrays.java       |   4 +
 .../src/main/java/minimized/Docstrings.java   |   1 +
 .../src/main/java/minimized/Enums.java        |   4 +
 .../src/main/java/minimized/Fields.java       |   3 +
 .../java/minimized/ForComprehensions.java     |   4 +
 .../src/main/java/minimized/InnerClasses.java |  13 ++
 .../main/java/minimized/LombokBuilder.java    |   2 +
 .../src/main/java/minimized/Methods.java      |  11 ++
 .../java/minimized/MinimizedJavaMain.java     |   1 +
 .../java/minimized/ParameterizedTypes.java    |   3 +
 .../src/main/java/minimized/Primitives.java   |   9 ++
 .../src/main/java/minimized/SubClasses.java   |   1 +
 .../src/main/java/minimized/TabIndented.java  |   5 +
 .../main/java/minimized/TypeVariables.java    |   1 +
 82 files changed, 1300 insertions(+)

diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
index 3657989dd..4de9daf55 100644
--- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
+++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
@@ -129,6 +129,10 @@ private void emitSymbolInformation(Element sym, Tree tree) {
     if (documentation != null) builder.setDocumentation(documentation);
     Semanticdb.Signature signature = semanticdbSignature(sym);
     if (signature != null) builder.setSignature(signature);
+    if (SemanticdbSymbols.isLocal(symbol)) {
+      String enclosingSymbol = semanticdbSymbol(sym.getEnclosingElement());
+      if (enclosingSymbol != null) builder.setEnclosingSymbol(enclosingSymbol);
+    }
 
     List<Semanticdb.AnnotationTree> annotations =
         new SemanticdbTrees(globals, locals, uri, types, trees, nodes).annotations(tree);
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
index c82b39c6c..a741f8ab4 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
@@ -56,6 +56,7 @@ public AsyncEpoxyController(boolean enableAsync) {
 //                                    ^^^^^^^^^^^ definition local 0
 //                                                display_name enableAsync
 //                                                signature_documentation java boolean enableAsync
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1).
     this(enableAsync, enableAsync);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
 //       ^^^^^^^^^^^ reference local 0
@@ -73,9 +74,11 @@ public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyn
 //                                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 1
 //                                                             display_name enableAsyncModelBuilding
 //                                                             signature_documentation java boolean enableAsyncModelBuilding
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
 //                                                                      ^^^^^^^^^^^^^^^^^^ definition local 2
 //                                                                                         display_name enableAsyncDiffing
 //                                                                                         signature_documentation java boolean enableAsyncDiffing
+//                                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
     super(getHandler(enableAsyncModelBuilding), getHandler(enableAsyncDiffing));
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#getHandler().
@@ -92,6 +95,7 @@ private static Handler getHandler(boolean enableAsync) {
 //                                          ^^^^^^^^^^^ definition local 3
 //                                                      display_name enableAsync
 //                                                      signature_documentation java boolean enableAsync
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#getHandler().
     return enableAsync ? getAsyncBackgroundHandler() : MAIN_THREAD_HANDLER;
 //         ^^^^^^^^^^^ reference local 3
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#getAsyncBackgroundHandler().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
index f6ba73a35..d597b7784 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
@@ -69,6 +69,7 @@ interface ResultCallback {
 //                                    ^^^^^^ definition local 0
 //                                           display_name result
 //                                           signature_documentation java @NonNull\nDiffResult result
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult().
   }
 
   private final Executor executor;
@@ -104,12 +105,14 @@ interface ResultCallback {
 //                     ^^^^^^^ definition local 1
 //                             display_name handler
 //                             signature_documentation java @NonNull\nunresolved_type handler
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`().
       @NonNull ResultCallback resultCallback,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
 //                            ^^^^^^^^^^^^^^ definition local 2
 //                                           display_name resultCallback
 //                                           signature_documentation java @NonNull\nResultCallback resultCallback
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`().
       @NonNull ItemCallback<EpoxyModel<?>> diffCallback
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
@@ -117,6 +120,7 @@ interface ResultCallback {
 //                                         ^^^^^^^^^^^^ definition local 3
 //                                                      display_name diffCallback
 //                                                      signature_documentation java @NonNull\nunresolved_type diffCallback
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`().
   ) {
     this.executor = new HandlerExecutor(handler);
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
@@ -236,16 +240,19 @@ public synchronized boolean forceListOverride(@Nullable List<EpoxyModel<?>> newL
 //                                                                            ^^^^^^^ definition local 4
 //                                                                                    display_name newList
 //                                                                                    signature_documentation java @Nullable\nList<EpoxyModel<?>> newList
+//                                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
     // We need to make sure that generation changes and list updates are synchronized
     final boolean interruptedDiff = cancelDiff();
 //                ^^^^^^^^^^^^^^^ definition local 5
 //                                display_name interruptedDiff
 //                                signature_documentation java final boolean interruptedDiff
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff().
     int generation = generationTracker.incrementAndGetNextScheduled();
 //      ^^^^^^^^^^ definition local 6
 //                 display_name generation
 //                 signature_documentation java int generation
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#incrementAndGetNextScheduled().
     tryLatchList(newList, generation);
@@ -281,10 +288,12 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //                                                                     ^^^^^^^ definition local 7
 //                                                                             display_name newList
 //                                                                             signature_documentation java @Nullable\nfinal List<? extends EpoxyModel<?>> newList
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
     final int runGeneration;
 //            ^^^^^^^^^^^^^ definition local 8
 //                          display_name runGeneration
 //                          signature_documentation java final int runGeneration
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
     @Nullable final List<? extends EpoxyModel<?>> previousList;
 //   ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -292,6 +301,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //                                                ^^^^^^^^^^^^ definition local 9
 //                                                             display_name previousList
 //                                                             signature_documentation java @Nullable\nfinal List<? extends EpoxyModel<?>> previousList
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
 
     synchronized (this) {
       // Incrementing generation means any currently-running diffs are discarded when they finish
@@ -329,6 +339,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //               ^^^^^^ definition local 10
 //                      display_name result
 //                      signature_documentation java DiffResult result
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
       if (previousList != null && !previousList.isEmpty()) {
 //        ^^^^^^^^^^^^ reference local 9
 //                                 ^^^^^^^^^^^^ reference local 9
@@ -366,6 +377,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //                     ^^^^^^^^^^^^^^^ definition local 11
 //                                     display_name wrappedCallback
 //                                     signature_documentation java final DiffCallback wrappedCallback
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
 //                                                        ^^^^^^^^^^^^ reference local 9
 //                                                                      ^^^^^^^ reference local 7
@@ -381,6 +393,7 @@ public void run() {
 //                ^^^ definition local 13
 //                    display_name run
 //                    signature_documentation java @Override\npublic void run()
+//                    enclosing_symbol local 12
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         DiffUtil.DiffResult result = DiffUtil.calculateDiff(wrappedCallback);
 //      ^^^^^^^^ reference semanticdb maven . . DiffUtil/
@@ -388,6 +401,7 @@ public void run() {
 //                          ^^^^^^ definition local 14
 //                                 display_name result
 //                                 signature_documentation java unresolved_type result
+//                                 enclosing_symbol local 13
 //                                   ^^^^^^^^ reference semanticdb maven . . DiffUtil#
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . DiffUtil#calculateDiff#
 //                                                          ^^^^^^^^^^^^^^^ reference local 11
@@ -412,6 +426,7 @@ private void onRunCompleted(
 //              ^^^^^^^^^^^^^ definition local 15
 //                            display_name runGeneration
 //                            signature_documentation java final int runGeneration
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#onRunCompleted().
       @Nullable final List<? extends EpoxyModel<?>> newList,
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -419,12 +434,14 @@ private void onRunCompleted(
 //                                                  ^^^^^^^ definition local 16
 //                                                          display_name newList
 //                                                          signature_documentation java @Nullable\nfinal List<? extends EpoxyModel<?>> newList
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#onRunCompleted().
       @Nullable final DiffResult result
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                               ^^^^^^ definition local 17
 //                                      display_name result
 //                                      signature_documentation java @Nullable\nfinal DiffResult result
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#onRunCompleted().
   ) {
 
     // We use an asynchronous handler so that the Runnable can be posted directly back to the main
@@ -440,11 +457,13 @@ public void run() {
 //                ^^^ definition local 19
 //                    display_name run
 //                    signature_documentation java @Override\npublic void run()
+//                    enclosing_symbol local 18
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         final boolean dispatchResult = tryLatchList(newList, runGeneration);
 //                    ^^^^^^^^^^^^^^ definition local 20
 //                                   display_name dispatchResult
 //                                   signature_documentation java final boolean dispatchResult
+//                                   enclosing_symbol local 19
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
 //                                                  ^^^^^^^ reference local 16
 //                                                           ^^^^^^^^^^^^^ reference local 15
@@ -479,10 +498,12 @@ private synchronized boolean tryLatchList(@Nullable List<? extends EpoxyModel<?>
 //                                                                                  ^^^^^^^ definition local 21
 //                                                                                          display_name newList
 //                                                                                          signature_documentation java @Nullable\nList<? extends EpoxyModel<?>> newList
+//                                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
       int runGeneration) {
 //        ^^^^^^^^^^^^^ definition local 22
 //                      display_name runGeneration
 //                      signature_documentation java int runGeneration
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
     if (generationTracker.finishGeneration(runGeneration)) {
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
 //                        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishGeneration().
@@ -557,6 +578,7 @@ synchronized boolean finishMaxGeneration() {
 //            ^^^^^^^^^^^^^^ definition local 23
 //                           display_name isInterrupting
 //                           signature_documentation java boolean isInterrupting
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishMaxGeneration().
 //                             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#hasUnfinishedGeneration().
       maxFinishedGeneration = maxScheduledGeneration;
 //    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxFinishedGeneration.
@@ -581,10 +603,12 @@ synchronized boolean finishGeneration(int runGeneration) {
 //                                            ^^^^^^^^^^^^^ definition local 24
 //                                                          display_name runGeneration
 //                                                          signature_documentation java int runGeneration
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishGeneration().
       boolean isLatestGeneration =
 //            ^^^^^^^^^^^^^^^^^^ definition local 25
 //                               display_name isLatestGeneration
 //                               signature_documentation java boolean isLatestGeneration
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishGeneration().
           maxScheduledGeneration == runGeneration && runGeneration > maxFinishedGeneration;
 //        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
 //                                  ^^^^^^^^^^^^^ reference local 24
@@ -639,17 +663,20 @@ private static class DiffCallback extends DiffUtil.Callback {
 //                                             ^^^^^^^ definition local 26
 //                                                     display_name oldList
 //                                                     signature_documentation java List<? extends EpoxyModel<?>> oldList
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^^^ definition local 27
 //                                                                                            display_name newList
 //                                                                                            signature_documentation java List<? extends EpoxyModel<?>> newList
+//                                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
         ItemCallback<EpoxyModel<?>> diffCallback) {
 //      ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^^^^^^^ definition local 28
 //                                               display_name diffCallback
 //                                               signature_documentation java unresolved_type diffCallback
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
       this.oldList = oldList;
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
 //                   ^^^^^^^ reference local 26
@@ -692,9 +719,11 @@ public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
 //                                     ^^^^^^^^^^^^^^^ definition local 29
 //                                                     display_name oldItemPosition
 //                                                     signature_documentation java int oldItemPosition
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areItemsTheSame().
 //                                                          ^^^^^^^^^^^^^^^ definition local 30
 //                                                                          display_name newItemPosition
 //                                                                          signature_documentation java int newItemPosition
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areItemsTheSame().
       return diffCallback.areItemsTheSame(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . `<any>`#areItemsTheSame#
@@ -718,9 +747,11 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
 //                                        ^^^^^^^^^^^^^^^ definition local 31
 //                                                        display_name oldItemPosition
 //                                                        signature_documentation java int oldItemPosition
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areContentsTheSame().
 //                                                             ^^^^^^^^^^^^^^^ definition local 32
 //                                                                             display_name newItemPosition
 //                                                                             signature_documentation java int newItemPosition
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areContentsTheSame().
       return diffCallback.areContentsTheSame(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
 //                        ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . `<any>`#areContentsTheSame#
@@ -747,9 +778,11 @@ public Object getChangePayload(int oldItemPosition, int newItemPosition) {
 //                                     ^^^^^^^^^^^^^^^ definition local 33
 //                                                     display_name oldItemPosition
 //                                                     signature_documentation java int oldItemPosition
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getChangePayload().
 //                                                          ^^^^^^^^^^^^^^^ definition local 34
 //                                                                          display_name newItemPosition
 //                                                                          signature_documentation java int newItemPosition
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getChangePayload().
       return diffCallback.getChangePayload(
 //           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
 //                        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . `<any>`#getChangePayload#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
index 47fbf1cbf..1d2802f64 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
@@ -160,6 +160,7 @@ protected void onExceptionSwallowed(RuntimeException exception) {
 //                                                     ^^^^^^^^^ definition local 0
 //                                                               display_name exception
 //                                                               signature_documentation java RuntimeException exception
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onExceptionSwallowed().
 
   }
 
@@ -204,6 +205,7 @@ public long getItemId(int position) {
 //                          ^^^^^^^^ definition local 1
 //                                   display_name position
 //                                   signature_documentation java int position
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemId().
     // This does not call getModelForPosition so that we don't use the id of the empty model when
     // hidden,
     // so that the id stays constant when gone vs shown
@@ -223,6 +225,7 @@ public int getItemViewType(int position) {
 //                               ^^^^^^^^ definition local 2
 //                                        display_name position
 //                                        signature_documentation java int position
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemViewType().
     return viewTypeManager.getViewTypeAndRememberModel(getModelForPosition(position));
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewTypeAndRememberModel().
@@ -241,14 +244,17 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 //                                                    ^^^^^^ definition local 3
 //                                                           display_name parent
 //                                                           signature_documentation java unresolved_type parent
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
 //                                                                ^^^^^^^^ definition local 4
 //                                                                         display_name viewType
 //                                                                         signature_documentation java int viewType
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
     EpoxyModel<?> model = viewTypeManager.getModelForViewType(this, viewType);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 5
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
 //                                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
 //                                                                  ^^^^^^^^ reference local 4
@@ -257,6 +263,7 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 //       ^^^^ definition local 6
 //            display_name view
 //            signature_documentation java unresolved_type view
+//            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
 //              ^^^^^ reference local 5
 //                    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
 //                              ^^^^^^ reference local 3
@@ -278,9 +285,11 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position) {
 //                                             ^^^^^^ definition local 7
 //                                                    display_name holder
 //                                                    signature_documentation java EpoxyViewHolder holder
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder().
 //                                                         ^^^^^^^^ definition local 8
 //                                                                  display_name position
 //                                                                  signature_documentation java int position
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder().
     onBindViewHolder(holder, position, Collections.emptyList());
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
 //                   ^^^^^^ reference local 7
@@ -299,19 +308,23 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
 //                                             ^^^^^^ definition local 9
 //                                                    display_name holder
 //                                                    signature_documentation java EpoxyViewHolder holder
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
 //                                                         ^^^^^^^^ definition local 10
 //                                                                  display_name position
 //                                                                  signature_documentation java int position
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
 //                                                                   ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                ^^^^^^^^ definition local 11
 //                                                                                         display_name payloads
 //                                                                                         signature_documentation java List<Object> payloads
+//                                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
     EpoxyModel<?> modelToShow = getModelForPosition(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^^^^^^^ definition local 12
 //                            display_name modelToShow
 //                            signature_documentation java EpoxyModel<?> modelToShow
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
 //                              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                                  ^^^^^^^^ reference local 10
 
@@ -320,6 +333,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
 //                ^^^^^^^^^^^^^^^^^^^^ definition local 13
 //                                     display_name previouslyBoundModel
 //                                     signature_documentation java EpoxyModel<?> previouslyBoundModel
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
     if (diffPayloadsEnabled()) {
 //      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
       previouslyBoundModel = DiffPayload.getModelFromPayload(payloads, getItemId(position));
@@ -395,13 +409,16 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int pos
 //                                            ^^^^^^ definition local 14
 //                                                   display_name holder
 //                                                   signature_documentation java EpoxyViewHolder holder
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound().
 //                                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^ definition local 15
 //                                                                        display_name model
 //                                                                        signature_documentation java EpoxyModel<?> model
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound().
 //                                                                             ^^^^^^^^ definition local 16
 //                                                                                      display_name position
 //                                                                                      signature_documentation java int position
+//                                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound().
       @Nullable List<Object> payloads) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -409,6 +426,7 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int pos
 //                           ^^^^^^^^ definition local 17
 //                                    display_name payloads
 //                                    signature_documentation java @Nullable\nList<Object> payloads
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound().
     onModelBound(holder, model, position);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 //               ^^^^^^ reference local 14
@@ -425,19 +443,23 @@ void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position,
 //                                  ^^^^^^ definition local 18
 //                                         display_name holder
 //                                         signature_documentation java EpoxyViewHolder holder
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
 //                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^ definition local 19
 //                                                              display_name model
 //                                                              signature_documentation java EpoxyModel<?> model
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
 //                                                                   ^^^^^^^^ definition local 20
 //                                                                            display_name position
 //                                                                            signature_documentation java int position
+//                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
       @Nullable EpoxyModel<?> previouslyBoundModel) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 21
 //                                                 display_name previouslyBoundModel
 //                                                 signature_documentation java @Nullable\nEpoxyModel<?> previouslyBoundModel
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
     onModelBound(holder, model, position);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 //               ^^^^^^ reference local 18
@@ -458,13 +480,16 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int pos
 //                                            ^^^^^^ definition local 22
 //                                                   display_name holder
 //                                                   signature_documentation java EpoxyViewHolder holder
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 //                                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^ definition local 23
 //                                                                        display_name model
 //                                                                        signature_documentation java EpoxyModel<?> model
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 //                                                                             ^^^^^^^^ definition local 24
 //                                                                                      display_name position
 //                                                                                      signature_documentation java int position
+//                                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 
   }
 
@@ -494,6 +519,7 @@ EpoxyModel<?> getModelForPosition(int position) {
 //                                      ^^^^^^^^ definition local 25
 //                                               display_name position
 //                                               signature_documentation java int position
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
     return getCurrentModels().get(position);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                            ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -510,6 +536,7 @@ public void onViewRecycled(EpoxyViewHolder holder) {
 //                                           ^^^^^^ definition local 26
 //                                                  display_name holder
 //                                                  signature_documentation java EpoxyViewHolder holder
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewRecycled().
     viewHolderState.save(holder);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
 //                  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
@@ -524,6 +551,7 @@ public void onViewRecycled(EpoxyViewHolder holder) {
 //                ^^^^^ definition local 27
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewRecycled().
 //                        ^^^^^^ reference local 26
 //                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     holder.unbind();
@@ -549,6 +577,7 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //                                                             ^^^^^^^^^^^^ definition local 28
 //                                                                          display_name recyclerView
 //                                                                          signature_documentation java @NonNull\nunresolved_type recyclerView
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
     // The last model is saved for optimization, but holding onto it can leak anything saved inside
     // the model (like a click listener that references a Fragment). This is only needed during
     // the viewholder creation phase, so it is safe to clear now.
@@ -571,10 +600,12 @@ protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model) {
 //                                              ^^^^^^ definition local 29
 //                                                     display_name holder
 //                                                     signature_documentation java EpoxyViewHolder holder
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelUnbound().
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                    ^^^^^ definition local 30
 //                                                                          display_name model
 //                                                                          signature_documentation java EpoxyModel<?> model
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelUnbound().
 
   }
 
@@ -590,6 +621,7 @@ public boolean onFailedToRecycleView(EpoxyViewHolder holder) {
 //                                                     ^^^^^^ definition local 31
 //                                                            display_name holder
 //                                                            signature_documentation java EpoxyViewHolder holder
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onFailedToRecycleView().
     //noinspection unchecked,rawtypes
     return ((EpoxyModel) holder.getModel()).onFailedToRecycleView(holder.objectToBind());
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -613,6 +645,7 @@ public void onViewAttachedToWindow(EpoxyViewHolder holder) {
 //                                                   ^^^^^^ definition local 32
 //                                                          display_name holder
 //                                                          signature_documentation java EpoxyViewHolder holder
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
     //noinspection unchecked,rawtypes
     ((EpoxyModel) holder.getModel()).onViewAttachedToWindow(holder.objectToBind());
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -636,6 +669,7 @@ public void onViewDetachedFromWindow(EpoxyViewHolder holder) {
 //                                                     ^^^^^^ definition local 33
 //                                                            display_name holder
 //                                                            signature_documentation java EpoxyViewHolder holder
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
     //noinspection unchecked,rawtypes
     ((EpoxyModel) holder.getModel()).onViewDetachedFromWindow(holder.objectToBind());
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -654,6 +688,7 @@ public void onSaveInstanceState(Bundle outState) {
 //                                       ^^^^^^^^ definition local 34
 //                                                display_name outState
 //                                                signature_documentation java unresolved_type outState
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState().
     // Save the state of currently bound views first so they are included. Views that were
     // scrolled off and unbound will already have had
     // their state saved.
@@ -662,6 +697,7 @@ public void onSaveInstanceState(Bundle outState) {
 //                       ^^^^^^ definition local 35
 //                              display_name holder
 //                              signature_documentation java EpoxyViewHolder holder
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState().
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders.
       viewHolderState.save(holder);
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
@@ -693,6 +729,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
 //                                                    ^^^^^^^ definition local 36
 //                                                            display_name inState
 //                                                            signature_documentation java @Nullable\nunresolved_type inState
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onRestoreInstanceState().
     // To simplify things we enforce that state is restored before views are bound, otherwise it
     // is more difficult to update view state once they are bound
     if (boundViewHolders.size() > 0) {
@@ -738,16 +775,19 @@ protected int getModelPosition(EpoxyModel<?> model) {
 //                                             ^^^^^ definition local 37
 //                                                   display_name model
 //                                                   signature_documentation java EpoxyModel<?> model
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
     int size = getCurrentModels().size();
 //      ^^^^ definition local 38
 //           display_name size
 //           signature_documentation java int size
+//           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 39
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                  ^ reference local 39
 //                      ^^^^ reference local 38
 //                            ^ reference local 39
@@ -795,6 +835,7 @@ public void setSpanCount(int spanCount) {
 //                             ^^^^^^^^^ definition local 40
 //                                       display_name spanCount
 //                                       signature_documentation java int spanCount
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount().
     this.spanCount = spanCount;
 //       ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
 //                   ^^^^^^^^^ reference local 40
@@ -838,6 +879,7 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //                                                ^^^^^^^^^^^^ definition local 41
 //                                                             display_name stickyHeader
 //                                                             signature_documentation java @NotNull\nunresolved_type stickyHeader
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView().
     // no-op
   }
 
@@ -861,6 +903,7 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //                                                   ^^^^^^^^^^^^ definition local 42
 //                                                                display_name stickyHeader
 //                                                                signature_documentation java @NotNull\nunresolved_type stickyHeader
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView().
     // no-op
   }
 
@@ -882,6 +925,7 @@ public boolean isStickyHeader(int position) {
 //                                  ^^^^^^^^ definition local 43
 //                                           display_name position
 //                                           signature_documentation java int position
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader().
     return false;
   }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
index a07c4ae72..63d920aeb 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
@@ -37,9 +37,11 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //                               ^^^^^ definition local 0
 //                                     display_name model
 //                                     signature_documentation java T model
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                          ^^^^^^^^^^^^^^^ definition local 1
 //                                                          display_name adapterPosition
 //                                                          signature_documentation java int adapterPosition
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 
   /**
    * Called when the user interaction with a view is over and the view has
@@ -64,8 +66,10 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //                 ^^^^^ definition local 2
 //                       display_name model
 //                       signature_documentation java T model
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                        ^^^^ reference semanticdb maven . . View#
 //                             ^^^^^^^^ definition local 3
 //                                      display_name itemView
 //                                      signature_documentation java unresolved_type itemView
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
index 2c24e21e9..ffafa810c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
@@ -52,6 +52,7 @@ public EpoxyViewHolder get(EpoxyViewHolder holder) {
 //                                           ^^^^^^ definition local 0
 //                                                  display_name holder
 //                                                  signature_documentation java EpoxyViewHolder holder
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#get().
     return holders.get(holder.getItemId());
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //                 ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
@@ -67,6 +68,7 @@ public void put(EpoxyViewHolder holder) {
 //                                ^^^^^^ definition local 1
 //                                       display_name holder
 //                                       signature_documentation java EpoxyViewHolder holder
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#put().
     holders.put(holder.getItemId(), holder);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //          ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#put().
@@ -83,6 +85,7 @@ public void remove(EpoxyViewHolder holder) {
 //                                   ^^^^^^ definition local 2
 //                                          display_name holder
 //                                          signature_documentation java EpoxyViewHolder holder
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#remove().
     holders.remove(holder.getItemId());
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //          ^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#remove().
@@ -123,6 +126,7 @@ public EpoxyViewHolder getHolderForModel(EpoxyModel<?> model) {
 //                                                       ^^^^^ definition local 3
 //                                                             display_name model
 //                                                             signature_documentation java EpoxyModel<?> model
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#getHolderForModel().
     return holders.get(model.id());
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //                 ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
index 830a0fb1c..4dcbbb07a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
@@ -138,11 +138,13 @@ public SnapHelper buildSnapHelper(Context context) {
 //                        ^^^^^^^^^^^^^^^ definition local 1
 //                                        display_name buildSnapHelper
 //                                        signature_documentation java @Override\n@NonNull\npublic unresolved_type buildSnapHelper(unresolved_type context)
+//                                        enclosing_symbol local 0
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
 //                                        ^^^^^^^ reference semanticdb maven . . Context#
 //                                                ^^^^^^^ definition local 2
 //                                                        display_name context
 //                                                        signature_documentation java unresolved_type context
+//                                                        enclosing_symbol local 1
           return new LinearSnapHelper();
         }
       };
@@ -170,6 +172,7 @@ public Carousel(Context context) {
 //                        ^^^^^^^ definition local 3
 //                                display_name context
 //                                signature_documentation java unresolved_type context
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`().
     super(context);
 //        ^^^^^^^ reference local 3
   }
@@ -182,11 +185,13 @@ public Carousel(Context context, @Nullable AttributeSet attrs) {
 //                        ^^^^^^^ definition local 4
 //                                display_name context
 //                                signature_documentation java unresolved_type context
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+1).
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . AttributeSet#
 //                                                        ^^^^^ definition local 5
 //                                                              display_name attrs
 //                                                              signature_documentation java @Nullable\nunresolved_type attrs
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+1).
     super(context, attrs);
 //        ^^^^^^^ reference local 4
 //                 ^^^^^ reference local 5
@@ -200,14 +205,17 @@ public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) {
 //                        ^^^^^^^ definition local 6
 //                                display_name context
 //                                signature_documentation java unresolved_type context
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+2).
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . AttributeSet#
 //                                                        ^^^^^ definition local 7
 //                                                              display_name attrs
 //                                                              signature_documentation java @Nullable\nunresolved_type attrs
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+2).
 //                                                                   ^^^^^^^^ definition local 8
 //                                                                            display_name defStyle
 //                                                                            signature_documentation java int defStyle
+//                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+2).
     super(context, attrs, defStyle);
 //        ^^^^^^^ reference local 6
 //                 ^^^^^ reference local 7
@@ -228,6 +236,7 @@ protected void init() {
 //      ^^^^^^^^^^^^^^^^ definition local 9
 //                       display_name defaultSpacingDp
 //                       signature_documentation java int defaultSpacingDp
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#init().
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp().
 
     if (defaultSpacingDp >= 0) {
@@ -256,6 +265,7 @@ && getPaddingBottom() == 0) {
 //                    ^^^^^^^^^^^^^^^^^ definition local 10
 //                                      display_name snapHelperFactory
 //                                      signature_documentation java SnapHelperFactory snapHelperFactory
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#init().
 //                                        ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSnapHelperFactory().
     if (snapHelperFactory != null) {
 //      ^^^^^^^^^^^^^^^^^ reference local 10
@@ -306,6 +316,7 @@ public static void setDefaultGlobalSnapHelperFactory(@Nullable SnapHelperFactory
 //                                                                                 ^^^^^^^ definition local 11
 //                                                                                         display_name factory
 //                                                                                         signature_documentation java @Nullable\nSnapHelperFactory factory
+//                                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setDefaultGlobalSnapHelperFactory().
     defaultGlobalSnapHelperFactory = factory;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory.
 //                                   ^^^^^^^ reference local 11
@@ -322,6 +333,7 @@ public void setHasFixedSize(boolean hasFixedSize) {
 //                                    ^^^^^^^^^^^^ definition local 12
 //                                                 display_name hasFixedSize
 //                                                 signature_documentation java boolean hasFixedSize
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setHasFixedSize().
     super.setHasFixedSize(hasFixedSize);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . super#setHasFixedSize#
@@ -357,6 +369,7 @@ public void setNumViewsToShowOnScreen(float viewCount) {
 //                                            ^^^^^^^^^ definition local 13
 //                                                      display_name viewCount
 //                                                      signature_documentation java float viewCount
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setNumViewsToShowOnScreen().
     numViewsToShowOnScreen = viewCount;
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
 //                           ^^^^^^^^^ reference local 13
@@ -397,6 +410,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //                                            ^^^^^^^^^^^^^^^^^^ definition local 14
 //                                                               display_name numItemsToPrefetch
 //                                                               signature_documentation java int numItemsToPrefetch
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount().
     if (numItemsToPrefetch < 0) {
 //      ^^^^^^^^^^^^^^^^^^ reference local 14
       throw new IllegalStateException("numItemsToPrefetch must be greater than 0");
@@ -408,6 +422,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //      ^^^^^^^^^^^^^ definition local 15
 //                    display_name prefetchCount
 //                    signature_documentation java int prefetchCount
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount().
 //                      ^^^^^^^^^^^^^^^^^^ reference local 14
 //                                                    ^^^^^^^^^^^^^^^^^^ reference local 14
 
@@ -416,6 +431,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //                ^^^^^^^^^^^^^ definition local 16
 //                              display_name layoutManager
 //                              signature_documentation java unresolved_type layoutManager
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount().
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#
     if (layoutManager instanceof LinearLayoutManager) {
 //      ^^^^^^^^^^^^^ reference local 16
@@ -438,6 +454,7 @@ public void onChildAttachedToWindow(View child) {
 //                                         ^^^^^ definition local 17
 //                                               display_name child
 //                                               signature_documentation java unresolved_type child
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
     if (numViewsToShowOnScreen > 0) {
 //      ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
       ViewGroup.LayoutParams childLayoutParams = child.getLayoutParams();
@@ -446,6 +463,7 @@ public void onChildAttachedToWindow(View child) {
 //                           ^^^^^^^^^^^^^^^^^ definition local 18
 //                                             display_name childLayoutParams
 //                                             signature_documentation java unresolved_type childLayoutParams
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
 //                                               ^^^^^ reference local 17
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . View#getLayoutParams#
       child.setTag(R.id.epoxy_recycler_view_child_initial_size_id, childLayoutParams.width);
@@ -461,12 +479,14 @@ public void onChildAttachedToWindow(View child) {
 //        ^^^^^^^^^^^^^ definition local 19
 //                      display_name itemSpacingPx
 //                      signature_documentation java int itemSpacingPx
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpacingDecorator#
 //                                              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpacingDecorator#getPxBetweenItems#
       int spaceBetweenItems = 0;
 //        ^^^^^^^^^^^^^^^^^ definition local 20
 //                          display_name spaceBetweenItems
 //                          signature_documentation java int spaceBetweenItems
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
       if (itemSpacingPx > 0) {
 //        ^^^^^^^^^^^^^ reference local 19
         // The item decoration space is not counted in the width of the view
@@ -480,12 +500,14 @@ public void onChildAttachedToWindow(View child) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition local 21
 //                                    display_name isScrollingHorizontally
 //                                    signature_documentation java boolean isScrollingHorizontally
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
 //                                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#
 //                                                         ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#canScrollHorizontally#
       int itemSizeInScrollingDirection =
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 22
 //                                     display_name itemSizeInScrollingDirection
 //                                     signature_documentation java int itemSizeInScrollingDirection
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
           (int)
               ((getSpaceForChildren(isScrollingHorizontally) - spaceBetweenItems)
 //              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpaceForChildren().
@@ -518,6 +540,7 @@ private int getSpaceForChildren(boolean horizontal) {
 //                                        ^^^^^^^^^^ definition local 23
 //                                                   display_name horizontal
 //                                                   signature_documentation java boolean horizontal
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#getSpaceForChildren().
     if (horizontal) {
 //      ^^^^^^^^^^ reference local 23
       return getTotalWidthPx(this)
@@ -551,6 +574,7 @@ private static int getTotalWidthPx(View view) {
 //                                        ^^^^ definition local 24
 //                                             display_name view
 //                                             signature_documentation java unresolved_type view
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalWidthPx().
     if (view.getWidth() > 0) {
 //      ^^^^ reference local 24
 //           ^^^^^^^^ reference semanticdb maven . . View#getWidth#
@@ -574,6 +598,7 @@ private static int getTotalWidthPx(View view) {
 //                 ^^^^^^^ definition local 25
 //                         display_name metrics
 //                         signature_documentation java unresolved_type metrics
+//                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalWidthPx().
 //                           ^^^^ reference local 24
 //                                ^^^^^^^^^^ reference semanticdb maven . . View#getContext#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven . . View#getContext#getResources#
@@ -593,6 +618,7 @@ private static int getTotalHeightPx(View view) {
 //                                         ^^^^ definition local 26
 //                                              display_name view
 //                                              signature_documentation java unresolved_type view
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalHeightPx().
     if (view.getHeight() > 0) {
 //      ^^^^ reference local 26
 //           ^^^^^^^^^ reference semanticdb maven . . View#getHeight#
@@ -615,6 +641,7 @@ private static int getTotalHeightPx(View view) {
 //                 ^^^^^^^ definition local 27
 //                         display_name metrics
 //                         signature_documentation java unresolved_type metrics
+//                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalHeightPx().
 //                           ^^^^ reference local 26
 //                                ^^^^^^^^^^ reference semanticdb maven . . View#getContext#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven . . View#getContext#getResources#
@@ -634,12 +661,14 @@ public void onChildDetachedFromWindow(View child) {
 //                                           ^^^^^ definition local 28
 //                                                 display_name child
 //                                                 signature_documentation java unresolved_type child
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildDetachedFromWindow().
     // Restore the view width that existed before we modified it
     Object initialWidth = child.getTag(R.id.epoxy_recycler_view_child_initial_size_id);
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //         ^^^^^^^^^^^^ definition local 29
 //                      display_name initialWidth
 //                      signature_documentation java Object initialWidth
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildDetachedFromWindow().
 //                        ^^^^^ reference local 28
 //                              ^^^^^^ reference semanticdb maven . . View#getTag#
 //                                     ^ reference semanticdb maven . . R/
@@ -655,6 +684,7 @@ public void onChildDetachedFromWindow(View child) {
 //                           ^^^^^^ definition local 30
 //                                  display_name params
 //                                  signature_documentation java unresolved_type params
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildDetachedFromWindow().
 //                                    ^^^^^ reference local 28
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . View#getLayoutParams#
       params.width = (int) initialWidth;
@@ -687,6 +717,7 @@ public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int d
 //                                                                               ^^ definition local 31
 //                                                                                  display_name dp
 //                                                                                  signature_documentation java @Dimension(unit = Dimension.DP)\nint dp
+//                                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setDefaultItemSpacingDp().
     defaultSpacingBetweenItemsDp = dp;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp.
 //                                 ^^ reference local 31
@@ -728,10 +759,12 @@ public void setPaddingRes(@DimenRes int paddingRes) {
 //                                        ^^^^^^^^^^ definition local 32
 //                                                   display_name paddingRes
 //                                                   signature_documentation java @DimenRes\nint paddingRes
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingRes().
     int px = resToPx(paddingRes);
 //      ^^ definition local 33
 //         display_name px
 //         signature_documentation java int px
+//         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingRes().
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#resToPx#
 //                   ^^^^^^^^^^ reference local 32
     setPadding(px, px, px, px);
@@ -767,10 +800,12 @@ public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
 //                                                             ^^^^^^^^^ definition local 34
 //                                                                       display_name paddingDp
 //                                                                       signature_documentation java @Dimension(unit = Dimension.DP)\nint paddingDp
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingDp().
     int px = dpToPx(paddingDp != NO_VALUE_SET ? paddingDp : getDefaultSpacingBetweenItemsDp());
 //      ^^ definition local 35
 //         display_name px
 //         signature_documentation java int px
+//         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingDp().
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#dpToPx#
 //                  ^^^^^^^^^ reference local 34
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#NO_VALUE_SET.
@@ -806,6 +841,7 @@ public void setPadding(@Nullable Padding padding) {
 //                                         ^^^^^^^ definition local 36
 //                                                 display_name padding
 //                                                 signature_documentation java @Nullable\nPadding padding
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setPadding().
     if (padding == null) {
 //      ^^^^^^^ reference local 36
       setPaddingDp(0);
@@ -966,10 +1002,12 @@ public static Padding resource(@DimenRes int paddingRes, @DimenRes int itemSpaci
 //                                               ^^^^^^^^^^ definition local 37
 //                                                          display_name paddingRes
 //                                                          signature_documentation java @DimenRes\nint paddingRes
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource().
 //                                                            ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                                                         ^^^^^^^^^^^^^^ definition local 38
 //                                                                                        display_name itemSpacingRes
 //                                                                                        signature_documentation java @DimenRes\nint itemSpacingRes
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource().
       return new Padding(
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
           paddingRes, paddingRes, paddingRes, paddingRes, itemSpacingRes, PaddingType.RESOURCE);
@@ -1001,26 +1039,31 @@ public static Padding resource(
 //                    ^^^^^^^ definition local 39
 //                            display_name leftRes
 //                            signature_documentation java @DimenRes\nint leftRes
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource(+1).
         @DimenRes int topRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^ definition local 40
 //                           display_name topRes
 //                           signature_documentation java @DimenRes\nint topRes
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource(+1).
         @DimenRes int rightRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^ definition local 41
 //                             display_name rightRes
 //                             signature_documentation java @DimenRes\nint rightRes
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource(+1).
         @DimenRes int bottomRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^^ definition local 42
 //                              display_name bottomRes
 //                              signature_documentation java @DimenRes\nint bottomRes
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource(+1).
         @DimenRes int itemSpacingRes) {
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                    ^^^^^^^^^^^^^^ definition local 43
 //                                   display_name itemSpacingRes
 //                                   signature_documentation java @DimenRes\nint itemSpacingRes
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource(+1).
       return new Padding(
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
           leftRes, topRes, rightRes, bottomRes, itemSpacingRes, PaddingType.RESOURCE);
@@ -1052,6 +1095,7 @@ public static Padding dp(
 //                                          ^^^^^^^^^ definition local 44
 //                                                    display_name paddingDp
 //                                                    signature_documentation java @Dimension(unit = Dimension.DP)\nint paddingDp
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp().
         @Dimension(unit = Dimension.DP) int itemSpacingDp) {
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1060,6 +1104,7 @@ public static Padding dp(
 //                                          ^^^^^^^^^^^^^ definition local 45
 //                                                        display_name itemSpacingDp
 //                                                        signature_documentation java @Dimension(unit = Dimension.DP)\nint itemSpacingDp
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp().
       return new Padding(paddingDp, paddingDp, paddingDp, paddingDp, itemSpacingDp, PaddingType.DP);
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                       ^^^^^^^^^ reference local 44
@@ -1093,6 +1138,7 @@ public static Padding dp(
 //                                          ^^^^^^ definition local 46
 //                                                 display_name leftDp
 //                                                 signature_documentation java @Dimension(unit = Dimension.DP)\nint leftDp
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp(+1).
         @Dimension(unit = Dimension.DP) int topDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1101,6 +1147,7 @@ public static Padding dp(
 //                                          ^^^^^ definition local 47
 //                                                display_name topDp
 //                                                signature_documentation java @Dimension(unit = Dimension.DP)\nint topDp
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp(+1).
         @Dimension(unit = Dimension.DP) int rightDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1109,6 +1156,7 @@ public static Padding dp(
 //                                          ^^^^^^^ definition local 48
 //                                                  display_name rightDp
 //                                                  signature_documentation java @Dimension(unit = Dimension.DP)\nint rightDp
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp(+1).
         @Dimension(unit = Dimension.DP) int bottomDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1117,6 +1165,7 @@ public static Padding dp(
 //                                          ^^^^^^^^ definition local 49
 //                                                   display_name bottomDp
 //                                                   signature_documentation java @Dimension(unit = Dimension.DP)\nint bottomDp
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp(+1).
         @Dimension(unit = Dimension.DP) int itemSpacingDp) {
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                 ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -1125,6 +1174,7 @@ public static Padding dp(
 //                                          ^^^^^^^^^^^^^ definition local 50
 //                                                        display_name itemSpacingDp
 //                                                        signature_documentation java @Dimension(unit = Dimension.DP)\nint itemSpacingDp
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp(+1).
       return new Padding(leftDp, topDp, rightDp, bottomDp, itemSpacingDp, PaddingType.DP);
 //               ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                       ^^^^^^ reference local 46
@@ -1150,10 +1200,12 @@ public Padding(@Px int paddingPx, @Px int itemSpacingPx) {
 //                         ^^^^^^^^^ definition local 51
 //                                   display_name paddingPx
 //                                   signature_documentation java @Px\nint paddingPx
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`().
 //                                     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                            ^^^^^^^^^^^^^ definition local 52
 //                                                          display_name itemSpacingPx
 //                                                          signature_documentation java @Px\nint itemSpacingPx
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`().
       this(paddingPx, paddingPx, paddingPx, paddingPx, itemSpacingPx, PaddingType.PX);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //         ^^^^^^^^^ reference local 51
@@ -1183,22 +1235,27 @@ public Padding(
 //              ^^^^^^ definition local 53
 //                     display_name leftPx
 //                     signature_documentation java @Px\nint leftPx
+//                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+1).
 //                       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                              ^^^^^ definition local 54
 //                                    display_name topPx
 //                                    signature_documentation java @Px\nint topPx
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+1).
 //                                      ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                             ^^^^^^^ definition local 55
 //                                                     display_name rightPx
 //                                                     signature_documentation java @Px\nint rightPx
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+1).
 //                                                       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                                              ^^^^^^^^ definition local 56
 //                                                                       display_name bottomPx
 //                                                                       signature_documentation java @Px\nint bottomPx
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+1).
 //                                                                         ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                                                                ^^^^^^^^^^^^^ definition local 57
 //                                                                                              display_name itemSpacingPx
 //                                                                                              signature_documentation java @Px\nint itemSpacingPx
+//                                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+1).
       this(leftPx, topPx, rightPx, bottomPx, itemSpacingPx, PaddingType.PX);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //         ^^^^^^ reference local 53
@@ -1228,22 +1285,28 @@ private Padding(
 //          ^^^^ definition local 58
 //               display_name left
 //               signature_documentation java int left
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                    ^^^ definition local 59
 //                        display_name top
 //                        signature_documentation java int top
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                             ^^^^^ definition local 60
 //                                   display_name right
 //                                   signature_documentation java int right
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                                        ^^^^^^ definition local 61
 //                                               display_name bottom
 //                                               signature_documentation java int bottom
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                                                    ^^^^^^^^^^^ definition local 62
 //                                                                display_name itemSpacing
 //                                                                signature_documentation java int itemSpacing
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                                                                 ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
 //                                                                             ^^^^^^^^^^^ definition local 63
 //                                                                                         display_name paddingType
 //                                                                                         signature_documentation java PaddingType paddingType
+//                                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 
       this.left = left;
 //         ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
@@ -1276,6 +1339,7 @@ public boolean equals(Object o) {
 //                               ^ definition local 64
 //                                 display_name o
 //                                 signature_documentation java Object o
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#equals().
       if (this == o) {
 //                ^ reference local 64
         return true;
@@ -1293,6 +1357,7 @@ public boolean equals(Object o) {
 //            ^^^^^^^ definition local 65
 //                    display_name padding
 //                    signature_documentation java Padding padding
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#equals().
 //                       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                                ^ reference local 64
 
@@ -1337,6 +1402,7 @@ public int hashCode() {
 //        ^^^^^^ definition local 66
 //               display_name result
 //               signature_documentation java int result
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#hashCode().
 //                 ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
       result = 31 * result + top;
 //    ^^^^^^ reference local 66
@@ -1371,6 +1437,7 @@ public void setModels(@NonNull List<? extends EpoxyModel<?>> models) {
 //                                                             ^^^^^^ definition local 67
 //                                                                    display_name models
 //                                                                    signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> models
+//                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setModels().
     super.setModels(models);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^ reference semanticdb maven . . super#setModels#
@@ -1413,5 +1480,6 @@ public abstract static class SnapHelperFactory {
 //                                                     ^^^^^^^ definition local 68
 //                                                             display_name context
 //                                                             signature_documentation java unresolved_type context
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
   }
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
index 264120b72..ceac86f6b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
@@ -36,12 +36,14 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 //                                                      ^^^^^^^^^^ definition local 0
 //                                                                 display_name controller
 //                                                                 signature_documentation java T controller
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
     List<EpoxyModel<?>> currentModels = controller.getAdapter().getCopyOfModels();
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^^^ definition local 1
 //                                    display_name currentModels
 //                                    signature_documentation java List<EpoxyModel<?>> currentModels
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
 //                                      ^^^^^^^^^^ reference local 0
 //                                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#getAdapter().
 //                                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCopyOfModels().
@@ -50,6 +52,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 //           ^ definition local 2
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
 //                  ^ reference local 2
 //                      ^^^^^^^^^^^^^ reference local 1
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -59,6 +62,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 //               ^^^^^ definition local 3
 //                     display_name model
 //                     signature_documentation java EpoxyModel model
+//                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
 //                       ^^^^^^^^^^^^^ reference local 1
 //                                     ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                         ^ reference local 2
@@ -78,10 +82,12 @@ protected void setControllerToStageTo(EpoxyModel<?> model, T controller) {
 //                                                    ^^^^^ definition local 4
 //                                                          display_name model
 //                                                          signature_documentation java EpoxyModel<?> model
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#setControllerToStageTo().
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
 //                                                             ^^^^^^^^^^ definition local 5
 //                                                                        display_name controller
 //                                                                        signature_documentation java T controller
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#setControllerToStageTo().
     model.controllerToStageTo = controller;
 //  ^^^^^ reference local 4
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#controllerToStageTo.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
index 0765489b3..63d644231 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
@@ -66,11 +66,13 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //                                                               ^^^^^^^^^^ definition local 0
 //                                                                          display_name controller
 //                                                                          signature_documentation java EpoxyController controller
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
     Constructor<?> constructor = findConstructorForClass(controller.getClass());
 //  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                 ^^^^^^^^^^^ definition local 1
 //                             display_name constructor
 //                             signature_documentation java Constructor<?> constructor
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
 //                               ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                                                       ^^^^^^^^^^ reference local 0
 //                                                                  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
@@ -91,6 +93,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //                                  ^ definition local 2
 //                                    display_name e
 //                                    signature_documentation java IllegalAccessException e
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
       throw new RuntimeException("Unable to invoke " + constructor, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
 //                                                     ^^^^^^^^^^^ reference local 1
@@ -100,6 +103,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //                                  ^ definition local 3
 //                                    display_name e
 //                                    signature_documentation java InstantiationException e
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
       throw new RuntimeException("Unable to invoke " + constructor, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
 //                                                     ^^^^^^^^^^^ reference local 1
@@ -109,11 +113,13 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //                                     ^ definition local 4
 //                                       display_name e
 //                                       signature_documentation java InvocationTargetException e
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
       Throwable cause = e.getCause();
 //    ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Throwable#
 //              ^^^^^ definition local 5
 //                    display_name cause
 //                    signature_documentation java Throwable cause
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
 //                      ^ reference local 4
 //                        ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationTargetException#getCause().
       if (cause instanceof RuntimeException) {
@@ -147,11 +153,13 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //                                                               ^^^^^^^^^^^^^^^ definition local 6
 //                                                                               display_name controllerClass
 //                                                                               signature_documentation java Class<?> controllerClass
+//                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
     Constructor<?> helperCtor = BINDINGS.get(controllerClass);
 //  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                 ^^^^^^^^^^ definition local 7
 //                            display_name helperCtor
 //                            signature_documentation java Constructor<?> helperCtor
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#BINDINGS.
 //                                       ^^^ reference semanticdb maven jdk 11 java/util/Map#get().
 //                                           ^^^^^^^^^^^^^^^ reference local 6
@@ -169,6 +177,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //         ^^^^^^^ definition local 8
 //                 display_name clsName
 //                 signature_documentation java String clsName
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                   ^^^^^^^^^^^^^^^ reference local 6
 //                                   ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#getName().
     if (clsName.startsWith("android.") || clsName.startsWith("java.")) {
@@ -185,6 +194,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //             ^^^^^^^^^^^^ definition local 9
 //                          display_name bindingClass
 //                          signature_documentation java Class<?> bindingClass
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                            ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                  ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#forName().
 //                                          ^^^^^^^ reference local 8
@@ -200,6 +210,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //                                  ^ definition local 10
 //                                    display_name e
 //                                    signature_documentation java ClassNotFoundException e
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
       helperCtor = findConstructorForClass(controllerClass.getSuperclass());
 //    ^^^^^^^^^^ reference local 7
 //                 ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
@@ -210,6 +221,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //                                 ^ definition local 11
 //                                   display_name e
 //                                   signature_documentation java NoSuchMethodException e
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
       throw new RuntimeException("Unable to find Epoxy Helper constructor for " + clsName, e);
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+2).
 //                                                                                ^^^^^^^ reference local 8
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
index 88f06e6ac..48f897253 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
@@ -36,13 +36,16 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 //              ^^^^^^^^^^^^^^^^^^^ definition local 1
 //                                  display_name onItemRangeInserted
 //                                  signature_documentation java @Override\npublic void onItemRangeInserted(int positionStart, int itemCount)
+//                                  enclosing_symbol local 0
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
 //                                      ^^^^^^^^^^^^^ definition local 2
 //                                                    display_name positionStart
 //                                                    signature_documentation java int positionStart
+//                                                    enclosing_symbol local 1
 //                                                         ^^^^^^^^^ definition local 3
 //                                                                   display_name itemCount
 //                                                                   signature_documentation java int itemCount
+//                                                                   enclosing_symbol local 1
       throw new IllegalStateException(
 //              ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IllegalStateException#`<init>`(+1).
           "Models cannot be changed once they are added to the controller");
@@ -54,13 +57,16 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 //              ^^^^^^^^^^^^^^^^^^ definition local 4
 //                                 display_name onItemRangeRemoved
 //                                 signature_documentation java @Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)
+//                                 enclosing_symbol local 0
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
 //                                     ^^^^^^^^^^^^^ definition local 5
 //                                                   display_name positionStart
 //                                                   signature_documentation java int positionStart
+//                                                   enclosing_symbol local 4
 //                                                        ^^^^^^^^^ definition local 6
 //                                                                  display_name itemCount
 //                                                                  signature_documentation java int itemCount
+//                                                                  enclosing_symbol local 4
       throw new IllegalStateException(
 //              ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IllegalStateException#`<init>`(+1).
           "Models cannot be changed once they are added to the controller");
@@ -74,6 +80,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 //                        ^^^^^^^^^^^^^^^^^^ definition local 7
 //                                           display_name expectedModelCount
 //                                           signature_documentation java int expectedModelCount
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerModelList#`<init>`().
     super(expectedModelCount);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`().
 //        ^^^^^^^^^^^^^^^^^^ reference local 7
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
index 8536e845f..a57a94fc0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
@@ -35,6 +35,7 @@ class DebugTimer implements Timer {
 //                  ^^^ definition local 0
 //                      display_name tag
 //                      signature_documentation java String tag
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DebugTimer#`<init>`().
     this.tag = tag;
 //       ^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#tag.
 //             ^^^ reference local 0
@@ -63,6 +64,7 @@ public void start(String sectionName) {
 //                         ^^^^^^^^^^^ definition local 1
 //                                     display_name sectionName
 //                                     signature_documentation java String sectionName
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DebugTimer#start().
     if (startTime != -1) {
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
       throw new IllegalStateException("Timer was already started");
@@ -95,6 +97,7 @@ public void stop() {
 //        ^^^^^^^^^^ definition local 2
 //                   display_name durationMs
 //                   signature_documentation java float durationMs
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DebugTimer#stop().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#nanoTime().
 //                                          ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
index 80f4bf7aa..a226c8b73 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
@@ -91,9 +91,11 @@ class DiffHelper {
 //                            ^^^^^^^ definition local 0
 //                                    display_name adapter
 //                                    signature_documentation java BaseEpoxyAdapter adapter
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#`<init>`().
 //                                             ^^^^^^^^^^^^^^^ definition local 1
 //                                                             display_name immutableModels
 //                                                             signature_documentation java boolean immutableModels
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#`<init>`().
     this.adapter = adapter;
 //       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                 ^^^^^^^ reference local 0
@@ -220,6 +222,7 @@ void notifyModelChanges() {
 //                 ^^^^^^^^^^^^^^ definition local 2
 //                                display_name updateOpHelper
 //                                signature_documentation java UpdateOpHelper updateOpHelper
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyModelChanges().
 //                                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#`<init>`().
 
     buildDiff(updateOpHelper);
@@ -249,11 +252,13 @@ private void notifyChanges(UpdateOpHelper opHelper) {
 //                                          ^^^^^^^^ definition local 3
 //                                                   display_name opHelper
 //                                                   signature_documentation java UpdateOpHelper opHelper
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyChanges().
     for (UpdateOp op : opHelper.opList) {
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                ^^ definition local 4
 //                   display_name op
 //                   signature_documentation java UpdateOp op
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyChanges().
 //                     ^^^^^^^^ reference local 3
 //                              ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
       switch (op.type) {
@@ -343,6 +348,7 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
 //                                                ^^^^^^^^^^^^^^ definition local 5
 //                                                               display_name updateOpHelper
 //                                                               signature_documentation java UpdateOpHelper updateOpHelper
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#buildDiff().
     prepareStateForDiff();
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 
@@ -360,6 +366,7 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
 //          ^^^^^^^^^^^^^ definition local 6
 //                        display_name hasInsertions
 //                        signature_documentation java boolean hasInsertions
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#buildDiff().
         oldStateList.size() - updateOpHelper.getNumRemovals() != currentStateList.size();
 //      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                   ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
@@ -421,6 +428,7 @@ private void prepareStateForDiff() {
 //                        ^^^^^^^^ definition local 7
 //                                 display_name tempList
 //                                 signature_documentation java ArrayList<ModelState> tempList
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
     oldStateList = currentStateList;
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
@@ -436,6 +444,7 @@ private void prepareStateForDiff() {
 //                        ^^^^^^^ definition local 8
 //                                display_name tempMap
 //                                signature_documentation java Map<Long, ModelState> tempMap
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 //                                  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
     oldStateMap = currentStateMap;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
@@ -451,6 +460,7 @@ private void prepareStateForDiff() {
 //                  ^^^^^^^^^^ definition local 9
 //                             display_name modelState
 //                             signature_documentation java ModelState modelState
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
       modelState.pair = null;
 //    ^^^^^^^^^^ reference local 9
@@ -461,6 +471,7 @@ private void prepareStateForDiff() {
 //      ^^^^^^^^^^ definition local 10
 //                 display_name modelCount
 //                 signature_documentation java int modelCount
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 //                   ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                              ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -473,6 +484,7 @@ private void prepareStateForDiff() {
 //           ^ definition local 11
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 //                  ^ reference local 11
 //                      ^^^^^^^^^^ reference local 10
 //                                  ^ reference local 11
@@ -492,11 +504,13 @@ private ModelState createStateForPosition(int position) {
 //                                              ^^^^^^^^ definition local 12
 //                                                       display_name position
 //                                                       signature_documentation java int position
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
     EpoxyModel<?> model = adapter.getCurrentModels().get(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 13
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
 //                        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                                   ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -509,6 +523,7 @@ private ModelState createStateForPosition(int position) {
 //             ^^^^^ definition local 14
 //                   display_name state
 //                   signature_documentation java ModelState state
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#build().
 //                                      ^^^^^ reference local 13
@@ -520,6 +535,7 @@ private ModelState createStateForPosition(int position) {
 //             ^^^^^^^^^^^^^ definition local 15
 //                           display_name previousValue
 //                           signature_documentation java ModelState previousValue
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateMap.
 //                                             ^^^ reference semanticdb maven jdk 11 java/util/Map#put().
 //                                                 ^^^^^ reference local 14
@@ -531,6 +547,7 @@ private ModelState createStateForPosition(int position) {
 //        ^^^^^^^^^^^^^^^^ definition local 16
 //                         display_name previousPosition
 //                         signature_documentation java int previousPosition
+//                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
 //                           ^^^^^^^^^^^^^ reference local 15
 //                                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
       EpoxyModel<?> previousModel = adapter.getCurrentModels().get(previousPosition);
@@ -538,6 +555,7 @@ private ModelState createStateForPosition(int position) {
 //                  ^^^^^^^^^^^^^ definition local 17
 //                                display_name previousModel
 //                                signature_documentation java EpoxyModel<?> previousModel
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
 //                                  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                                             ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -570,11 +588,13 @@ private void collectRemovals(UpdateOpHelper helper) {
 //                                            ^^^^^^ definition local 18
 //                                                   display_name helper
 //                                                   signature_documentation java UpdateOpHelper helper
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectRemovals().
     for (ModelState state : oldStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^ definition local 19
 //                        display_name state
 //                        signature_documentation java ModelState state
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectRemovals().
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
       // Update the position of the item to take into account previous removals,
       // so that future operations will reference the correct position
@@ -627,12 +647,14 @@ private void collectInsertions(UpdateOpHelper helper) {
 //                                              ^^^^^^ definition local 20
 //                                                     display_name helper
 //                                                     signature_documentation java UpdateOpHelper helper
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
     Iterator<ModelState> oldItemIterator = oldStateList.iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                       ^^^^^^^^^^^^^^^ definition local 21
 //                                       display_name oldItemIterator
 //                                       signature_documentation java Iterator<ModelState> oldItemIterator
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
 
@@ -641,6 +663,7 @@ private void collectInsertions(UpdateOpHelper helper) {
 //                  ^^^^^^^^^^^^ definition local 22
 //                               display_name itemToInsert
 //                               signature_documentation java ModelState itemToInsert
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
 //                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       if (itemToInsert.pair != null) {
 //        ^^^^^^^^^^^^ reference local 22
@@ -651,6 +674,7 @@ private void collectInsertions(UpdateOpHelper helper) {
 //                 ^^^^^^^^^^^ definition local 23
 //                             display_name nextOldItem
 //                             signature_documentation java ModelState nextOldItem
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
 //                               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
 //                                                   ^^^^^^^^^^^^^^^ reference local 21
         if (nextOldItem != null) {
@@ -684,17 +708,20 @@ private void collectChanges(UpdateOpHelper helper) {
 //                                           ^^^^^^ definition local 24
 //                                                  display_name helper
 //                                                  signature_documentation java UpdateOpHelper helper
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
     for (ModelState newItem : currentStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^ definition local 25
 //                          display_name newItem
 //                          signature_documentation java ModelState newItem
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       ModelState previousItem = newItem.pair;
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //               ^^^^^^^^^^^^ definition local 26
 //                            display_name previousItem
 //                            signature_documentation java ModelState previousItem
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
 //                              ^^^^^^^ reference local 25
 //                                      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
       if (previousItem == null) {
@@ -708,6 +735,7 @@ private void collectChanges(UpdateOpHelper helper) {
 //            ^^^^^^^^^^^^ definition local 27
 //                         display_name modelChanged
 //                         signature_documentation java boolean modelChanged
+//                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
       if (immutableModels) {
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#immutableModels.
         // Make sure that the old model hasn't changed, otherwise comparing it with the new one
@@ -767,6 +795,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //                                         ^^^^^^ definition local 28
 //                                                display_name helper
 //                                                signature_documentation java UpdateOpHelper helper
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
     // This walks through both the new and old list simultaneous and checks for position changes.
     Iterator<ModelState> oldItemIterator = oldStateList.iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
@@ -774,6 +803,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //                       ^^^^^^^^^^^^^^^ definition local 29
 //                                       display_name oldItemIterator
 //                                       signature_documentation java Iterator<ModelState> oldItemIterator
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
     ModelState nextOldItem = null;
@@ -781,12 +811,14 @@ private void collectMoves(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^ definition local 30
 //                         display_name nextOldItem
 //                         signature_documentation java ModelState nextOldItem
+//                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
 
     for (ModelState newItem : currentStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                  ^^^^^^^ definition local 31
 //                          display_name newItem
 //                          signature_documentation java ModelState newItem
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       if (newItem.pair == null) {
 //        ^^^^^^^ reference local 31
@@ -877,6 +909,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //          ^^^^^^^^^^^^^^^ definition local 32
 //                          display_name newItemDistance
 //                          signature_documentation java int newItemDistance
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
 //                            ^^^^^^^ reference local 31
 //                                    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
 //                                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
@@ -886,6 +919,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //          ^^^^^^^^^^^^^^^ definition local 33
 //                          display_name oldItemDistance
 //                          signature_documentation java int oldItemDistance
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
 //                            ^^^^^^^^^^^ reference local 30
 //                                        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
 //                                             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
@@ -971,15 +1005,18 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //                                           ^^^^ definition local 34
 //                                                display_name item
 //                                                signature_documentation java ModelState item
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
 //                                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                                                                ^^^^^^^ definition local 35
 //                                                                        display_name moveOps
 //                                                                        signature_documentation java List<UpdateOp> moveOps
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
     int size = moveOps.size();
 //      ^^^^ definition local 36
 //           display_name size
 //           signature_documentation java int size
+//           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
 //             ^^^^^^^ reference local 35
 //                     ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -987,6 +1024,7 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //           ^ definition local 37
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
 //               ^^^^ reference local 34
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#lastMoveOp.
 //                                ^ reference local 37
@@ -997,6 +1035,7 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //             ^^^^^^ definition local 38
 //                    display_name moveOp
 //                    signature_documentation java UpdateOp moveOp
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
 //                      ^^^^^^^ reference local 35
 //                              ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                  ^ reference local 37
@@ -1004,12 +1043,14 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //        ^^^^^^^^^^^^ definition local 39
 //                     display_name fromPosition
 //                     signature_documentation java int fromPosition
+//                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
 //                       ^^^^^^ reference local 38
 //                              ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
       int toPosition = moveOp.itemCount;
 //        ^^^^^^^^^^ definition local 40
 //                   display_name toPosition
 //                   signature_documentation java int toPosition
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
 //                     ^^^^^^ reference local 38
 //                            ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
 
@@ -1058,11 +1099,13 @@ private ModelState getNextItemWithPair(Iterator<ModelState> iterator) {
 //                                                            ^^^^^^^^ definition local 41
 //                                                                     display_name iterator
 //                                                                     signature_documentation java Iterator<ModelState> iterator
+//                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
     ModelState nextItem = null;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^^^^ definition local 42
 //                      display_name nextItem
 //                      signature_documentation java ModelState nextItem
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
     while (nextItem == null && iterator.hasNext()) {
 //         ^^^^^^^^ reference local 42
 //                             ^^^^^^^^ reference local 41
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
index 7515cf360..f76e6a503 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
@@ -54,6 +54,7 @@ public class DiffPayload {
 //                                          ^^^^^^ definition local 0
 //                                                 display_name models
 //                                                 signature_documentation java List<? extends EpoxyModel<?>> models
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
     if (models.isEmpty()) {
 //      ^^^^^^ reference local 0
 //             ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -65,6 +66,7 @@ public class DiffPayload {
 //      ^^^^^^^^^^ definition local 1
 //                 display_name modelCount
 //                 signature_documentation java int modelCount
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
 //                   ^^^^^^ reference local 0
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -89,6 +91,7 @@ public class DiffPayload {
 //                       ^^^^^ definition local 2
 //                             display_name model
 //                             signature_documentation java EpoxyModel<?> model
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
 //                               ^^^^^^ reference local 0
         modelsById.put(model.id(), model);
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
@@ -108,6 +111,7 @@ public DiffPayload(EpoxyModel<?> changedItem) {
 //                                 ^^^^^^^^^^^ definition local 3
 //                                             display_name changedItem
 //                                             signature_documentation java EpoxyModel<?> changedItem
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`(+1).
     this(Collections.singletonList(changedItem));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
 //       ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
@@ -133,9 +137,11 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //                                                             ^^^^^^^^ definition local 4
 //                                                                      display_name payloads
 //                                                                      signature_documentation java List<Object> payloads
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
 //                                                                            ^^^^^^^ definition local 5
 //                                                                                    display_name modelId
 //                                                                                    signature_documentation java long modelId
+//                                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
     if (payloads.isEmpty()) {
 //      ^^^^^^^^ reference local 4
 //               ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -147,12 +153,14 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //              ^^^^^^^ definition local 6
 //                      display_name payload
 //                      signature_documentation java Object payload
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
 //                        ^^^^^^^^ reference local 4
       DiffPayload diffPayload = (DiffPayload) payload;
 //    ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                ^^^^^^^^^^^ definition local 7
 //                            display_name diffPayload
 //                            signature_documentation java DiffPayload diffPayload
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
 //                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                                            ^^^^^^^ reference local 6
 
@@ -174,6 +182,7 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //                    ^^^^^^^^^^ definition local 8
 //                               display_name modelForId
 //                               signature_documentation java EpoxyModel<?> modelForId
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
 //                                 ^^^^^^^^^^^ reference local 7
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                                        ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
@@ -199,6 +208,7 @@ boolean equalsForTesting(DiffPayload that) {
 //                                     ^^^^ definition local 9
 //                                          display_name that
 //                                          signature_documentation java DiffPayload that
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
     if (singleModel != null) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#singleModel.
       return that.singleModel == singleModel;
@@ -211,12 +221,14 @@ boolean equalsForTesting(DiffPayload that) {
 //      ^^^^^^^^ definition local 10
 //               display_name thisSize
 //               signature_documentation java int thisSize
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                            ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
     int thatSize = that.modelsById.size();
 //      ^^^^^^^^ definition local 11
 //               display_name thatSize
 //               signature_documentation java int thatSize
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                 ^^^^ reference local 9
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                 ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
@@ -231,6 +243,7 @@ boolean equalsForTesting(DiffPayload that) {
 //           ^ definition local 12
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                  ^ reference local 12
 //                      ^^^^^^^^ reference local 10
 //                                ^ reference local 12
@@ -238,6 +251,7 @@ boolean equalsForTesting(DiffPayload that) {
 //         ^^^^^^^ definition local 13
 //                 display_name thisKey
 //                 signature_documentation java long thisKey
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                              ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#keyAt().
 //                                    ^ reference local 12
@@ -245,6 +259,7 @@ boolean equalsForTesting(DiffPayload that) {
 //         ^^^^^^^ definition local 14
 //                 display_name thatKey
 //                 signature_documentation java long thatKey
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                   ^^^^ reference local 9
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                   ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#keyAt().
@@ -261,6 +276,7 @@ boolean equalsForTesting(DiffPayload that) {
 //                  ^^^^^^^^^ definition local 15
 //                            display_name thisModel
 //                            signature_documentation java EpoxyModel<?> thisModel
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#valueAt().
 //                                                 ^ reference local 12
@@ -269,6 +285,7 @@ boolean equalsForTesting(DiffPayload that) {
 //                  ^^^^^^^^^ definition local 16
 //                            display_name thatModel
 //                            signature_documentation java EpoxyModel<?> thatModel
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                              ^^^^ reference local 9
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                              ^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#valueAt().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
index e01bf5866..34e7449b5 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
@@ -89,6 +89,7 @@ static DiffResult noOp(@Nullable List<? extends EpoxyModel<?>> models) {
 //                                                               ^^^^^^ definition local 0
 //                                                                      display_name models
 //                                                                      signature_documentation java @Nullable\nList<? extends EpoxyModel<?>> models
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#noOp().
     if (models == null) {
 //      ^^^^^^ reference local 0
       models = Collections.emptyList();
@@ -115,6 +116,7 @@ static DiffResult inserted(@NonNull List<? extends EpoxyModel<?>> newModels) {
 //                                                                  ^^^^^^^^^ definition local 1
 //                                                                            display_name newModels
 //                                                                            signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> newModels
+//                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#inserted().
     //noinspection unchecked
     return new DiffResult(Collections.EMPTY_LIST, newModels, null);
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
@@ -136,6 +138,7 @@ static DiffResult clear(@NonNull List<? extends EpoxyModel<?>> previousModels) {
 //                                                               ^^^^^^^^^^^^^^ definition local 2
 //                                                                              display_name previousModels
 //                                                                              signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> previousModels
+//                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#clear().
     //noinspection unchecked
     return new DiffResult(previousModels, Collections.EMPTY_LIST, null);
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
@@ -161,6 +164,7 @@ static DiffResult diff(
 //                                           ^^^^^^^^^^^^^^ definition local 3
 //                                                          display_name previousModels
 //                                                          signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> previousModels
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#diff().
       @NonNull List<? extends EpoxyModel<?>> newModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -168,6 +172,7 @@ static DiffResult diff(
 //                                           ^^^^^^^^^ definition local 4
 //                                                     display_name newModels
 //                                                     signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> newModels
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#diff().
       @NonNull DiffUtil.DiffResult differResult
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^ reference semanticdb maven . . DiffUtil/
@@ -175,6 +180,7 @@ static DiffResult diff(
 //                                 ^^^^^^^^^^^^ definition local 5
 //                                              display_name differResult
 //                                              signature_documentation java @NonNull\nunresolved_type differResult
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#diff().
   ) {
     return new DiffResult(previousModels, newModels, differResult);
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
@@ -194,6 +200,7 @@ private DiffResult(
 //                                           ^^^^^^^^^^^^^^ definition local 6
 //                                                          display_name previousModels
 //                                                          signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> previousModels
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
       @NonNull List<? extends EpoxyModel<?>> newModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -201,6 +208,7 @@ private DiffResult(
 //                                           ^^^^^^^^^ definition local 7
 //                                                     display_name newModels
 //                                                     signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> newModels
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
       @Nullable DiffUtil.DiffResult differResult
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^ reference semanticdb maven . . DiffUtil/
@@ -208,6 +216,7 @@ private DiffResult(
 //                                  ^^^^^^^^^^^^ definition local 8
 //                                               display_name differResult
 //                                               signature_documentation java @Nullable\nunresolved_type differResult
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
   ) {
     this.previousModels = previousModels;
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#previousModels.
@@ -228,6 +237,7 @@ public void dispatchTo(Adapter adapter) {
 //                               ^^^^^^^ definition local 9
 //                                       display_name adapter
 //                                       signature_documentation java unresolved_type adapter
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo().
     dispatchTo(new AdapterListUpdateCallback(adapter));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo().
 //                                           ^^^^^^^ reference local 9
@@ -241,6 +251,7 @@ public void dispatchTo(ListUpdateCallback callback) {
 //                                          ^^^^^^^^ definition local 10
 //                                                   display_name callback
 //                                                   signature_documentation java unresolved_type callback
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo(+1).
     if (differResult != null) {
 //      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#differResult.
       differResult.dispatchUpdatesTo(callback);
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
index 4b50dadef..40cdd8a0b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
@@ -131,11 +131,13 @@ EpoxyModel<?> getModelForPosition(int position) {
 //                                      ^^^^^^^^ definition local 0
 //                                               display_name position
 //                                               signature_documentation java int position
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
     EpoxyModel<?> model = models.get(position);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 1
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
 //                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                               ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                   ^^^^^^^^ reference local 0
@@ -190,6 +192,7 @@ protected void notifyModelChanged(EpoxyModel<?> model) {
 //                                                ^^^^^ definition local 2
 //                                                      display_name model
 //                                                      signature_documentation java EpoxyModel<?> model
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
     notifyModelChanged(model, null);
 //  ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
 //                     ^^^^^ reference local 2
@@ -208,15 +211,18 @@ protected void notifyModelChanged(EpoxyModel<?> model, @Nullable Object payload)
 //                                                ^^^^^ definition local 3
 //                                                      display_name model
 //                                                      signature_documentation java EpoxyModel<?> model
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
 //                                                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                        ^^^^^^^ definition local 4
 //                                                                                display_name payload
 //                                                                                signature_documentation java @Nullable\nObject payload
+//                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
     int index = getModelPosition(model);
 //      ^^^^^ definition local 5
 //            display_name index
 //            signature_documentation java int index
+//            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 3
     if (index != -1) {
@@ -240,10 +246,12 @@ protected void addModel(EpoxyModel<?> modelToAdd) {
 //                                      ^^^^^^^^^^ definition local 6
 //                                                 display_name modelToAdd
 //                                                 signature_documentation java EpoxyModel<?> modelToAdd
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModel().
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 7
 //                  display_name initialSize
 //                  signature_documentation java int initialSize
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModel().
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -275,16 +283,19 @@ protected void addModels(EpoxyModel<?>... modelsToAdd) {
 //                                          ^^^^^^^^^^^ definition local 8
 //                                                      display_name modelsToAdd
 //                                                      signature_documentation java EpoxyModel<?>[] modelsToAdd
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 9
 //                  display_name initialSize
 //                  signature_documentation java int initialSize
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     int numModelsToAdd = modelsToAdd.length;
 //      ^^^^^^^^^^^^^^ definition local 10
 //                     display_name numModelsToAdd
 //                     signature_documentation java int numModelsToAdd
+//                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
 //                       ^^^^^^^^^^^ reference local 8
 //                                   ^^^^^^ reference semanticdb maven . . Array#length.
 
@@ -326,10 +337,12 @@ protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //                                                             ^^^^^^^^^^^ definition local 11
 //                                                                         display_name modelsToAdd
 //                                                                         signature_documentation java Collection<? extends EpoxyModel<?>> modelsToAdd
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
     int initialSize = models.size();
 //      ^^^^^^^^^^^ definition local 12
 //                  display_name initialSize
 //                  signature_documentation java int initialSize
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -363,14 +376,17 @@ protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> mode
 //                                               ^^^^^^^^^^^^^ definition local 13
 //                                                             display_name modelToInsert
 //                                                             signature_documentation java EpoxyModel<?> modelToInsert
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
 //                                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                            ^^^^^^^^^^^^^^^^^^^ definition local 14
 //                                                                                                display_name modelToInsertBefore
 //                                                                                                signature_documentation java EpoxyModel<?> modelToInsertBefore
+//                                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
     int targetIndex = getModelPosition(modelToInsertBefore);
 //      ^^^^^^^^^^^ definition local 15
 //                  display_name targetIndex
 //                  signature_documentation java int targetIndex
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
 //                    ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                                     ^^^^^^^^^^^^^^^^^^^ reference local 14
     if (targetIndex == -1) {
@@ -409,14 +425,17 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
 //                                              ^^^^^^^^^^^^^ definition local 16
 //                                                            display_name modelToInsert
 //                                                            signature_documentation java EpoxyModel<?> modelToInsert
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
 //                                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                           ^^^^^^^^^^^^^^^^^^ definition local 17
 //                                                                                              display_name modelToInsertAfter
 //                                                                                              signature_documentation java EpoxyModel<?> modelToInsertAfter
+//                                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
     int modelIndex = getModelPosition(modelToInsertAfter);
 //      ^^^^^^^^^^ definition local 18
 //                 display_name modelIndex
 //                 signature_documentation java int modelIndex
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                                    ^^^^^^^^^^^^^^^^^^ reference local 17
     if (modelIndex == -1) {
@@ -430,6 +449,7 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
 //      ^^^^^^^^^^^ definition local 19
 //                  display_name targetIndex
 //                  signature_documentation java int targetIndex
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
 //                    ^^^^^^^^^^ reference local 18
     pauseModelListNotifications();
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#pauseModelListNotifications().
@@ -460,10 +480,12 @@ protected void removeModel(EpoxyModel<?> model) {
 //                                         ^^^^^ definition local 20
 //                                               display_name model
 //                                               signature_documentation java EpoxyModel<?> model
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
     int index = getModelPosition(model);
 //      ^^^^^ definition local 21
 //            display_name index
 //            signature_documentation java int index
+//            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 20
     if (index != -1) {
@@ -496,6 +518,7 @@ protected void removeAllModels() {
 //      ^^^^^^^^^^^^^^^^ definition local 22
 //                       display_name numModelsRemoved
 //                       signature_documentation java int numModelsRemoved
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllModels().
 //                         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -527,24 +550,28 @@ protected void removeAllAfterModel(EpoxyModel<?> model) {
 //                                                 ^^^^^ definition local 23
 //                                                       display_name model
 //                                                       signature_documentation java EpoxyModel<?> model
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
     List<EpoxyModel<?>> modelsToRemove = getAllModelsAfter(model);
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^^^^ definition local 24
 //                                     display_name modelsToRemove
 //                                     signature_documentation java List<EpoxyModel<?>> modelsToRemove
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
 //                                       ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                                         ^^^^^ reference local 23
     int numModelsRemoved = modelsToRemove.size();
 //      ^^^^^^^^^^^^^^^^ definition local 25
 //                       display_name numModelsRemoved
 //                       signature_documentation java int numModelsRemoved
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
 //                         ^^^^^^^^^^^^^^ reference local 24
 //                                        ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     int initialModelCount = models.size();
 //      ^^^^^^^^^^^^^^^^^ definition local 26
 //                        display_name initialModelCount
 //                        signature_documentation java int initialModelCount
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
 //                          ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -581,9 +608,11 @@ protected void showModel(EpoxyModel<?> model, boolean show) {
 //                                       ^^^^^ definition local 27
 //                                             display_name model
 //                                             signature_documentation java EpoxyModel<?> model
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //                                                      ^^^^ definition local 28
 //                                                           display_name show
 //                                                           signature_documentation java boolean show
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
     if (model.isShown() == show) {
 //      ^^^^^ reference local 27
 //            ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isShown().
@@ -615,6 +644,7 @@ protected void showModel(EpoxyModel<?> model) {
 //                                       ^^^^^ definition local 29
 //                                             display_name model
 //                                             signature_documentation java EpoxyModel<?> model
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
     showModel(model, true);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //            ^^^^^ reference local 29
@@ -635,6 +665,7 @@ protected void showModels(EpoxyModel<?>... models) {
 //                                           ^^^^^^ definition local 30
 //                                                  display_name models
 //                                                  signature_documentation java EpoxyModel<?>[] models
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
     showModels(Arrays.asList(models));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
 //             ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
@@ -658,10 +689,12 @@ protected void showModels(boolean show, EpoxyModel<?>... models) {
 //                                  ^^^^ definition local 31
 //                                       display_name show
 //                                       signature_documentation java boolean show
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
 //                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                         ^^^^^^ definition local 32
 //                                                                display_name models
 //                                                                signature_documentation java EpoxyModel<?>[] models
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
     showModels(Arrays.asList(models), show);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //             ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
@@ -686,6 +719,7 @@ protected void showModels(Iterable<EpoxyModel<?>> models) {
 //                                                  ^^^^^^ definition local 33
 //                                                         display_name models
 //                                                         signature_documentation java Iterable<EpoxyModel<?>> models
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
     showModels(models, true);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //             ^^^^^^ reference local 33
@@ -709,14 +743,17 @@ protected void showModels(Iterable<EpoxyModel<?>> models, boolean show) {
 //                                                  ^^^^^^ definition local 34
 //                                                         display_name models
 //                                                         signature_documentation java Iterable<EpoxyModel<?>> models
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //                                                                  ^^^^ definition local 35
 //                                                                       display_name show
 //                                                                       signature_documentation java boolean show
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
     for (EpoxyModel<?> model : models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 36
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //                             ^^^^^^ reference local 34
       showModel(model, show);
 //    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
@@ -740,6 +777,7 @@ protected void hideModel(EpoxyModel<?> model) {
 //                                       ^^^^^ definition local 37
 //                                             display_name model
 //                                             signature_documentation java EpoxyModel<?> model
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
     showModel(model, false);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //            ^^^^^ reference local 37
@@ -761,6 +799,7 @@ protected void hideModels(Iterable<EpoxyModel<?>> models) {
 //                                                  ^^^^^^ definition local 38
 //                                                         display_name models
 //                                                         signature_documentation java Iterable<EpoxyModel<?>> models
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
     showModels(models, false);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //             ^^^^^^ reference local 38
@@ -781,6 +820,7 @@ protected void hideModels(EpoxyModel<?>... models) {
 //                                           ^^^^^^ definition local 39
 //                                                  display_name models
 //                                                  signature_documentation java EpoxyModel<?>[] models
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
     hideModels(Arrays.asList(models));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //             ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
@@ -803,6 +843,7 @@ protected void hideAllAfterModel(EpoxyModel<?> model) {
 //                                               ^^^^^ definition local 40
 //                                                     display_name model
 //                                                     signature_documentation java EpoxyModel<?> model
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
     hideModels(getAllModelsAfter(model));
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //             ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
@@ -828,10 +869,12 @@ protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //                                                              ^^^^^ definition local 41
 //                                                                    display_name model
 //                                                                    signature_documentation java EpoxyModel<?> model
+//                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
     int index = getModelPosition(model);
 //      ^^^^^ definition local 42
 //            display_name index
 //            signature_documentation java int index
+//            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 41
     if (index == -1) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
index 202f1af87..f776dac82 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
@@ -124,9 +124,11 @@ public static Handler createHandler(Looper looper, boolean async) {
 //                                           ^^^^^^ definition local 0
 //                                                  display_name looper
 //                                                  signature_documentation java unresolved_type looper
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
 //                                                           ^^^^^ definition local 1
 //                                                                 display_name async
 //                                                                 signature_documentation java boolean async
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
     if (!async) {
 //       ^^^^^ reference local 1
       return new Handler(looper);
@@ -168,6 +170,7 @@ public static Handler createHandler(Looper looper, boolean async) {
 //                       ^^^^^^^ definition local 2
 //                               display_name ignored
 //                               signature_documentation java Throwable ignored
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
       }
     }
 
@@ -188,11 +191,13 @@ public static Looper buildBackgroundLooper(String threadName) {
 //                                                  ^^^^^^^^^^ definition local 3
 //                                                             display_name threadName
 //                                                             signature_documentation java String threadName
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#buildBackgroundLooper().
     HandlerThread handlerThread = new HandlerThread(threadName);
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . HandlerThread#
 //                ^^^^^^^^^^^^^ definition local 4
 //                              display_name handlerThread
 //                              signature_documentation java unresolved_type handlerThread
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#buildBackgroundLooper().
 //                                                  ^^^^^^^^^^ reference local 3
     handlerThread.start();
 //  ^^^^^^^^^^^^^ reference local 4
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
index f1f7c983f..a5e1095bc 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
@@ -286,10 +286,12 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //                               ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                    display_name modelBuildingHandler
 //                                                    signature_documentation java unresolved_type modelBuildingHandler
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //                                                     ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                             ^^^^^^^^^^^^^^ definition local 1
 //                                                                            display_name diffingHandler
 //                                                                            signature_documentation java unresolved_type diffingHandler
+//                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
     adapter = new EpoxyControllerAdapter(this, diffingHandler);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
@@ -441,6 +443,7 @@ public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 //                                                               ^^^^^^^^ definition local 2
 //                                                                        display_name listener
 //                                                                        signature_documentation java OnModelBuildFinishedListener listener
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#addModelBuildListener().
     adapter.addModelBuildListener(listener);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#addModelBuildListener().
@@ -461,6 +464,7 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 //                                                                  ^^^^^^^^ definition local 3
 //                                                                           display_name listener
 //                                                                           signature_documentation java OnModelBuildFinishedListener listener
+//                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#removeModelBuildListener().
     adapter.removeModelBuildListener(listener);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#removeModelBuildListener().
@@ -498,6 +502,7 @@ public synchronized void requestDelayedModelBuild(int delayMs) {
 //                                                      ^^^^^^^ definition local 4
 //                                                              display_name delayMs
 //                                                              signature_documentation java int delayMs
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
     if (isBuildingModels()) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
       throw new IllegalEpoxyUsage(
@@ -576,6 +581,7 @@ public void run() {
 //              ^^^ definition local 6
 //                  display_name run
 //                  signature_documentation java @Override\npublic void run()
+//                  enclosing_symbol local 5
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
       // Do this first to mark the controller as being in the model building process.
       threadBuildingModels = Thread.currentThread();
@@ -615,6 +621,7 @@ public void run() {
 //                       ^^^^^^^^^ definition local 7
 //                                 display_name throwable
 //                                 signature_documentation java Throwable throwable
+//                                 enclosing_symbol local 6
         timer.stop();
 //      ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
 //            ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#stop().
@@ -676,6 +683,7 @@ private int getExpectedModelCount() {
 //      ^^^^^^^^^^^^^^^^^ definition local 8
 //                        display_name currentModelCount
 //                        signature_documentation java int currentModelCount
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#getExpectedModelCount().
 //                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
     return currentModelCount != 0 ? currentModelCount : 25;
@@ -715,6 +723,7 @@ int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
 //                                                     ^^^^^ definition local 9
 //                                                           display_name model
 //                                                           signature_documentation java EpoxyModel<?> model
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList().
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
@@ -722,12 +731,14 @@ int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
 //      ^^^^ definition local 10
 //           display_name size
 //           signature_documentation java int size
+//           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList().
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                              ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 11
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList().
 //                  ^ reference local 11
 //                      ^^^^ reference local 10
 //                            ^ reference local 11
@@ -752,6 +763,7 @@ boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
 //                                                ^^^^^ definition local 12
 //                                                      display_name model
 //                                                      signature_documentation java EpoxyModel<?> model
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
@@ -759,16 +771,19 @@ boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
 //      ^^^^^^^^^^ definition local 13
 //                 display_name modelCount
 //                 signature_documentation java int modelCount
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
     int size = modelsBeingBuilt.size();
 //      ^^^^ definition local 14
 //           display_name size
 //           signature_documentation java int size
+//           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                              ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 15
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
 //                  ^ reference local 15
 //                      ^^^^ reference local 14
 //                            ^ reference local 15
@@ -794,6 +809,7 @@ void addAfterInterceptorCallback(ModelInterceptorCallback callback) {
 //                                                          ^^^^^^^^ definition local 16
 //                                                                   display_name callback
 //                                                                   signature_documentation java ModelInterceptorCallback callback
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#addAfterInterceptorCallback().
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
@@ -827,6 +843,7 @@ interface ModelInterceptorCallback {
 //                                             ^^^^^^^^^^ definition local 17
 //                                                        display_name controller
 //                                                        signature_documentation java EpoxyController controller
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
     void onInterceptorsFinished(EpoxyController controller);
 //       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
 //                              display_name onInterceptorsFinished
@@ -835,6 +852,7 @@ interface ModelInterceptorCallback {
 //                                              ^^^^^^^^^^ definition local 18
 //                                                         display_name controller
 //                                                         signature_documentation java EpoxyController controller
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
   }
 
   private void runInterceptors() {
@@ -851,6 +869,7 @@ private void runInterceptors() {
 //                                    ^^^^^^^^ definition local 19
 //                                             display_name callback
 //                                             signature_documentation java ModelInterceptorCallback callback
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
           callback.onInterceptorsStarted(this);
 //        ^^^^^^^^ reference local 19
@@ -867,6 +886,7 @@ private void runInterceptors() {
 //                     ^^^^^^^^^^^ definition local 20
 //                                 display_name interceptor
 //                                 signature_documentation java Interceptor interceptor
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
         interceptor.intercept(modelsBeingBuilt);
 //      ^^^^^^^^^^^ reference local 20
@@ -885,6 +905,7 @@ private void runInterceptors() {
 //                                    ^^^^^^^^ definition local 21
 //                                             display_name callback
 //                                             signature_documentation java ModelInterceptorCallback callback
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
           callback.onInterceptorsFinished(this);
 //        ^^^^^^^^ reference local 21
@@ -927,6 +948,7 @@ public interface Interceptor {
 //                                              ^^^^^^ definition local 22
 //                                                     display_name models
 //                                                     signature_documentation java @NonNull\nList<EpoxyModel<?>> models
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#intercept().
   }
 
   /**
@@ -947,6 +969,7 @@ public void addInterceptor(@NonNull Interceptor interceptor) {
 //                                                ^^^^^^^^^^^ definition local 23
 //                                                            display_name interceptor
 //                                                            signature_documentation java @NonNull\nInterceptor interceptor
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInterceptor().
     interceptors.add(interceptor);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
 //               ^^^ reference semanticdb maven jdk 11 java/util/List#add().
@@ -964,6 +987,7 @@ public void removeInterceptor(@NonNull Interceptor interceptor) {
 //                                                   ^^^^^^^^^^^ definition local 24
 //                                                               display_name interceptor
 //                                                               signature_documentation java @NonNull\nInterceptor interceptor
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#removeInterceptor().
     interceptors.remove(interceptor);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
 //               ^^^^^^ reference semanticdb maven jdk 11 java/util/List#remove().
@@ -1026,6 +1050,7 @@ public void add(@NonNull EpoxyModel<?> model) {
 //                                       ^^^^^ definition local 25
 //                                             display_name model
 //                                             signature_documentation java @NonNull\nEpoxyModel<?> model
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
     model.addTo(this);
 //  ^^^^^ reference local 25
 //        ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addTo().
@@ -1045,6 +1070,7 @@ protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
 //                                             ^^^^^^^^^^^ definition local 26
 //                                                         display_name modelsToAdd
 //                                                         signature_documentation java @NonNull\nEpoxyModel<?>[] modelsToAdd
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+1).
     modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.length);
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#ensureCapacity().
@@ -1058,6 +1084,7 @@ protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
 //                     ^^^^^ definition local 27
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+1).
 //                             ^^^^^^^^^^^ reference local 26
       add(model);
 //    ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
@@ -1080,6 +1107,7 @@ protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
 //                                                          ^^^^^^^^^^^ definition local 28
 //                                                                      display_name modelsToAdd
 //                                                                      signature_documentation java @NonNull\nList<? extends EpoxyModel<?>> modelsToAdd
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+2).
     modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.size());
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#ensureCapacity().
@@ -1093,6 +1121,7 @@ protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
 //                     ^^^^^ definition local 29
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+2).
 //                             ^^^^^^^^^^^ reference local 28
       add(model);
 //    ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
@@ -1113,6 +1142,7 @@ void addInternal(EpoxyModel<?> modelToAdd) {
 //                               ^^^^^^^^^^ definition local 30
 //                                          display_name modelToAdd
 //                                          signature_documentation java EpoxyModel<?> modelToAdd
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInternal().
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 
@@ -1167,6 +1197,7 @@ void setStagedModel(EpoxyModel<?> model) {
 //                                  ^^^^^ definition local 31
 //                                        display_name model
 //                                        signature_documentation java EpoxyModel<?> model
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#setStagedModel().
     if (model != stagedModel) {
 //      ^^^^^ reference local 31
 //               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
@@ -1201,6 +1232,7 @@ void clearModelFromStaging(EpoxyModel<?> model) {
 //                                         ^^^^^ definition local 32
 //                                               display_name model
 //                                               signature_documentation java EpoxyModel<?> model
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#clearModelFromStaging().
     if (stagedModel != model) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
 //                     ^^^^^ reference local 32
@@ -1232,6 +1264,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                                                          ^^^^^^ definition local 33
 //                                                                 display_name models
 //                                                                 signature_documentation java List<EpoxyModel<?>> models
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
     if (!filterDuplicates) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
       return;
@@ -1246,6 +1279,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //            ^^^^^^^^ definition local 34
 //                     display_name modelIds
 //                     signature_documentation java Set<Long> modelIds
+//                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
 //                           ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashSet#`<init>`(+3).
 //                                     ^^^^^^ reference local 33
 //                                            ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -1256,6 +1290,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                              ^^^^^^^^^^^^^ definition local 35
 //                                            display_name modelIterator
 //                                            signature_documentation java ListIterator<EpoxyModel<?>> modelIterator
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
 //                                              ^^^^^^ reference local 33
 //                                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/List#listIterator().
     while (modelIterator.hasNext()) {
@@ -1266,6 +1301,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                  ^^^^^ definition local 36
 //                        display_name model
 //                        signature_documentation java EpoxyModel<?> model
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
 //                          ^^^^^^^^^^^^^ reference local 35
 //                                        ^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#next().
       if (!modelIds.add(model.id())) {
@@ -1277,6 +1313,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //          ^^^^^^^^^^^^^^^^ definition local 37
 //                           display_name indexOfDuplicate
 //                           signature_documentation java int indexOfDuplicate
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
 //                             ^^^^^^^^^^^^^ reference local 35
 //                                           ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         modelIterator.remove();
@@ -1287,6 +1324,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //          ^^^^^^^^^^^^^^^ definition local 38
 //                          display_name indexOfOriginal
 //                          signature_documentation java int indexOfOriginal
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
 //                            ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                                                    ^^^^^^ reference local 33
 //                                                            ^^^^^ reference local 36
@@ -1295,6 +1333,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                    ^^^^^^^^^^^^^ definition local 39
 //                                  display_name originalModel
 //                                  signature_documentation java EpoxyModel<?> originalModel
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
 //                                    ^^^^^^ reference local 33
 //                                           ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                               ^^^^^^^^^^^^^^^ reference local 38
@@ -1334,20 +1373,24 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
 //                                                        ^^^^^^ definition local 40
 //                                                               display_name models
 //                                                               signature_documentation java List<EpoxyModel<?>> models
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                              ^^^^^^^^^^^^^^ definition local 41
 //                                                                                             display_name duplicateModel
 //                                                                                             signature_documentation java EpoxyModel<?> duplicateModel
+//                                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
     int size = models.size();
 //      ^^^^ definition local 42
 //           display_name size
 //           signature_documentation java int size
+//           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //             ^^^^^^ reference local 40
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 43
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                  ^ reference local 43
 //                      ^^^^ reference local 42
 //                            ^ reference local 43
@@ -1356,6 +1399,7 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
 //                  ^^^^^ definition local 44
 //                        display_name model
 //                        signature_documentation java EpoxyModel<?> model
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                          ^^^^^^ reference local 40
 //                                 ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                     ^ reference local 43
@@ -1391,6 +1435,7 @@ public void setFilterDuplicates(boolean filterDuplicates) {
 //                                        ^^^^^^^^^^^^^^^^ definition local 45
 //                                                         display_name filterDuplicates
 //                                                         signature_documentation java boolean filterDuplicates
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#setFilterDuplicates().
     this.filterDuplicates = filterDuplicates;
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
 //                          ^^^^^^^^^^^^^^^^ reference local 45
@@ -1417,6 +1462,7 @@ public static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesBy
 //                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 46
 //                                                                                        display_name filterDuplicatesByDefault
 //                                                                                        signature_documentation java boolean filterDuplicatesByDefault
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalDuplicateFilteringDefault().
     EpoxyController.filterDuplicatesDefault = filterDuplicatesByDefault;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesDefault.
@@ -1442,6 +1488,7 @@ public void setDebugLoggingEnabled(boolean enabled) {
 //                                           ^^^^^^^ definition local 47
 //                                                   display_name enabled
 //                                                   signature_documentation java boolean enabled
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#setDebugLoggingEnabled().
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
 
@@ -1501,6 +1548,7 @@ public static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnable
 //                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 48
 //                                                                                  display_name globalDebugLoggingEnabled
 //                                                                                  signature_documentation java boolean globalDebugLoggingEnabled
+//                                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalDebugLoggingEnabled().
     EpoxyController.globalDebugLoggingEnabled = globalDebugLoggingEnabled;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalDebugLoggingEnabled.
@@ -1533,9 +1581,11 @@ public void moveModel(int fromPosition, int toPosition) {
 //                          ^^^^^^^^^^^^ definition local 49
 //                                       display_name fromPosition
 //                                       signature_documentation java int fromPosition
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                                            ^^^^^^^^^^ definition local 50
 //                                                       display_name toPosition
 //                                                       signature_documentation java int toPosition
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
 
@@ -1566,6 +1616,7 @@ public void notifyModelChanged(int position) {
 //                                   ^^^^^^^^ definition local 51
 //                                            display_name position
 //                                            signature_documentation java int position
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#notifyModelChanged().
     assertNotBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
 
@@ -1601,6 +1652,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
 //                                                ^^^^^^^^ definition local 52
 //                                                         display_name outState
 //                                                         signature_documentation java @NonNull\nunresolved_type outState
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onSaveInstanceState().
     adapter.onSaveInstanceState(outState);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState().
@@ -1616,6 +1668,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
 //                                                    ^^^^^^^ definition local 53
 //                                                            display_name inState
 //                                                            signature_documentation java @Nullable\nunresolved_type inState
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onRestoreInstanceState().
     adapter.onRestoreInstanceState(inState);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onRestoreInstanceState().
@@ -1656,6 +1709,7 @@ public void setSpanCount(int spanCount) {
 //                             ^^^^^^^^^ definition local 54
 //                                       display_name spanCount
 //                                       signature_documentation java int spanCount
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#setSpanCount().
     adapter.setSpanCount(spanCount);
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount().
@@ -1702,6 +1756,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //                                                              ^^^^^^^^^ definition local 55
 //                                                                        display_name exception
 //                                                                        signature_documentation java @NonNull\nRuntimeException exception
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onExceptionSwallowed().
     globalExceptionHandler.onException(this, exception);
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
 //                         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
@@ -1727,18 +1782,21 @@ public void onException(@NonNull EpoxyController controller,
 //                  ^^^^^^^^^^^ definition local 57
 //                              display_name onException
 //                              signature_documentation java @Override\npublic void onException(EpoxyController controller, RuntimeException exception)
+//                              enclosing_symbol local 56
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                       ^^^^^^^^^^ definition local 58
 //                                                                  display_name controller
 //                                                                  signature_documentation java @NonNull\nEpoxyController controller
+//                                                                  enclosing_symbol local 57
             @NonNull RuntimeException exception) {
 //           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                    ^^^^^^^^^ definition local 59
 //                                              display_name exception
 //                                              signature_documentation java @NonNull\nRuntimeException exception
+//                                              enclosing_symbol local 57
           // Ignore exceptions as the default
         }
       };
@@ -1768,6 +1826,7 @@ public static void setGlobalExceptionHandler(
 //                              ^^^^^^^^^^^^^^^^^^^^^^ definition local 60
 //                                                     display_name globalExceptionHandler
 //                                                     signature_documentation java @NonNull\nExceptionHandler globalExceptionHandler
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalExceptionHandler().
     EpoxyController.globalExceptionHandler = globalExceptionHandler;
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
@@ -1797,11 +1856,13 @@ public interface ExceptionHandler {
 //                                            ^^^^^^^^^^ definition local 61
 //                                                       display_name controller
 //                                                       signature_documentation java @NonNull\nEpoxyController controller
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
 //                                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                                                  ^^^^^^^^^ definition local 62
 //                                                                                            display_name exception
 //                                                                                            signature_documentation java @NonNull\nRuntimeException exception
+//                                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
   }
 
   void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
@@ -1812,6 +1873,7 @@ void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
 //                                                   ^^^^^^^^^^^^ definition local 63
 //                                                                display_name recyclerView
 //                                                                signature_documentation java unresolved_type recyclerView
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerViewInternal().
     recyclerViewAttachCount++;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
 
@@ -1829,6 +1891,7 @@ public void run() {
 //                  ^^^ definition local 65
 //                      display_name run
 //                      signature_documentation java @Override\npublic void run()
+//                      enclosing_symbol local 64
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
           // Only warn if there are still multiple adapters attached after a delay, to allow for
           // a grace period
@@ -1866,6 +1929,7 @@ void onDetachedFromRecyclerViewInternal(RecyclerView recyclerView) {
 //                                                     ^^^^^^^^^^^^ definition local 66
 //                                                                  display_name recyclerView
 //                                                                  signature_documentation java unresolved_type recyclerView
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerViewInternal().
     recyclerViewAttachCount--;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
     onDetachedFromRecyclerView(recyclerView);
@@ -1884,6 +1948,7 @@ protected void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 //                                                              ^^^^^^^^^^^^ definition local 67
 //                                                                           display_name recyclerView
 //                                                                           signature_documentation java @NonNull\nunresolved_type recyclerView
+//                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerView().
 
   }
 
@@ -1898,6 +1963,7 @@ protected void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //                                                                ^^^^^^^^^^^^ definition local 68
 //                                                                             display_name recyclerView
 //                                                                             signature_documentation java @NonNull\nunresolved_type recyclerView
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerView().
 
   }
 
@@ -1944,21 +2010,25 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel
 //                                                     ^^^^^^ definition local 69
 //                                                            display_name holder
 //                                                            signature_documentation java @NonNull\nEpoxyViewHolder holder
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
 //                                                              ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^^^^^^ definition local 70
 //                                                                                               display_name boundModel
 //                                                                                               signature_documentation java @NonNull\nEpoxyModel<?> boundModel
+//                                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
       int position,
 //        ^^^^^^^^ definition local 71
 //                 display_name position
 //                 signature_documentation java int position
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
       @Nullable EpoxyModel<?> previouslyBoundModel) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 72
 //                                                 display_name previouslyBoundModel
 //                                                 signature_documentation java @Nullable\nEpoxyModel<?> previouslyBoundModel
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
   }
 
   /**
@@ -1976,11 +2046,13 @@ protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyMod
 //                                                       ^^^^^^ definition local 73
 //                                                              display_name holder
 //                                                              signature_documentation java @NonNull\nEpoxyViewHolder holder
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelUnbound().
 //                                                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                      ^^^^^ definition local 74
 //                                                                                            display_name model
 //                                                                                            signature_documentation java @NonNull\nEpoxyModel<?> model
+//                                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelUnbound().
 
   }
 
@@ -2000,12 +2072,14 @@ protected void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder,
 //                                                               ^^^^^^ definition local 75
 //                                                                      display_name holder
 //                                                                      signature_documentation java @NonNull\nEpoxyViewHolder holder
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewAttachedToWindow().
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 76
 //                                 display_name model
 //                                 signature_documentation java @NonNull\nEpoxyModel<?> model
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewAttachedToWindow().
 
   }
 
@@ -2025,12 +2099,14 @@ protected void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder,
 //                                                                 ^^^^^^ definition local 77
 //                                                                        display_name holder
 //                                                                        signature_documentation java @NonNull\nEpoxyViewHolder holder
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewDetachedFromWindow().
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 78
 //                                 display_name model
 //                                 signature_documentation java @NonNull\nEpoxyModel<?> model
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewDetachedFromWindow().
 
   }
 
@@ -2055,6 +2131,7 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //                                                ^^^^^^^^^^^^ definition local 79
 //                                                             display_name stickyHeader
 //                                                             signature_documentation java @NotNull\nunresolved_type stickyHeader
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#setupStickyHeaderView().
     // no-op
   }
 
@@ -2077,6 +2154,7 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //                                                   ^^^^^^^^^^^^ definition local 80
 //                                                                display_name stickyHeader
 //                                                                signature_documentation java @NotNull\nunresolved_type stickyHeader
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView().
     // no-op
   }
 
@@ -2097,6 +2175,7 @@ public boolean isStickyHeader(int position) {
 //                                  ^^^^^^^^ definition local 81
 //                                           display_name position
 //                                           signature_documentation java int position
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#isStickyHeader().
     return false;
   }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
index c822f2dc9..f2ec538f0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
@@ -102,10 +102,12 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
 //                                                ^^^^^^^^^^^^^^^ definition local 0
 //                                                                display_name epoxyController
 //                                                                signature_documentation java @NonNull\nEpoxyController epoxyController
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
 //                                                                 ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                         ^^^^^^^^^^^^^^ definition local 1
 //                                                                                        display_name diffingHandler
 //                                                                                        signature_documentation java unresolved_type diffingHandler
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
     this.epoxyController = epoxyController;
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                         ^^^^^^^^^^^^^^^ reference local 0
@@ -135,6 +137,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //                                                              ^^^^^^^^^ definition local 2
 //                                                                        display_name exception
 //                                                                        signature_documentation java @NonNull\nRuntimeException exception
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed().
     epoxyController.onExceptionSwallowed(exception);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#onExceptionSwallowed().
@@ -182,6 +185,7 @@ void setModels(@NonNull ControllerModelList models) {
 //                                            ^^^^^^ definition local 3
 //                                                   display_name models
 //                                                   signature_documentation java @NonNull\nControllerModelList models
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
     // If debug model validations are on then we should help detect the error case where models
     // were incorrectly mutated once they were added. That check is also done before and after
     // bind, but there is no other check after that to see if a model is incorrectly
@@ -197,6 +201,7 @@ void setModels(@NonNull ControllerModelList models) {
 //                                ^^^^^^^^^^^^^ definition local 4
 //                                              display_name currentModels
 //                                              signature_documentation java List<? extends EpoxyModel<?>> currentModels
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
 //                                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
     if (!currentModels.isEmpty() && currentModels.get(0).isDebugValidationEnabled()) {
 //       ^^^^^^^^^^^^^ reference local 4
@@ -208,6 +213,7 @@ void setModels(@NonNull ControllerModelList models) {
 //             ^ definition local 5
 //               display_name i
 //               signature_documentation java int i
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
 //                    ^ reference local 5
 //                        ^^^^^^^^^^^^^ reference local 4
 //                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -217,6 +223,7 @@ void setModels(@NonNull ControllerModelList models) {
 //                    ^^^^^ definition local 6
 //                          display_name model
 //                          signature_documentation java EpoxyModel<?> model
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
 //                            ^^^^^^^^^^^^^ reference local 4
 //                                          ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                              ^ reference local 5
@@ -262,6 +269,7 @@ public void onResult(@NonNull DiffResult result) {
 //                                         ^^^^^^ definition local 7
 //                                                display_name result
 //                                                signature_documentation java @NonNull\nDiffResult result
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
     itemCount = result.newModels.size();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#itemCount.
 //              ^^^^^^ reference local 7
@@ -281,6 +289,7 @@ public void onResult(@NonNull DiffResult result) {
 //           ^ definition local 8
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
 //               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                                   ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 //                                               ^ reference local 8
@@ -302,6 +311,7 @@ public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 //                                                               ^^^^^^^^ definition local 9
 //                                                                        display_name listener
 //                                                                        signature_documentation java OnModelBuildFinishedListener listener
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#addModelBuildListener().
     modelBuildListeners.add(listener);
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                      ^^^ reference semanticdb maven jdk 11 java/util/List#add().
@@ -316,6 +326,7 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 //                                                                  ^^^^^^^^ definition local 10
 //                                                                           display_name listener
 //                                                                           signature_documentation java OnModelBuildFinishedListener listener
+//                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#removeModelBuildListener().
     modelBuildListeners.remove(listener);
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/List#remove().
@@ -343,6 +354,7 @@ public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 //                                                           ^^^^^^^^^^^^ definition local 11
 //                                                                        display_name recyclerView
 //                                                                        signature_documentation java @NonNull\nunresolved_type recyclerView
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onAttachedToRecyclerView().
     super.onAttachedToRecyclerView(recyclerView);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onAttachedToRecyclerView#
@@ -365,6 +377,7 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //                                                             ^^^^^^^^^^^^ definition local 12
 //                                                                          display_name recyclerView
 //                                                                          signature_documentation java @NonNull\nunresolved_type recyclerView
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView().
     super.onDetachedFromRecyclerView(recyclerView);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
@@ -387,6 +400,7 @@ public void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder) {
 //                                                            ^^^^^^ definition local 13
 //                                                                   display_name holder
 //                                                                   signature_documentation java @NonNull\nEpoxyViewHolder holder
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow().
     super.onViewAttachedToWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
@@ -411,6 +425,7 @@ public void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder) {
 //                                                              ^^^^^^ definition local 14
 //                                                                     display_name holder
 //                                                                     signature_documentation java @NonNull\nEpoxyViewHolder holder
+//                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow().
     super.onViewDetachedFromWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
@@ -435,20 +450,24 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel
 //                                                     ^^^^^^ definition local 15
 //                                                            display_name holder
 //                                                            signature_documentation java @NonNull\nEpoxyViewHolder holder
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
 //                                                              ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                    ^^^^^ definition local 16
 //                                                                                          display_name model
 //                                                                                          signature_documentation java @NonNull\nEpoxyModel<?> model
+//                                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
       int position, @Nullable EpoxyModel<?> previouslyBoundModel) {
 //        ^^^^^^^^ definition local 17
 //                 display_name position
 //                 signature_documentation java int position
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
 //                   ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 18
 //                                                               display_name previouslyBoundModel
 //                                                               signature_documentation java @Nullable\nEpoxyModel<?> previouslyBoundModel
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
     epoxyController.onModelBound(holder, model, position, previouslyBoundModel);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
@@ -470,11 +489,13 @@ protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyMod
 //                                                       ^^^^^^ definition local 19
 //                                                              display_name holder
 //                                                              signature_documentation java @NonNull\nEpoxyViewHolder holder
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound().
 //                                                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                      ^^^^^ definition local 20
 //                                                                                            display_name model
 //                                                                                            signature_documentation java @NonNull\nEpoxyModel<?> model
+//                                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound().
     epoxyController.onModelUnbound(holder, model);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelUnbound().
@@ -514,6 +535,7 @@ public EpoxyModel<?> getModelAtPosition(int position) {
 //                                            ^^^^^^^^ definition local 21
 //                                                     display_name position
 //                                                     signature_documentation java int position
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelAtPosition().
     return getCurrentModels().get(position);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                            ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -535,11 +557,13 @@ public EpoxyModel<?> getModelById(long id) {
 //                                       ^^ definition local 22
 //                                          display_name id
 //                                          signature_documentation java long id
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelById().
     for (EpoxyModel<?> model : getCurrentModels()) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 23
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelById().
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
       if (model.id() == id) {
 //        ^^^^^ reference local 23
@@ -565,16 +589,19 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //                                                   ^^^^^^^^^^^ definition local 24
 //                                                               display_name targetModel
 //                                                               signature_documentation java @NonNull\nEpoxyModel<?> targetModel
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
     int size = getCurrentModels().size();
 //      ^^^^ definition local 25
 //           display_name size
 //           signature_documentation java int size
+//           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
 //           ^ definition local 26
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
 //                  ^ reference local 26
 //                      ^^^^ reference local 25
 //                            ^ reference local 26
@@ -583,6 +610,7 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //                  ^^^^^ definition local 27
 //                        display_name model
 //                        signature_documentation java EpoxyModel<?> model
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                             ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                                 ^ reference local 26
@@ -623,15 +651,18 @@ void moveModel(int fromPosition, int toPosition) {
 //                   ^^^^^^^^^^^^ definition local 28
 //                                display_name fromPosition
 //                                signature_documentation java int fromPosition
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
 //                                     ^^^^^^^^^^ definition local 29
 //                                                display_name toPosition
 //                                                signature_documentation java int toPosition
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
     ArrayList<EpoxyModel<?>> updatedList = new ArrayList<>(getCurrentModels());
 //  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^ definition local 30
 //                                       display_name updatedList
 //                                       signature_documentation java ArrayList<EpoxyModel<?>> updatedList
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
 //                                             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+2).
 //                                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 
@@ -657,6 +688,7 @@ void moveModel(int fromPosition, int toPosition) {
 //          ^^^^^^^^^^^^^^^ definition local 31
 //                          display_name interruptedDiff
 //                          signature_documentation java boolean interruptedDiff
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
 //                            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                                     ^^^^^^^^^^^ reference local 30
@@ -680,12 +712,14 @@ void notifyModelChanged(int position) {
 //                            ^^^^^^^^ definition local 32
 //                                     display_name position
 //                                     signature_documentation java int position
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged().
     ArrayList<EpoxyModel<?>> updatedList = new ArrayList<>(getCurrentModels());
 //  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
 //            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^^^^^^^ definition local 33
 //                                       display_name updatedList
 //                                       signature_documentation java ArrayList<EpoxyModel<?>> updatedList
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged().
 //                                             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+2).
 //                                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 
@@ -703,6 +737,7 @@ void notifyModelChanged(int position) {
 //          ^^^^^^^^^^^^^^^ definition local 34
 //                          display_name interruptedDiff
 //                          signature_documentation java boolean interruptedDiff
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged().
 //                            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                                     ^^^^^^^^^^^ reference local 33
@@ -757,6 +792,7 @@ public boolean isStickyHeader(int position) {
 //                                  ^^^^^^^^ definition local 35
 //                                           display_name position
 //                                           signature_documentation java int position
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader().
     return epoxyController.isStickyHeader(position);
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                         ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isStickyHeader().
@@ -780,6 +816,7 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //                                                ^^^^^^^^^^^^ definition local 36
 //                                                             display_name stickyHeader
 //                                                             signature_documentation java @NotNull\nunresolved_type stickyHeader
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView().
     epoxyController.setupStickyHeaderView(stickyHeader);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#setupStickyHeaderView().
@@ -803,6 +840,7 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //                                                   ^^^^^^^^^^^^ definition local 37
 //                                                                display_name stickyHeader
 //                                                                signature_documentation java @NotNull\nunresolved_type stickyHeader
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView().
     epoxyController.teardownStickyHeaderView(stickyHeader);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
index c906df1dd..51d042c4d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
@@ -48,6 +48,7 @@ public EpoxyDiffLogger(String tag) {
 //                              ^^^ definition local 0
 //                                  display_name tag
 //                                  signature_documentation java String tag
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#`<init>`().
     this.tag = tag;
 //       ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#tag.
 //             ^^^ reference local 0
@@ -62,9 +63,11 @@ public void onItemRangeChanged(int positionStart, int itemCount) {
 //                                   ^^^^^^^^^^^^^ definition local 1
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged().
 //                                                      ^^^^^^^^^ definition local 2
 //                                                                display_name itemCount
 //                                                                signature_documentation java int itemCount
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged().
     Log.d(tag, "Item range changed. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
 //      ^ reference semanticdb maven . . Log#d#
@@ -82,14 +85,17 @@ public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Objec
 //                                   ^^^^^^^^^^^^^ definition local 3
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(+1).
 //                                                      ^^^^^^^^^ definition local 4
 //                                                                display_name itemCount
 //                                                                signature_documentation java int itemCount
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(+1).
 //                                                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                  ^^^^^^^ definition local 5
 //                                                                                          display_name payload
 //                                                                                          signature_documentation java @Nullable\nObject payload
+//                                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(+1).
     if (payload == null) {
 //      ^^^^^^^ reference local 5
       onItemRangeChanged(positionStart, itemCount);
@@ -116,9 +122,11 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 //                                    ^^^^^^^^^^^^^ definition local 6
 //                                                  display_name positionStart
 //                                                  signature_documentation java int positionStart
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeInserted().
 //                                                       ^^^^^^^^^ definition local 7
 //                                                                 display_name itemCount
 //                                                                 signature_documentation java int itemCount
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeInserted().
     Log.d(tag, "Item range inserted. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
 //      ^ reference semanticdb maven . . Log#d#
@@ -136,9 +144,11 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 //                                   ^^^^^^^^^^^^^ definition local 8
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeRemoved().
 //                                                      ^^^^^^^^^ definition local 9
 //                                                                display_name itemCount
 //                                                                signature_documentation java int itemCount
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeRemoved().
     Log.d(tag, "Item range removed. Start: " + positionStart + " Count: " + itemCount);
 //  ^^^ reference semanticdb maven . . Log#
 //      ^ reference semanticdb maven . . Log#d#
@@ -156,12 +166,15 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 //                                 ^^^^^^^^^^^^ definition local 10
 //                                              display_name fromPosition
 //                                              signature_documentation java int fromPosition
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeMoved().
 //                                                   ^^^^^^^^^^ definition local 11
 //                                                              display_name toPosition
 //                                                              signature_documentation java int toPosition
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeMoved().
 //                                                                   ^^^^^^^^^ definition local 12
 //                                                                             display_name itemCount
 //                                                                             signature_documentation java int itemCount
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeMoved().
     Log.d(tag, "Item moved. From: " + fromPosition + " To: " + toPosition);
 //  ^^^ reference semanticdb maven . . Log#
 //      ^ reference semanticdb maven . . Log#d#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
index e7ee890d3..fa57a7348 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
@@ -43,13 +43,16 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
 //                     ^^^^^ definition local 0
 //                           display_name model
 //                           signature_documentation java T model
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                            ^^^^ reference semanticdb maven . . View#
 //                                 ^^^^^^^^ definition local 1
 //                                          display_name itemView
 //                                          signature_documentation java unresolved_type itemView
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                                               ^^^^^^^^^^^^^^^ definition local 2
 //                                                               display_name adapterPosition
 //                                                               signature_documentation java int adapterPosition
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 
   /**
    * Called after {@link #onDragStarted(EpoxyModel, View, int)} when the dragged view is dropped to
@@ -75,17 +78,21 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
 //                      ^^^^^^^^^^^^ definition local 3
 //                                   display_name fromPosition
 //                                   signature_documentation java int fromPosition
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                        ^^^^^^^^^^ definition local 4
 //                                                   display_name toPosition
 //                                                   signature_documentation java int toPosition
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                                                      ^^^^^^^^^^^^^^^ definition local 5
 //                                                                      display_name modelBeingMoved
 //                                                                      signature_documentation java T modelBeingMoved
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                                                       ^^^^ reference semanticdb maven . . View#
 //                                                                            ^^^^^^^^ definition local 6
 //                                                                                     display_name itemView
 //                                                                                     signature_documentation java unresolved_type itemView
+//                                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 
   /**
    * Called after {@link #onDragStarted(EpoxyModel, View, int)} when the view being dragged is
@@ -112,8 +119,10 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
 //                      ^^^^^ definition local 7
 //                            display_name model
 //                            signature_documentation java T model
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                             ^^^^ reference semanticdb maven . . View#
 //                                  ^^^^^^^^ definition local 8
 //                                           display_name itemView
 //                                           signature_documentation java unresolved_type itemView
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
index 32f1ca307..d772cd2cc 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
@@ -33,6 +33,7 @@ public EpoxyHolder(@NonNull ViewParent parent) {
 //                                       ^^^^^^ definition local 0
 //                                              display_name parent
 //                                              signature_documentation java @NonNull\nunresolved_type parent
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`().
     this();
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`(+1).
   }
@@ -61,4 +62,5 @@ public EpoxyHolder() {
 //                                               ^^^^^^^^ definition local 1
 //                                                        display_name itemView
 //                                                        signature_documentation java @NonNull\nunresolved_type itemView
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#bindView().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
index e1dd85d11..f539d4773 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
@@ -122,6 +122,7 @@ public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) {
 //                                         ^^^^^^^^^^^^^^ definition local 0
 //                                                        display_name pxBetweenItems
 //                                                        signature_documentation java @Px\nint pxBetweenItems
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`(+1).
     setPxBetweenItems(pxBetweenItems);
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems().
 //                    ^^^^^^^^^^^^^^ reference local 0
@@ -135,6 +136,7 @@ public void setPxBetweenItems(@Px int pxBetweenItems) {
 //                                      ^^^^^^^^^^^^^^ definition local 1
 //                                                     display_name pxBetweenItems
 //                                                     signature_documentation java @Px\nint pxBetweenItems
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems().
     this.pxBetweenItems = pxBetweenItems;
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
 //                        ^^^^^^^^^^^^^^ reference local 1
@@ -160,18 +162,22 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //                                ^^^^^^^ definition local 2
 //                                        display_name outRect
 //                                        signature_documentation java unresolved_type outRect
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^ definition local 3
 //                                                   display_name view
 //                                                   signature_documentation java unresolved_type view
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                                                    ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                 ^^^^^^ definition local 4
 //                                                                        display_name parent
 //                                                                        signature_documentation java unresolved_type parent
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                                                                         ^^^^^ reference semanticdb maven . . State#
 //                                                                               ^^^^^ definition local 5
 //                                                                                     display_name state
 //                                                                                     signature_documentation java unresolved_type state
+//                                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
     // Zero everything out for the common case
     outRect.setEmpty();
 //  ^^^^^^^ reference local 2
@@ -181,6 +187,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //      ^^^^^^^^ definition local 6
 //               display_name position
 //               signature_documentation java int position
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                 ^^^^^^ reference local 4
 //                        ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getChildAdapterPosition#
 //                                                ^^^^ reference local 3
@@ -198,6 +205,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //                             ^^^^^^ definition local 7
 //                                    display_name layout
 //                                    signature_documentation java unresolved_type layout
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                                      ^^^^^^ reference local 4
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getLayoutManager#
     calculatePositionDetails(parent, position, layout);
@@ -210,21 +218,25 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //          ^^^^ definition local 8
 //               display_name left
 //               signature_documentation java boolean left
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                 ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useLeftPadding().
     boolean right = useRightPadding();
 //          ^^^^^ definition local 9
 //                display_name right
 //                signature_documentation java boolean right
+//                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useRightPadding().
     boolean top = useTopPadding();
 //          ^^^ definition local 10
 //              display_name top
 //              signature_documentation java boolean top
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useTopPadding().
     boolean bottom = useBottomPadding();
 //          ^^^^^^ definition local 11
 //                 display_name bottom
 //                 signature_documentation java boolean bottom
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useBottomPadding().
 
     if (shouldReverseLayout(layout, horizontallyScrolling)) {
@@ -237,6 +249,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //              ^^^^ definition local 12
 //                   display_name temp
 //                   signature_documentation java boolean temp
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                     ^^^^ reference local 8
         left = right;
 //      ^^^^ reference local 8
@@ -249,6 +262,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //              ^^^^ definition local 13
 //                   display_name temp
 //                   signature_documentation java boolean temp
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                     ^^^ reference local 10
         top = bottom;
 //      ^^^ reference local 10
@@ -265,6 +279,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //      ^^^^^^^ definition local 14
 //              display_name padding
 //              signature_documentation java int padding
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
     outRect.right = right ? padding : 0;
 //  ^^^^^^^ reference local 2
@@ -296,17 +311,21 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                                                   ^^^^^^ definition local 15
 //                                                          display_name parent
 //                                                          signature_documentation java unresolved_type parent
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                                                               ^^^^^^^^ definition local 16
 //                                                                        display_name position
 //                                                                        signature_documentation java int position
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                                                                         ^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#
 //                                                                                       ^^^^^^ definition local 17
 //                                                                                              display_name layout
 //                                                                                              signature_documentation java unresolved_type layout
+//                                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
     int itemCount = parent.getAdapter().getItemCount();
 //      ^^^^^^^^^ definition local 18
 //                display_name itemCount
 //                signature_documentation java int itemCount
+//                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                  ^^^^^^ reference local 15
 //                         ^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getAdapter#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getAdapter#getItemCount#
@@ -337,6 +356,7 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                      ^^^^ definition local 19
 //                           display_name grid
 //                           signature_documentation java unresolved_type grid
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#
 //                                                 ^^^^^^ reference local 17
       final SpanSizeLookup spanSizeLookup = grid.getSpanSizeLookup();
@@ -344,12 +364,14 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                         ^^^^^^^^^^^^^^ definition local 20
 //                                        display_name spanSizeLookup
 //                                        signature_documentation java final unresolved_type spanSizeLookup
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                                          ^^^^ reference local 19
 //                                               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#getSpanSizeLookup#
       int spanSize = spanSizeLookup.getSpanSize(position);
 //        ^^^^^^^^ definition local 21
 //                 display_name spanSize
 //                 signature_documentation java int spanSize
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                   ^^^^^^^^^^^^^^ reference local 20
 //                                  ^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#getSpanSize#
 //                                              ^^^^^^^^ reference local 16
@@ -357,12 +379,14 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //        ^^^^^^^^^ definition local 22
 //                  display_name spanCount
 //                  signature_documentation java int spanCount
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                    ^^^^ reference local 19
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#getSpanCount#
       int spanIndex = spanSizeLookup.getSpanIndex(position, spanCount);
 //        ^^^^^^^^^ definition local 23
 //                  display_name spanIndex
 //                  signature_documentation java int spanIndex
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                    ^^^^^^^^^^^^^^ reference local 20
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#getSpanIndex#
 //                                                ^^^^^^^^ reference local 16
@@ -401,13 +425,16 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
 //                                                         ^^^^^^ definition local 24
 //                                                                display_name layout
 //                                                                signature_documentation java unresolved_type layout
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
 //                                                                         ^^^^^^^^^^^^^^^^^^^^^ definition local 25
 //                                                                                               display_name horizontallyScrolling
 //                                                                                               signature_documentation java boolean horizontallyScrolling
+//                                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
     boolean reverseLayout =
 //          ^^^^^^^^^^^^^ definition local 26
 //                        display_name reverseLayout
 //                        signature_documentation java boolean reverseLayout
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
         layout instanceof LinearLayoutManager && ((LinearLayoutManager) layout).getReverseLayout();
 //      ^^^^^^ reference local 24
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . LinearLayoutManager#
@@ -418,6 +445,7 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
 //          ^^^ definition local 27
 //              display_name rtl
 //              signature_documentation java boolean rtl
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
 //                ^^^^^^ reference local 24
 //                       ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#getLayoutDirection#
 //                                               ^^^^^^^^^^ reference semanticdb maven . . ViewCompat#
@@ -518,21 +546,26 @@ private static boolean isInFirstRow(int position, SpanSizeLookup spanSizeLookup,
 //                                        ^^^^^^^^ definition local 28
 //                                                 display_name position
 //                                                 signature_documentation java int position
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
 //                                                  ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                                                                 ^^^^^^^^^^^^^^ definition local 29
 //                                                                                display_name spanSizeLookup
 //                                                                                signature_documentation java unresolved_type spanSizeLookup
+//                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
 //                                                                                     ^^^^^^^^^ definition local 30
 //                                                                                               display_name spanCount
 //                                                                                               signature_documentation java int spanCount
+//                                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
     int totalSpan = 0;
 //      ^^^^^^^^^ definition local 31
 //                display_name totalSpan
 //                signature_documentation java int totalSpan
+//                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
     for (int i = 0; i <= position; i++) {
 //           ^ definition local 32
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
 //                  ^ reference local 32
 //                       ^^^^^^^^ reference local 28
 //                                 ^ reference local 32
@@ -558,25 +591,31 @@ private static boolean isInLastRow(int position, int itemCount, SpanSizeLookup s
 //                                       ^^^^^^^^ definition local 33
 //                                                display_name position
 //                                                signature_documentation java int position
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
 //                                                     ^^^^^^^^^ definition local 34
 //                                                               display_name itemCount
 //                                                               signature_documentation java int itemCount
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
 //                                                                ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 //                                                                               ^^^^^^^^^^^^^^ definition local 35
 //                                                                                              display_name spanSizeLookup
 //                                                                                              signature_documentation java unresolved_type spanSizeLookup
+//                                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
       int spanCount) {
 //        ^^^^^^^^^ definition local 36
 //                  display_name spanCount
 //                  signature_documentation java int spanCount
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
     int totalSpan = 0;
 //      ^^^^^^^^^ definition local 37
 //                display_name totalSpan
 //                signature_documentation java int totalSpan
+//                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
     for (int i = itemCount - 1; i >= position; i--) {
 //           ^ definition local 38
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
 //               ^^^^^^^^^ reference local 34
 //                              ^ reference local 38
 //                                   ^^^^^^^^ reference local 33
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
index 385013b0b..95005f894 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
@@ -166,6 +166,7 @@ protected EpoxyModel(long id) {
 //                          ^^ definition local 0
 //                             display_name id
 //                             signature_documentation java long id
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
     id(id);
 //  ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
 //     ^^ reference local 0
@@ -224,6 +225,7 @@ protected View buildView(@NonNull ViewGroup parent) {
 //                                            ^^^^^^ definition local 1
 //                                                   display_name parent
 //                                                   signature_documentation java @NonNull\nunresolved_type parent
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
     return LayoutInflater.from(parent.getContext()).inflate(getLayout(), parent, false);
 //         ^^^^^^^^^^^^^^ reference semanticdb maven . . LayoutInflater#
 //                        ^^^^ reference semanticdb maven . . LayoutInflater#from#
@@ -251,6 +253,7 @@ public void bind(@NonNull T view) {
 //                            ^^^^ definition local 2
 //                                 display_name view
 //                                 signature_documentation java @NonNull\nT view
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 
   }
 
@@ -274,12 +277,14 @@ public void bind(@NonNull T view, @NonNull List<Object> payloads) {
 //                            ^^^^ definition local 3
 //                                 display_name view
 //                                 signature_documentation java @NonNull\nT view
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                           ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                        ^^^^^^^^ definition local 4
 //                                                                 display_name payloads
 //                                                                 signature_documentation java @NonNull\nList<Object> payloads
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
     bind(view);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //       ^^^^ reference local 3
@@ -328,11 +333,13 @@ public void bind(@NonNull T view, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //                            ^^^^ definition local 5
 //                                 display_name view
 //                                 signature_documentation java @NonNull\nT view
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                         ^^^^^^^^^^^^^^^^^^^^ definition local 6
 //                                                                              display_name previouslyBoundModel
 //                                                                              signature_documentation java @NonNull\nEpoxyModel<?> previouslyBoundModel
+//                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
     bind(view);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //       ^^^^ reference local 5
@@ -361,6 +368,7 @@ public void unbind(@NonNull T view) {
 //                              ^^^^ definition local 7
 //                                   display_name view
 //                                   signature_documentation java @NonNull\nT view
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
   }
 
   /**
@@ -378,11 +386,13 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T
 //                                                     ^^^^^^^^^^^^^^^ definition local 8
 //                                                                     display_name visibilityState
 //                                                                     signature_documentation java @Visibility\nint visibilityState
+//                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
 //                                                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                                                                 ^^^^ definition local 9
 //                                                                                      display_name view
 //                                                                                      signature_documentation java @NonNull\nT view
+//                                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
   }
 
   /**
@@ -403,6 +413,7 @@ public void onVisibilityChanged(
 //                                                ^^^^^^^^^^^^^^^^^^^^ definition local 10
 //                                                                     display_name percentVisibleHeight
 //                                                                     signature_documentation java @FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleHeight
+//                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
@@ -410,22 +421,26 @@ public void onVisibilityChanged(
 //                                                ^^^^^^^^^^^^^^^^^^^ definition local 11
 //                                                                    display_name percentVisibleWidth
 //                                                                    signature_documentation java @FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleWidth
+//                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
       @Px int visibleHeight,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 12
 //                          display_name visibleHeight
 //                          signature_documentation java @Px\nint visibleHeight
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
       @Px int visibleWidth,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^ definition local 13
 //                         display_name visibleWidth
 //                         signature_documentation java @Px\nint visibleWidth
+//                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
       @NonNull T view
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //               ^^^^ definition local 14
 //                    display_name view
 //                    signature_documentation java @NonNull\nT view
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
   ) {
   }
 
@@ -452,6 +467,7 @@ public EpoxyModel<T> id(long id) {
 //                             ^^ definition local 15
 //                                display_name id
 //                                signature_documentation java long id
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
     if ((addedToAdapter || firstControllerAddedTo != null) && id != this.id) {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addedToAdapter.
 //                         ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo.
@@ -488,10 +504,12 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //                                            ^^^ definition local 16
 //                                                display_name ids
 //                                                signature_documentation java @Nullable\nNumber[] ids
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+2).
     long result = 0;
 //       ^^^^^^ definition local 17
 //              display_name result
 //              signature_documentation java long result
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+2).
     if (ids != null) {
 //      ^^^ reference local 16
       for (@Nullable Number id : ids) {
@@ -500,6 +518,7 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //                          ^^ definition local 18
 //                             display_name id
 //                             signature_documentation java @Nullable\nNumber id
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+2).
 //                               ^^^ reference local 16
         result = 31 * result + hashLong64Bit(id == null ? 0 : id.hashCode());
 //      ^^^^^^ reference local 17
@@ -531,13 +550,16 @@ public EpoxyModel<T> id(long id1, long id2) {
 //                             ^^^ definition local 19
 //                                 display_name id1
 //                                 signature_documentation java long id1
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+3).
 //                                       ^^^ definition local 20
 //                                           display_name id2
 //                                           signature_documentation java long id2
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+3).
     long result = hashLong64Bit(id1);
 //       ^^^^^^ definition local 21
 //              display_name result
 //              signature_documentation java long result
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+3).
 //                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashLong64Bit().
 //                              ^^^ reference local 19
     result = 31 * result + hashLong64Bit(id2);
@@ -574,6 +596,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key) {
 //                                               ^^^ definition local 22
 //                                                   display_name key
 //                                                   signature_documentation java @Nullable\nCharSequence key
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+4).
     id(hashString64Bit(key));
 //  ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
 //     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
@@ -598,15 +621,18 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
 //                                               ^^^ definition local 23
 //                                                   display_name key
 //                                                   signature_documentation java @Nullable\nCharSequence key
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
 //                                                     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                                              ^^^^^^^^^ definition local 24
 //                                                                                        display_name otherKeys
 //                                                                                        signature_documentation java @Nullable\nCharSequence[] otherKeys
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
     long result = hashString64Bit(key);
 //       ^^^^^^ definition local 25
 //              display_name result
 //              signature_documentation java long result
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                ^^^ reference local 23
     if (otherKeys != null) {
@@ -616,6 +642,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
 //                      ^^^^^^^^ definition local 26
 //                               display_name otherKey
 //                               signature_documentation java CharSequence otherKey
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
 //                                 ^^^^^^^^^ reference local 24
         result = 31 * result + hashString64Bit(otherKey);
 //      ^^^^^^ reference local 25
@@ -653,13 +680,16 @@ public EpoxyModel<T> id(@Nullable CharSequence key, long id) {
 //                                               ^^^ definition local 27
 //                                                   display_name key
 //                                                   signature_documentation java @Nullable\nCharSequence key
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+6).
 //                                                         ^^ definition local 28
 //                                                            display_name id
 //                                                            signature_documentation java long id
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+6).
     long result = hashString64Bit(key);
 //       ^^^^^^ definition local 29
 //              display_name result
 //              signature_documentation java long result
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+6).
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                ^^^ reference local 27
     result = 31 * result + hashLong64Bit(id);
@@ -709,6 +739,7 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 //                                           ^^^^^^^^^ definition local 30
 //                                                     display_name layoutRes
 //                                                     signature_documentation java @LayoutRes\nint layoutRes
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout().
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
     layout = layoutRes;
@@ -770,6 +801,7 @@ public void addTo(@NonNull EpoxyController controller) {
 //                                           ^^^^^^^^^^ definition local 31
 //                                                      display_name controller
 //                                                      signature_documentation java @NonNull\nEpoxyController controller
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addTo().
     controller.addInternal(this);
 //  ^^^^^^^^^^ reference local 31
 //             ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInternal().
@@ -787,11 +819,13 @@ public void addIf(boolean condition, @NonNull EpoxyController controller) {
 //                          ^^^^^^^^^ definition local 32
 //                                    display_name condition
 //                                    signature_documentation java boolean condition
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                              ^^^^^^^^^^ definition local 33
 //                                                                         display_name controller
 //                                                                         signature_documentation java @NonNull\nEpoxyController controller
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf().
     if (condition) {
 //      ^^^^^^^^^ reference local 32
       addTo(controller);
@@ -824,11 +858,13 @@ public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController cont
 //                                        ^^^^^^^^^ definition local 34
 //                                                  display_name predicate
 //                                                  signature_documentation java @NonNull\nAddPredicate predicate
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf(+1).
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                                            ^^^^^^^^^^ definition local 35
 //                                                                                       display_name controller
 //                                                                                       signature_documentation java @NonNull\nEpoxyController controller
+//                                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf(+1).
     addIf(predicate.addIf(), controller);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf().
 //        ^^^^^^^^^ reference local 34
@@ -864,6 +900,7 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller)
 //                                                                     ^^^^^^^^^^ definition local 36
 //                                                                                display_name controller
 //                                                                                signature_documentation java @NonNull\nEpoxyController controller
+//                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addWithDebugValidation().
     if (controller == null) {
 //      ^^^^^^^^^^ reference local 36
       throw new IllegalArgumentException("Controller cannot be null");
@@ -907,11 +944,13 @@ public void onInterceptorsStarted(EpoxyController controller) {
 //                  ^^^^^^^^^^^^^^^^^^^^^ definition local 38
 //                                        display_name onInterceptorsStarted
 //                                        signature_documentation java @Override\npublic void onInterceptorsStarted(EpoxyController controller)
+//                                        enclosing_symbol local 37
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                        ^^^^^^^^^^ definition local 39
 //                                                                   display_name controller
 //                                                                   signature_documentation java EpoxyController controller
+//                                                                   enclosing_symbol local 38
           currentlyInInterceptors = true;
 //        ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#currentlyInInterceptors.
         }
@@ -922,11 +961,13 @@ public void onInterceptorsFinished(EpoxyController controller) {
 //                  ^^^^^^^^^^^^^^^^^^^^^^ definition local 40
 //                                         display_name onInterceptorsFinished
 //                                         signature_documentation java @Override\npublic void onInterceptorsFinished(EpoxyController controller)
+//                                         enclosing_symbol local 37
 //                                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                         ^^^^^^^^^^ definition local 41
 //                                                                    display_name controller
 //                                                                    signature_documentation java EpoxyController controller
+//                                                                    enclosing_symbol local 40
           hashCodeWhenAdded = EpoxyModel.this.hashCode();
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCodeWhenAdded.
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -992,12 +1033,14 @@ private static int getPosition(@NonNull EpoxyController controller,
 //                                                        ^^^^^^^^^^ definition local 42
 //                                                                   display_name controller
 //                                                                   signature_documentation java @NonNull\nEpoxyController controller
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getPosition().
       @NonNull EpoxyModel<?> model) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           ^^^^^ definition local 43
 //                                 display_name model
 //                                 signature_documentation java @NonNull\nEpoxyModel<?> model
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getPosition().
     // If the model was added to multiple controllers, or was removed from the controller and then
     // modified, this won't be correct. But those should be very rare cases that we don't need to
     // worry about
@@ -1035,10 +1078,12 @@ protected final void validateStateHasNotChangedSinceAdded(String descriptionOfCh
 //                                                                 ^^^^^^^^^^^^^^^^^^^ definition local 44
 //                                                                                     display_name descriptionOfChange
 //                                                                                     signature_documentation java String descriptionOfChange
+//                                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#validateStateHasNotChangedSinceAdded().
       int modelPosition) {
 //        ^^^^^^^^^^^^^ definition local 45
 //                      display_name modelPosition
 //                      signature_documentation java int modelPosition
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#validateStateHasNotChangedSinceAdded().
     if (isDebugValidationEnabled()
 //      ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isDebugValidationEnabled().
         && !currentlyInInterceptors
@@ -1066,6 +1111,7 @@ public boolean equals(Object o) {
 //                             ^ definition local 46
 //                               display_name o
 //                               signature_documentation java Object o
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
     if (this == o) {
 //              ^ reference local 46
       return true;
@@ -1081,6 +1127,7 @@ public boolean equals(Object o) {
 //                ^^^^ definition local 47
 //                     display_name that
 //                     signature_documentation java EpoxyModel<?> that
+//                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^ reference local 46
 
@@ -1115,6 +1162,7 @@ public int hashCode() {
 //      ^^^^^^ definition local 48
 //             display_name result
 //             signature_documentation java int result
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                      ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
 //                            ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
     result = 31 * result + getViewType();
@@ -1148,12 +1196,15 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //                           ^^^^^^^^^^^^^^ definition local 49
 //                                          display_name totalSpanCount
 //                                          signature_documentation java int totalSpanCount
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                                               ^^^^^^^^ definition local 50
 //                                                        display_name position
 //                                                        signature_documentation java int position
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                                                             ^^^^^^^^^ definition local 51
 //                                                                       display_name itemCount
 //                                                                       signature_documentation java int itemCount
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
     return 1;
   }
 
@@ -1168,6 +1219,7 @@ public EpoxyModel<T> spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz
 //                                                                         ^^^^^^^^^^^^^^^^ definition local 52
 //                                                                                          display_name spanSizeCallback
 //                                                                                          signature_documentation java @Nullable\nSpanSizeOverrideCallback spanSizeCallback
+//                                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride().
     this.spanSizeOverride = spanSizeCallback;
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
 //                          ^^^^^^^^^^^^^^^^ reference local 52
@@ -1185,12 +1237,15 @@ public interface SpanSizeOverrideCallback {
 //                      ^^^^^^^^^^^^^^ definition local 53
 //                                     display_name totalSpanCount
 //                                     signature_documentation java int totalSpanCount
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize().
 //                                          ^^^^^^^^ definition local 54
 //                                                   display_name position
 //                                                   signature_documentation java int position
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize().
 //                                                        ^^^^^^^^^ definition local 55
 //                                                                  display_name itemCount
 //                                                                  signature_documentation java int itemCount
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize().
   }
 
   /**
@@ -1205,12 +1260,15 @@ public final int spanSize(int totalSpanCount, int position, int itemCount) {
 //                              ^^^^^^^^^^^^^^ definition local 56
 //                                             display_name totalSpanCount
 //                                             signature_documentation java int totalSpanCount
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSize().
 //                                                  ^^^^^^^^ definition local 57
 //                                                           display_name position
 //                                                           signature_documentation java int position
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSize().
 //                                                                ^^^^^^^^^ definition local 58
 //                                                                          display_name itemCount
 //                                                                          signature_documentation java int itemCount
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSize().
     if (spanSizeOverride != null) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
       return spanSizeOverride.getSpanSize(totalSpanCount, position, itemCount);
@@ -1263,6 +1321,7 @@ public EpoxyModel<T> show(boolean show) {
 //                                  ^^^^ definition local 59
 //                                       display_name show
 //                                       signature_documentation java boolean show
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show(+1).
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
     shown = show;
@@ -1334,6 +1393,7 @@ public boolean onFailedToRecycleView(@NonNull T view) {
 //                                                ^^^^ definition local 60
 //                                                     display_name view
 //                                                     signature_documentation java @NonNull\nT view
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
     return false;
   }
 
@@ -1354,6 +1414,7 @@ public void onViewAttachedToWindow(@NonNull T view) {
 //                                              ^^^^ definition local 61
 //                                                   display_name view
 //                                                   signature_documentation java @NonNull\nT view
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 
   }
 
@@ -1375,6 +1436,7 @@ public void onViewDetachedFromWindow(@NonNull T view) {
 //                                                ^^^^ definition local 62
 //                                                     display_name view
 //                                                     signature_documentation java @NonNull\nT view
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 
   }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
index 0d81cfdc3..02fe8fe03 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
@@ -139,11 +139,13 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, Collection<? extends EpoxyModel
 //                                      ^^^^^^^^^ definition local 0
 //                                                display_name layoutRes
 //                                                signature_documentation java @LayoutRes\nint layoutRes
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`().
 //                                                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                     ^^^^^^ definition local 1
 //                                                                                            display_name models
 //                                                                                            signature_documentation java Collection<? extends EpoxyModel<?>> models
+//                                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`().
     this(layoutRes, new ArrayList<>(models));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
 //       ^^^^^^^^^ reference local 0
@@ -164,10 +166,12 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel<?>... models) {
 //                                      ^^^^^^^^^ definition local 2
 //                                                display_name layoutRes
 //                                                signature_documentation java @LayoutRes\nint layoutRes
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+1).
 //                                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                  ^^^^^^ definition local 3
 //                                                                         display_name models
 //                                                                         signature_documentation java EpoxyModel<?>[] models
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+1).
     this(layoutRes, new ArrayList<>(Arrays.asList(models)));
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
 //       ^^^^^^^^^ reference local 2
@@ -190,11 +194,13 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
 //                                       ^^^^^^^^^ definition local 4
 //                                                 display_name layoutRes
 //                                                 signature_documentation java @LayoutRes\nint layoutRes
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
 //                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                      ^^^^^^ definition local 5
 //                                                                             display_name models
 //                                                                             signature_documentation java List<EpoxyModel<?>> models
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
     if (models.isEmpty()) {
 //      ^^^^^^ reference local 5
 //             ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -218,11 +224,13 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
 //          ^^^^^^^^^ definition local 6
 //                    display_name saveState
 //                    signature_documentation java boolean saveState
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
     for (EpoxyModel<?> model : models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 7
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
 //                             ^^^^^^ reference local 5
       if (model.shouldSaveViewState()) {
 //        ^^^^^ reference local 7
@@ -265,6 +273,7 @@ protected EpoxyModelGroup(@LayoutRes int layoutRes) {
 //                                         ^^^^^^^^^ definition local 8
 //                                                   display_name layoutRes
 //                                                   signature_documentation java @LayoutRes\nint layoutRes
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+4).
     this();
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+3).
     layout(layoutRes);
@@ -281,6 +290,7 @@ protected void addModel(@NonNull EpoxyModel<?> model) {
 //                                               ^^^^^ definition local 9
 //                                                     display_name model
 //                                                     signature_documentation java @NonNull\nEpoxyModel<?> model
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#addModel().
     // By default we save view state if any of the models need to save state.
     shouldSaveViewStateDefault |= model.shouldSaveViewState();
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewStateDefault.
@@ -307,6 +317,7 @@ public void bind(@NonNull ModelGroupHolder holder) {
 //                                           ^^^^^^ definition local 10
 //                                                  display_name holder
 //                                                  signature_documentation java @NonNull\nunresolved_type holder
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                ^^^^^^ reference local 10
@@ -317,18 +328,22 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                ^^^^^^^ definition local 12
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
+//                        enclosing_symbol local 11
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 13
 //                                         display_name model
 //                                         signature_documentation java EpoxyModel model
+//                                         enclosing_symbol local 12
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 14
 //                                                                     display_name viewHolder
 //                                                                     signature_documentation java EpoxyViewHolder viewHolder
+//                                                                     enclosing_symbol local 12
 //                                                                          ^^^^^^^^^^ definition local 15
 //                                                                                     display_name modelIndex
 //                                                                                     signature_documentation java int modelIndex
+//                                                                                     enclosing_symbol local 12
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                        ^^^^^ reference local 13
@@ -359,12 +374,14 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull final List<Object> p
 //                                           ^^^^^^ definition local 16
 //                                                  display_name holder
 //                                                  signature_documentation java @NonNull\nunresolved_type holder
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                               ^^^^^^^^ definition local 17
 //                                                                                        display_name payloads
 //                                                                                        signature_documentation java @NonNull\nfinal List<Object> payloads
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                ^^^^^^ reference local 16
@@ -375,18 +392,22 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                ^^^^^^^ definition local 19
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
+//                        enclosing_symbol local 18
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 20
 //                                         display_name model
 //                                         signature_documentation java EpoxyModel model
+//                                         enclosing_symbol local 19
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 21
 //                                                                     display_name viewHolder
 //                                                                     signature_documentation java EpoxyViewHolder viewHolder
+//                                                                     enclosing_symbol local 19
 //                                                                          ^^^^^^^^^^ definition local 22
 //                                                                                     display_name modelIndex
 //                                                                                     signature_documentation java int modelIndex
+//                                                                                     enclosing_symbol local 19
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                        ^^^^^ reference local 20
@@ -415,11 +436,13 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
 //                                           ^^^^^^ definition local 23
 //                                                  display_name holder
 //                                                  signature_documentation java @NonNull\nunresolved_type holder
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^^^^^^^^^^^^^^^^^^^^ definition local 24
 //                                                                                               display_name previouslyBoundModel
 //                                                                                               signature_documentation java @NonNull\nEpoxyModel<?> previouslyBoundModel
+//                                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
     if (!(previouslyBoundModel instanceof EpoxyModelGroup)) {
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 24
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
@@ -434,6 +457,7 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
 //                        ^^^^^^^^^^^^^ definition local 25
 //                                      display_name previousGroup
 //                                      signature_documentation java final EpoxyModelGroup previousGroup
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                                                          ^^^^^^^^^^^^^^^^^^^^ reference local 24
 
@@ -447,18 +471,22 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                ^^^^^^^ definition local 27
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
+//                        enclosing_symbol local 26
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 28
 //                                         display_name model
 //                                         signature_documentation java EpoxyModel model
+//                                         enclosing_symbol local 27
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 29
 //                                                                     display_name viewHolder
 //                                                                     signature_documentation java EpoxyViewHolder viewHolder
+//                                                                     enclosing_symbol local 27
 //                                                                          ^^^^^^^^^^ definition local 30
 //                                                                                     display_name modelIndex
 //                                                                                     signature_documentation java int modelIndex
+//                                                                                     enclosing_symbol local 27
         setViewVisibility(model, viewHolder);
 //      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                        ^^^^^ reference local 28
@@ -474,6 +502,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                      ^^^^^^^^^^^^^ definition local 31
 //                                    display_name previousModel
 //                                    signature_documentation java EpoxyModel<?> previousModel
+//                                    enclosing_symbol local 27
 //                                      ^^^^^^^^^^^^^ reference local 25
 //                                                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                                                           ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -514,10 +543,12 @@ private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHold
 //                                                 ^^^^^ definition local 32
 //                                                       display_name model
 //                                                       signature_documentation java EpoxyModel model
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                        ^^^^^^^^^^ definition local 33
 //                                                                                   display_name viewHolder
 //                                                                                   signature_documentation java EpoxyViewHolder viewHolder
+//                                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
     if (model.isShown()) {
 //      ^^^^^ reference local 32
 //            ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isShown().
@@ -552,6 +583,7 @@ public void unbind(@NonNull ModelGroupHolder holder) {
 //                                             ^^^^^^ definition local 34
 //                                                    display_name holder
 //                                                    signature_documentation java @NonNull\nunresolved_type holder
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
     holder.unbindGroup();
 //  ^^^^^^ reference local 34
 //         ^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#unbindGroup#
@@ -571,6 +603,7 @@ public void onViewAttachedToWindow(ModelGroupHolder holder) {
 //                                                    ^^^^^^ definition local 35
 //                                                           display_name holder
 //                                                           signature_documentation java unresolved_type holder
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                ^^^^^^ reference local 35
@@ -581,18 +614,22 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                ^^^^^^^ definition local 37
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
+//                        enclosing_symbol local 36
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 38
 //                                         display_name model
 //                                         signature_documentation java EpoxyModel model
+//                                         enclosing_symbol local 37
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 39
 //                                                                     display_name viewHolder
 //                                                                     signature_documentation java EpoxyViewHolder viewHolder
+//                                                                     enclosing_symbol local 37
 //                                                                          ^^^^^^^^^^ definition local 40
 //                                                                                     display_name modelIndex
 //                                                                                     signature_documentation java int modelIndex
+//                                                                                     enclosing_symbol local 37
         //noinspection unchecked
         model.onViewAttachedToWindow(viewHolder.objectToBind());
 //      ^^^^^ reference local 38
@@ -617,6 +654,7 @@ public void onViewDetachedFromWindow(ModelGroupHolder holder) {
 //                                                      ^^^^^^ definition local 41
 //                                                             display_name holder
 //                                                             signature_documentation java unresolved_type holder
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
     iterateModels(holder, new IterateModelsCallback() {
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                ^^^^^^ reference local 41
@@ -627,18 +665,22 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                ^^^^^^^ definition local 43
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
+//                        enclosing_symbol local 42
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 44
 //                                         display_name model
 //                                         signature_documentation java EpoxyModel model
+//                                         enclosing_symbol local 43
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                          ^^^^^^^^^^ definition local 45
 //                                                                     display_name viewHolder
 //                                                                     signature_documentation java EpoxyViewHolder viewHolder
+//                                                                     enclosing_symbol local 43
 //                                                                          ^^^^^^^^^^ definition local 46
 //                                                                                     display_name modelIndex
 //                                                                                     signature_documentation java int modelIndex
+//                                                                                     enclosing_symbol local 43
         //noinspection unchecked
         model.onViewDetachedFromWindow(viewHolder.objectToBind());
 //      ^^^^^ reference local 44
@@ -657,10 +699,12 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba
 //                                            ^^^^^^ definition local 47
 //                                                   display_name holder
 //                                                   signature_documentation java unresolved_type holder
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                                                    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
 //                                                                          ^^^^^^^^ definition local 48
 //                                                                                   display_name callback
 //                                                                                   signature_documentation java IterateModelsCallback callback
+//                                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
     holder.bindGroupIfNeeded(this);
 //  ^^^^^^ reference local 47
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#bindGroupIfNeeded#
@@ -668,6 +712,7 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba
 //      ^^^^^^^^^^ definition local 49
 //                 display_name modelCount
 //                 signature_documentation java int modelCount
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                   ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -675,6 +720,7 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba
 //           ^ definition local 50
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                  ^ reference local 50
 //                      ^^^^^^^^^^ reference local 49
 //                                  ^ reference local 50
@@ -704,13 +750,16 @@ private interface IterateModelsCallback {
 //                          ^^^^^ definition local 51
 //                                display_name model
 //                                signature_documentation java EpoxyModel model
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 52
 //                                                            display_name viewHolder
 //                                                            signature_documentation java EpoxyViewHolder viewHolder
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                                                                 ^^^^^^^^^^ definition local 53
 //                                                                            display_name modelIndex
 //                                                                            signature_documentation java int modelIndex
+//                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
   }
 
   @Override
@@ -723,12 +772,15 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //                           ^^^^^^^^^^^^^^ definition local 54
 //                                          display_name totalSpanCount
 //                                          signature_documentation java int totalSpanCount
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
 //                                               ^^^^^^^^ definition local 55
 //                                                        display_name position
 //                                                        signature_documentation java int position
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
 //                                                             ^^^^^^^^^ definition local 56
 //                                                                       display_name itemCount
 //                                                                       signature_documentation java int itemCount
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
     // Defaults to using the span size of the first model. Override this if you need to customize it
     return models.get(0).spanSize(totalSpanCount, position, itemCount);
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
@@ -761,6 +813,7 @@ public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) {
 //                                                   ^^^^^^^^^^^^^^^^^^^ definition local 57
 //                                                                       display_name shouldSaveViewState
 //                                                                       signature_documentation java boolean shouldSaveViewState
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState().
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
     this.shouldSaveViewState = shouldSaveViewState;
@@ -806,9 +859,11 @@ protected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition
 //                                                        ^^^^^ definition local 58
 //                                                              display_name model
 //                                                              signature_documentation java EpoxyModel<?> model
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#useViewStubLayoutParams().
 //                                                                   ^^^^^^^^^^^^^ definition local 59
 //                                                                                 display_name modelPosition
 //                                                                                 signature_documentation java int modelPosition
+//                                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#useViewStubLayoutParams().
     return true;
   }
 
@@ -825,6 +880,7 @@ protected final ModelGroupHolder createNewHolder(@NonNull ViewParent parent) {
 //                                                                     ^^^^^^ definition local 60
 //                                                                            display_name parent
 //                                                                            signature_documentation java @NonNull\nunresolved_type parent
+//                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#createNewHolder().
     return new ModelGroupHolder(parent);
 //                              ^^^^^^ reference local 60
   }
@@ -841,6 +897,7 @@ public boolean equals(Object o) {
 //                             ^ definition local 61
 //                               display_name o
 //                               signature_documentation java Object o
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
     if (this == o) {
 //              ^ reference local 61
       return true;
@@ -862,6 +919,7 @@ public boolean equals(Object o) {
 //                  ^^^^ definition local 62
 //                       display_name that
 //                       signature_documentation java EpoxyModelGroup that
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
 //                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                                           ^ reference local 61
 
@@ -884,6 +942,7 @@ public int hashCode() {
 //      ^^^^^^ definition local 63
 //             display_name result
 //             signature_documentation java int result
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#hashCode().
 //               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#super.
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
     result = 31 * result + models.hashCode();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
index c663cb12f..ba8f8b37d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
@@ -96,11 +96,13 @@ public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class<T> ta
 //                                                         ^^^^^^^^^^ definition local 0
 //                                                                    display_name controller
 //                                                                    signature_documentation java @Nullable\nEpoxyController controller
+//                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#`<init>`().
 //                                                                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                                                              ^^^^^^^^^^^^^^^^ definition local 1
 //                                                                                               display_name targetModelClass
 //                                                                                               signature_documentation java Class<T> targetModelClass
+//                                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#`<init>`().
     this.controller = controller;
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#controller.
 //                    ^^^^^^^^^^ reference local 0
@@ -121,15 +123,18 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
 //                                            ^^^^^^^^^^^^ definition local 2
 //                                                         display_name recyclerView
 //                                                         signature_documentation java unresolved_type recyclerView
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                          ^^^^^^^^^^ definition local 3
 //                                                                                     display_name viewHolder
 //                                                                                     signature_documentation java EpoxyViewHolder viewHolder
+//                                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
     EpoxyModel<?> model = viewHolder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 4
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                        ^^^^^^^^^^ reference local 3
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
 
@@ -140,6 +145,7 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
 //          ^^^^^^^^^^^^^^^^^^^^^ definition local 5
 //                                display_name isOtherCallbackActive
 //                                signature_documentation java boolean isOtherCallbackActive
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
         holderBeingDragged == null
 //      ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingDragged.
             && holderBeingSwiped == null
@@ -176,15 +182,18 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current
 //                                           ^^^^^^^^^^^^ definition local 6
 //                                                        display_name recyclerView
 //                                                        signature_documentation java unresolved_type recyclerView
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                         ^^^^^^^ definition local 7
 //                                                                                 display_name current
 //                                                                                 signature_documentation java EpoxyViewHolder current
+//                                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 8
 //                           display_name target
 //                           signature_documentation java EpoxyViewHolder target
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
     // By default we don't allow dropping on a model that isn't a drag target
     return isTouchableModel(target.getModel());
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
@@ -200,6 +209,7 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                                                 ^^^^^ definition local 9
 //                                                       display_name model
 //                                                       signature_documentation java EpoxyModel<?> model
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
     return targetModelClass.isInstance(model);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#targetModelClass.
 //                          ^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#isInstance().
@@ -218,15 +228,18 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                                      ^^^^^^^^^^^^ definition local 10
 //                                                   display_name recyclerView
 //                                                   signature_documentation java unresolved_type recyclerView
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                    ^^^^^^^^^^ definition local 11
 //                                                                               display_name viewHolder
 //                                                                               signature_documentation java EpoxyViewHolder viewHolder
+//                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 12
 //                           display_name target
 //                           signature_documentation java EpoxyViewHolder target
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 
     if (controller == null) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#controller.
@@ -239,12 +252,14 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //      ^^^^^^^^^^^^ definition local 13
 //                   display_name fromPosition
 //                   signature_documentation java int fromPosition
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                     ^^^^^^^^^^ reference local 11
 //                                ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     int toPosition = target.getAdapterPosition();
 //      ^^^^^^^^^^ definition local 14
 //                 display_name toPosition
 //                 signature_documentation java int toPosition
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                   ^^^^^^ reference local 12
 //                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     controller.moveModel(fromPosition, toPosition);
@@ -258,6 +273,7 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                ^^^^^ definition local 15
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                        ^^^^^^^^^^ reference local 11
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     if (!isTouchableModel(model)) {
@@ -292,17 +308,21 @@ public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, Vi
 //                             ^^^^^^^^^^^^ definition local 16
 //                                          display_name fromPosition
 //                                          signature_documentation java int fromPosition
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                                               ^^^^^^^^^^ definition local 17
 //                                                          display_name toPosition
 //                                                          signature_documentation java int toPosition
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                                             ^^^^^^^^^^^^^^^ definition local 18
 //                                                                             display_name modelBeingMoved
 //                                                                             signature_documentation java T modelBeingMoved
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                                                                              ^^^^ reference semanticdb maven . . View#
 //                                                                                   ^^^^^^^^ definition local 19
 //                                                                                            display_name itemView
 //                                                                                            signature_documentation java unresolved_type itemView
+//                                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 
   }
 
@@ -317,14 +337,17 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 //                                        ^^^^^^^^^^ definition local 20
 //                                                   display_name viewHolder
 //                                                   signature_documentation java EpoxyViewHolder viewHolder
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //                                                        ^^^^^^^^^ definition local 21
 //                                                                  display_name direction
 //                                                                  signature_documentation java int direction
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
     EpoxyModel<?> model = viewHolder.getModel();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^ definition local 22
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //                        ^^^^^^^^^^ reference local 20
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     View view = viewHolder.itemView;
@@ -332,12 +355,14 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 //       ^^^^ definition local 23
 //            display_name view
 //            signature_documentation java unresolved_type view
+//            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //              ^^^^^^^^^^ reference local 20
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#itemView#
     int position = viewHolder.getAdapterPosition();
 //      ^^^^^^^^ definition local 24
 //               display_name position
 //               signature_documentation java int position
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //                 ^^^^^^^^^^ reference local 20
 //                            ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
 
@@ -372,16 +397,20 @@ public void onSwipeCompleted(T model, View itemView, int position, int direction
 //                               ^^^^^ definition local 25
 //                                     display_name model
 //                                     signature_documentation java T model
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 26
 //                                                    display_name itemView
 //                                                    signature_documentation java unresolved_type itemView
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                                                         ^^^^^^^^ definition local 27
 //                                                                  display_name position
 //                                                                  signature_documentation java int position
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                                                                       ^^^^^^^^^ definition local 28
 //                                                                                 display_name direction
 //                                                                                 signature_documentation java int direction
+//                                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 
   }
 
@@ -397,9 +426,11 @@ protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actio
 //                                                           ^^^^^^^^^^ definition local 29
 //                                                                      display_name viewHolder
 //                                                                      signature_documentation java @Nullable\nEpoxyViewHolder viewHolder
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
 //                                                                           ^^^^^^^^^^^ definition local 30
 //                                                                                       display_name actionState
 //                                                                                       signature_documentation java int actionState
+//                                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
     super.onSelectedChanged(viewHolder, actionState);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
@@ -413,6 +444,7 @@ protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actio
 //                  ^^^^^ definition local 31
 //                        display_name model
 //                        signature_documentation java EpoxyModel<?> model
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
 //                          ^^^^^^^^^^ reference local 29
 //                                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
       if (!isTouchableModel(model)) {
@@ -500,6 +532,7 @@ private void markRecyclerViewHasSelection(RecyclerView recyclerView) {
 //                                                       ^^^^^^^^^^^^ definition local 32
 //                                                                    display_name recyclerView
 //                                                                    signature_documentation java unresolved_type recyclerView
+//                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#markRecyclerViewHasSelection().
     recyclerView.setTag(R.id.epoxy_touch_helper_selection_status, Boolean.TRUE);
 //  ^^^^^^^^^^^^ reference local 32
 //               ^^^^^^ reference semanticdb maven . . RecyclerView#setTag#
@@ -518,6 +551,7 @@ private boolean recyclerViewHasSelection(RecyclerView recyclerView) {
 //                                                      ^^^^^^^^^^^^ definition local 33
 //                                                                   display_name recyclerView
 //                                                                   signature_documentation java unresolved_type recyclerView
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#recyclerViewHasSelection().
     return recyclerView.getTag(R.id.epoxy_touch_helper_selection_status) != null;
 //         ^^^^^^^^^^^^ reference local 33
 //                      ^^^^^^ reference semanticdb maven . . RecyclerView#getTag#
@@ -534,6 +568,7 @@ private void clearRecyclerViewSelectionMarker(RecyclerView recyclerView) {
 //                                                           ^^^^^^^^^^^^ definition local 34
 //                                                                        display_name recyclerView
 //                                                                        signature_documentation java unresolved_type recyclerView
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearRecyclerViewSelectionMarker().
     recyclerView.setTag(R.id.epoxy_touch_helper_selection_status, null);
 //  ^^^^^^^^^^^^ reference local 34
 //               ^^^^^^ reference semanticdb maven . . RecyclerView#setTag#
@@ -553,13 +588,16 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //                             ^^^^^ definition local 35
 //                                   display_name model
 //                                   signature_documentation java T model
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^ definition local 36
 //                                                  display_name itemView
 //                                                  signature_documentation java unresolved_type itemView
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                                                       ^^^^^^^^^^^^^^^ definition local 37
 //                                                                       display_name adapterPosition
 //                                                                       signature_documentation java int adapterPosition
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 
   }
 
@@ -574,10 +612,12 @@ public void onSwipeReleased(T model, View itemView) {
 //                              ^^^^^ definition local 38
 //                                    display_name model
 //                                    signature_documentation java T model
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 39
 //                                                   display_name itemView
 //                                                   signature_documentation java unresolved_type itemView
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 
   }
 
@@ -592,13 +632,16 @@ public void onDragStarted(T model, View itemView, int adapterPosition) {
 //                            ^^^^^ definition local 40
 //                                  display_name model
 //                                  signature_documentation java T model
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                                   ^^^^ reference semanticdb maven . . View#
 //                                        ^^^^^^^^ definition local 41
 //                                                 display_name itemView
 //                                                 signature_documentation java unresolved_type itemView
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                                                      ^^^^^^^^^^^^^^^ definition local 42
 //                                                                      display_name adapterPosition
 //                                                                      signature_documentation java int adapterPosition
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 
   }
 
@@ -613,10 +656,12 @@ public void onDragReleased(T model, View itemView) {
 //                             ^^^^^ definition local 43
 //                                   display_name model
 //                                   signature_documentation java T model
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^ definition local 44
 //                                                  display_name itemView
 //                                                  signature_documentation java unresolved_type itemView
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 
   }
 
@@ -633,10 +678,12 @@ protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHo
 //                                            ^^^^^^^^^^^^ definition local 45
 //                                                         display_name recyclerView
 //                                                         signature_documentation java final unresolved_type recyclerView
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                          ^^^^^^^^^^ definition local 46
 //                                                                                     display_name viewHolder
 //                                                                                     signature_documentation java EpoxyViewHolder viewHolder
+//                                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
     super.clearView(recyclerView, viewHolder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
@@ -666,6 +713,7 @@ public void run() {
 //                ^^^ definition local 48
 //                    display_name run
 //                    signature_documentation java @Override\npublic void run()
+//                    enclosing_symbol local 47
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         clearRecyclerViewSelectionMarker(recyclerView);
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearRecyclerViewSelectionMarker().
@@ -688,10 +736,12 @@ public void clearView(T model, View itemView) {
 //                        ^^^^^ definition local 49
 //                              display_name model
 //                              signature_documentation java T model
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 //                               ^^^^ reference semanticdb maven . . View#
 //                                    ^^^^^^^^ definition local 50
 //                                             display_name itemView
 //                                             signature_documentation java unresolved_type itemView
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 
   }
 
@@ -707,27 +757,34 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //                                  ^ definition local 51
 //                                    display_name c
 //                                    signature_documentation java unresolved_type c
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                  ^^^^^^^^^^^^ definition local 52
 //                                                               display_name recyclerView
 //                                                               signature_documentation java unresolved_type recyclerView
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                ^^^^^^^^^^ definition local 53
 //                                                                                           display_name viewHolder
 //                                                                                           signature_documentation java EpoxyViewHolder viewHolder
+//                                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 54
 //             display_name dX
 //             signature_documentation java float dX
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                    ^^ definition local 55
 //                       display_name dY
 //                       signature_documentation java float dY
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                            ^^^^^^^^^^^ definition local 56
 //                                        display_name actionState
 //                                        signature_documentation java int actionState
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 57
 //                                                                   display_name isCurrentlyActive
 //                                                                   signature_documentation java boolean isCurrentlyActive
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
     super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#super.
 //        ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
@@ -744,6 +801,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //                ^^^^^ definition local 58
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                        ^^^^^^^^^^ reference local 53
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     if (!isTouchableModel(model)) {
@@ -761,6 +819,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //       ^^^^^^^^ definition local 59
 //                display_name itemView
 //                signature_documentation java unresolved_type itemView
+//                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                  ^^^^^^^^^^ reference local 53
 //                             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#itemView#
 
@@ -768,6 +827,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //        ^^^^^^^^^^^^^ definition local 60
 //                      display_name swipeProgress
 //                      signature_documentation java float swipeProgress
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
     if (Math.abs(dX) > Math.abs(dY)) {
 //      ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
 //           ^^^ reference semanticdb maven jdk 11 java/lang/Math#abs(+2).
@@ -793,6 +853,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //        ^^^^^^^^^^^^^^^ definition local 61
 //                        display_name clampedProgress
 //                        signature_documentation java float clampedProgress
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                          ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
 //                               ^^^ reference semanticdb maven jdk 11 java/lang/Math#max(+2).
 //                                        ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
@@ -820,18 +881,22 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //                                     ^^^^^ definition local 62
 //                                           display_name model
 //                                           signature_documentation java T model
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                                            ^^^^ reference semanticdb maven . . View#
 //                                                 ^^^^^^^^ definition local 63
 //                                                          display_name itemView
 //                                                          signature_documentation java unresolved_type itemView
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                                                                 ^^^^^^^^^^^^^ definition local 64
 //                                                                               display_name swipeProgress
 //                                                                               signature_documentation java float swipeProgress
+//                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
       Canvas canvas) {
 //    ^^^^^^ reference semanticdb maven . . Canvas#
 //           ^^^^^^ definition local 65
 //                  display_name canvas
 //                  signature_documentation java unresolved_type canvas
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 
   }
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
index b0b857803..137f2d375 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
@@ -60,6 +60,7 @@ public EpoxyModelWithHolder(long id) {
 //                                 ^^ definition local 0
 //                                    display_name id
 //                                    signature_documentation java long id
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#`<init>`(+1).
     super(id);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
 //        ^^ reference local 0
@@ -78,6 +79,7 @@ public EpoxyModelWithHolder(long id) {
 //                                                         ^^^^^^ definition local 1
 //                                                                display_name parent
 //                                                                signature_documentation java @NonNull\nunresolved_type parent
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#createNewHolder().
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -92,6 +94,7 @@ public void bind(@NonNull T holder) {
 //                            ^^^^^^ definition local 2
 //                                   display_name holder
 //                                   signature_documentation java @NonNull\nT holder
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
     super.bind(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
@@ -111,12 +114,14 @@ public void bind(@NonNull T holder, @NonNull List<Object> payloads) {
 //                            ^^^^^^ definition local 3
 //                                   display_name holder
 //                                   signature_documentation java @NonNull\nT holder
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                          ^^^^^^^^ definition local 4
 //                                                                   display_name payloads
 //                                                                   signature_documentation java @NonNull\nList<Object> payloads
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
     super.bind(holder, payloads);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
@@ -137,11 +142,13 @@ public void bind(@NonNull T holder, @NonNull EpoxyModel<?> previouslyBoundModel)
 //                            ^^^^^^ definition local 5
 //                                   display_name holder
 //                                   signature_documentation java @NonNull\nT holder
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^^^^^^^^^^^^^^^^ definition local 6
 //                                                                                display_name previouslyBoundModel
 //                                                                                signature_documentation java @NonNull\nEpoxyModel<?> previouslyBoundModel
+//                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
     super.bind(holder, previouslyBoundModel);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
@@ -162,6 +169,7 @@ public void unbind(@NonNull T holder) {
 //                              ^^^^^^ definition local 7
 //                                     display_name holder
 //                                     signature_documentation java @NonNull\nT holder
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
     super.unbind(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
@@ -180,11 +188,13 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T
 //                                                     ^^^^^^^^^^^^^^^ definition local 8
 //                                                                     display_name visibilityState
 //                                                                     signature_documentation java @Visibility\nint visibilityState
+//                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged().
 //                                                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                                                                 ^^^^^^ definition local 9
 //                                                                                        display_name holder
 //                                                                                        signature_documentation java @NonNull\nT holder
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged().
     super.onVisibilityStateChanged(visibilityState, holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
@@ -206,6 +216,7 @@ public void onVisibilityChanged(
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 10
 //                                                               display_name percentVisibleHeight
 //                                                               signature_documentation java @FloatRange(from = 0, to = 100)\nfloat percentVisibleHeight
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
       @FloatRange(from = 0, to = 100) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
@@ -213,21 +224,25 @@ public void onVisibilityChanged(
 //                                          ^^^^^^^^^^^^^^^^^^^ definition local 11
 //                                                              display_name percentVisibleWidth
 //                                                              signature_documentation java @FloatRange(from = 0, to = 100)\nfloat percentVisibleWidth
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
       @Px int visibleHeight, @Px int visibleWidth,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 12
 //                          display_name visibleHeight
 //                          signature_documentation java @Px\nint visibleHeight
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
 //                            ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                   ^^^^^^^^^^^^ definition local 13
 //                                                display_name visibleWidth
 //                                                signature_documentation java @Px\nint visibleWidth
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
       @NonNull T holder) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //               ^^^^^^ definition local 14
 //                      display_name holder
 //                      signature_documentation java @NonNull\nT holder
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
     super.onVisibilityChanged(
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
@@ -252,6 +267,7 @@ public boolean onFailedToRecycleView(T holder) {
 //                                       ^^^^^^ definition local 15
 //                                              display_name holder
 //                                              signature_documentation java T holder
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView().
     return super.onFailedToRecycleView(holder);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //               ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
@@ -270,6 +286,7 @@ public void onViewAttachedToWindow(T holder) {
 //                                     ^^^^^^ definition local 16
 //                                            display_name holder
 //                                            signature_documentation java T holder
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
     super.onViewAttachedToWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
@@ -288,6 +305,7 @@ public void onViewDetachedFromWindow(T holder) {
 //                                       ^^^^^^ definition local 17
 //                                              display_name holder
 //                                              signature_documentation java T holder
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
     super.onViewDetachedFromWindow(holder);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#super.
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
index b13ebfd1a..033ae6f91 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
@@ -87,6 +87,7 @@ protected int getViewType() {
 //                                                  ^^^^^^ definition local 0
 //                                                         display_name parent
 //                                                         signature_documentation java @NonNull\nunresolved_type parent
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#buildView().
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -113,6 +114,7 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 //                                           ^^^^^^^^^ definition local 1
 //                                                     display_name layoutRes
 //                                                     signature_documentation java @LayoutRes\nint layoutRes
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#layout().
     throw new UnsupportedOperationException(
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`(+1).
         "Layout resources are unsupported. Views must be created with `buildView`");
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
index f316d8703..5f4b7c5c0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
@@ -53,13 +53,16 @@ public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouch
 //                      ^^^^^ definition local 0
 //                            display_name model
 //                            signature_documentation java T model
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                             ^^^^ reference semanticdb maven . . View#
 //                                  ^^^^^^^^ definition local 1
 //                                           display_name itemView
 //                                           signature_documentation java unresolved_type itemView
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                                                ^^^^^^^^^^^^^^^ definition local 2
 //                                                                display_name adapterPosition
 //                                                                signature_documentation java int adapterPosition
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 
   /**
    * Once a view has begun swiping with {@link #onSwipeStarted(EpoxyModel, View, int)} it will
@@ -86,18 +89,22 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //                              ^^^^^ definition local 3
 //                                    display_name model
 //                                    signature_documentation java T model
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 4
 //                                                   display_name itemView
 //                                                   signature_documentation java unresolved_type itemView
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                                          ^^^^^^^^^^^^^ definition local 5
 //                                                                        display_name swipeProgress
 //                                                                        signature_documentation java float swipeProgress
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
       Canvas canvas);
 //    ^^^^^^ reference semanticdb maven . . Canvas#
 //           ^^^^^^ definition local 6
 //                  display_name canvas
 //                  signature_documentation java unresolved_type canvas
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 
   /**
    * Called when the user has released their touch on the view. If the displacement passed the swipe
@@ -119,10 +126,12 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //                       ^^^^^ definition local 7
 //                             display_name model
 //                             signature_documentation java T model
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                              ^^^^ reference semanticdb maven . . View#
 //                                   ^^^^^^^^ definition local 8
 //                                            display_name itemView
 //                                            signature_documentation java unresolved_type itemView
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 
   /**
    * Called after {@link #onSwipeReleased(EpoxyModel, View)} if the swipe surpassed the threshold to
@@ -152,14 +161,18 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //                        ^^^^^ definition local 9
 //                              display_name model
 //                              signature_documentation java T model
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                               ^^^^ reference semanticdb maven . . View#
 //                                    ^^^^^^^^ definition local 10
 //                                             display_name itemView
 //                                             signature_documentation java unresolved_type itemView
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                                  ^^^^^^^^ definition local 11
 //                                                           display_name position
 //                                                           signature_documentation java int position
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                                                ^^^^^^^^^ definition local 12
 //                                                                          display_name direction
 //                                                                          signature_documentation java int direction
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
index 433836f03..2cd16c760 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
@@ -88,6 +88,7 @@ public static DragBuilder initDragging(EpoxyController controller) {
 //                                                       ^^^^^^^^^^ definition local 0
 //                                                                  display_name controller
 //                                                                  signature_documentation java EpoxyController controller
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#initDragging().
     return new DragBuilder(controller);
 //             ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#`<init>`().
 //                         ^^^^^^^^^^ reference local 0
@@ -112,6 +113,7 @@ private DragBuilder(EpoxyController controller) {
 //                                      ^^^^^^^^^^ definition local 1
 //                                                 display_name controller
 //                                                 signature_documentation java EpoxyController controller
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#`<init>`().
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller.
 //                      ^^^^^^^^^^ reference local 1
@@ -132,6 +134,7 @@ public DragBuilder2 withRecyclerView(RecyclerView recyclerView) {
 //                                                    ^^^^^^^^^^^^ definition local 2
 //                                                                 display_name recyclerView
 //                                                                 signature_documentation java unresolved_type recyclerView
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#withRecyclerView().
       return new DragBuilder2(controller, recyclerView);
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#`<init>`().
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller.
@@ -163,10 +166,12 @@ private DragBuilder2(EpoxyController controller, RecyclerView recyclerView) {
 //                                       ^^^^^^^^^^ definition local 3
 //                                                  display_name controller
 //                                                  signature_documentation java EpoxyController controller
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#`<init>`().
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                ^^^^^^^^^^^^ definition local 4
 //                                                                             display_name recyclerView
 //                                                                             signature_documentation java unresolved_type recyclerView
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#`<init>`().
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller.
 //                      ^^^^^^^^^^ reference local 3
@@ -243,6 +248,7 @@ public DragBuilder3 withDirections(int directionFlags) {
 //                                         ^^^^^^^^^^^^^^ definition local 5
 //                                                        display_name directionFlags
 //                                                        signature_documentation java int directionFlags
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
       return new DragBuilder3(controller, recyclerView, makeMovementFlags(directionFlags, 0));
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller.
@@ -280,13 +286,16 @@ private DragBuilder3(EpoxyController controller, RecyclerView recyclerView, int
 //                                       ^^^^^^^^^^ definition local 6
 //                                                  display_name controller
 //                                                  signature_documentation java EpoxyController controller
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                                ^^^^^^^^^^^^ definition local 7
 //                                                                             display_name recyclerView
 //                                                                             signature_documentation java unresolved_type recyclerView
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
 //                                                                                  ^^^^^^^^^^^^^ definition local 8
 //                                                                                                display_name movementFlags
 //                                                                                                signature_documentation java int movementFlags
+//                                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller.
 //                      ^^^^^^^^^^ reference local 6
@@ -318,6 +327,7 @@ public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelCla
 //                                                                    ^^^^^^^^^^^^^^^^ definition local 9
 //                                                                                     display_name targetModelClass
 //                                                                                     signature_documentation java Class<U> targetModelClass
+//                                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().
       List<Class<? extends EpoxyModel>> targetClasses = new ArrayList<>(1);
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
@@ -325,6 +335,7 @@ public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelCla
 //                                      ^^^^^^^^^^^^^ definition local 10
 //                                                    display_name targetClasses
 //                                                    signature_documentation java List<Class<? extends EpoxyModel>> targetClasses
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().
 //                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
       targetClasses.add(targetModelClass);
 //    ^^^^^^^^^^^^^ reference local 10
@@ -359,6 +370,7 @@ public DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>... targe
 //                                                                             ^^^^^^^^^^^^^^^^^^ definition local 11
 //                                                                                                display_name targetModelClasses
 //                                                                                                signature_documentation java Class<? extends EpoxyModel>[] targetModelClasses
+//                                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTargets().
       return new DragBuilder4<>(controller, recyclerView, movementFlags, EpoxyModel.class,
 //               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller.
@@ -437,26 +449,31 @@ private DragBuilder4(EpoxyController controller,
 //                                       ^^^^^^^^^^ definition local 12
 //                                                  display_name controller
 //                                                  signature_documentation java EpoxyController controller
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
         RecyclerView recyclerView, int movementFlags,
 //      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                   ^^^^^^^^^^^^ definition local 13
 //                                display_name recyclerView
 //                                signature_documentation java unresolved_type recyclerView
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
 //                                     ^^^^^^^^^^^^^ definition local 14
 //                                                   display_name movementFlags
 //                                                   signature_documentation java int movementFlags
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
         Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //               ^^^^^^^^^^^^^^^^ definition local 15
 //                                display_name targetModelClass
 //                                signature_documentation java Class<U> targetModelClass
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                   ^^^^^^^^^^^^^^^^^^ definition local 16
 //                                                                                      display_name targetModelClasses
 //                                                                                      signature_documentation java List<Class<? extends EpoxyModel>> targetModelClasses
+//                                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
 
       this.controller = controller;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#controller.
@@ -500,11 +517,13 @@ public ItemTouchHelper andCallbacks(final DragCallbacks<U> callbacks) {
 //                                                             ^^^^^^^^^ definition local 17
 //                                                                       display_name callbacks
 //                                                                       signature_documentation java final DragCallbacks<U> callbacks
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#andCallbacks().
       ItemTouchHelper itemTouchHelper =
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                    ^^^^^^^^^^^^^^^ definition local 18
 //                                    display_name itemTouchHelper
 //                                    signature_documentation java unresolved_type itemTouchHelper
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#andCallbacks().
           new ItemTouchHelper(new EpoxyModelTouchCallback<U>(controller, targetModelClass) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
 //                                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
@@ -517,14 +536,17 @@ public int getMovementFlagsForModel(U model, int adapterPosition) {
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 23
 //                                              display_name getMovementFlagsForModel
 //                                              signature_documentation java @Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)
+//                                              enclosing_symbol local 20
 //                                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                ^^^^^ definition local 24
 //                                                      display_name model
 //                                                      signature_documentation java U model
+//                                                      enclosing_symbol local 23
 //                                                           ^^^^^^^^^^^^^^^ definition local 25
 //                                                                           display_name adapterPosition
 //                                                                           signature_documentation java int adapterPosition
+//                                                                           enclosing_symbol local 23
               return movementFlags;
 //                   ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#movementFlags.
             }
@@ -535,15 +557,18 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                            ^^^^^^^^^^^^^^^^ definition local 26
 //                                             display_name isTouchableModel
 //                                             signature_documentation java @Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)
+//                                             enclosing_symbol local 20
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 27
 //                                                                 display_name model
 //                                                                 signature_documentation java EpoxyModel<?> model
+//                                                                 enclosing_symbol local 26
               boolean isTargetType = targetModelClasses.size() == 1
 //                    ^^^^^^^^^^^^ definition local 28
 //                                 display_name isTargetType
 //                                 signature_documentation java boolean isTargetType
+//                                 enclosing_symbol local 26
 //                                   ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClasses.
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
                   ? super.isTouchableModel(model)
@@ -571,19 +596,23 @@ public void onDragStarted(U model, View itemView, int adapterPosition) {
 //                      ^^^^^^^^^^^^^ definition local 30
 //                                    display_name onDragStarted
 //                                    signature_documentation java @Override\npublic void onDragStarted(U model, unresolved_type itemView, int adapterPosition)
+//                                    enclosing_symbol local 20
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                      ^^^^^ definition local 31
 //                                            display_name model
 //                                            signature_documentation java U model
+//                                            enclosing_symbol local 30
 //                                             ^^^^ reference semanticdb maven . . View#
 //                                                  ^^^^^^^^ definition local 32
 //                                                           display_name itemView
 //                                                           signature_documentation java unresolved_type itemView
+//                                                           enclosing_symbol local 30
 //                                                                ^^^^^^^^^^^^^^^ definition local 33
 //                                                                                display_name adapterPosition
 //                                                                                signature_documentation java int adapterPosition
+//                                                                                enclosing_symbol local 30
               callbacks.onDragStarted(model, itemView, adapterPosition);
 //            ^^^^^^^^^ reference local 17
 //                      ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
@@ -598,16 +627,19 @@ public void onDragReleased(U model, View itemView) {
 //                      ^^^^^^^^^^^^^^ definition local 34
 //                                     display_name onDragReleased
 //                                     signature_documentation java @Override\npublic void onDragReleased(U model, unresolved_type itemView)
+//                                     enclosing_symbol local 20
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                       ^^^^^ definition local 35
 //                                             display_name model
 //                                             signature_documentation java U model
+//                                             enclosing_symbol local 34
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 36
 //                                                            display_name itemView
 //                                                            signature_documentation java unresolved_type itemView
+//                                                            enclosing_symbol local 34
               callbacks.onDragReleased(model, itemView);
 //            ^^^^^^^^^ reference local 17
 //                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
@@ -621,23 +653,28 @@ public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved,
 //                      ^^^^^^^^^^^^ definition local 37
 //                                   display_name onModelMoved
 //                                   signature_documentation java @Override\npublic void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, unresolved_type itemView)
+//                                   enclosing_symbol local 20
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                                       ^^^^^^^^^^^^ definition local 38
 //                                                    display_name fromPosition
 //                                                    signature_documentation java int fromPosition
+//                                                    enclosing_symbol local 37
 //                                                         ^^^^^^^^^^ definition local 39
 //                                                                    display_name toPosition
 //                                                                    signature_documentation java int toPosition
+//                                                                    enclosing_symbol local 37
 //                                                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                                       ^^^^^^^^^^^^^^^ definition local 40
 //                                                                                       display_name modelBeingMoved
 //                                                                                       signature_documentation java U modelBeingMoved
+//                                                                                       enclosing_symbol local 37
                 View itemView) {
 //              ^^^^ reference semanticdb maven . . View#
 //                   ^^^^^^^^ definition local 41
 //                            display_name itemView
 //                            signature_documentation java unresolved_type itemView
+//                            enclosing_symbol local 37
               callbacks.onModelMoved(fromPosition, toPosition, modelBeingMoved, itemView);
 //            ^^^^^^^^^ reference local 17
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
@@ -653,6 +690,7 @@ public void clearView(U model, View itemView) {
 //                      ^^^^^^^^^ definition local 42
 //                                display_name clearView
 //                                signature_documentation java @Override\npublic void clearView(U model, unresolved_type itemView)
+//                                enclosing_symbol local 20
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
@@ -662,10 +700,12 @@ public void clearView(U model, View itemView) {
 //                                  ^^^^^ definition local 43
 //                                        display_name model
 //                                        signature_documentation java U model
+//                                        enclosing_symbol local 42
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^^^^^ definition local 44
 //                                                       display_name itemView
 //                                                       signature_documentation java unresolved_type itemView
+//                                                       enclosing_symbol local 42
               callbacks.clearView(model, itemView);
 //            ^^^^^^^^^ reference local 17
 //                      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView().
@@ -712,13 +752,16 @@ public void onDragStarted(T model, View itemView, int adapterPosition) {
 //                              ^^^^^ definition local 45
 //                                    display_name model
 //                                    signature_documentation java T model
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
 //                                     ^^^^ reference semanticdb maven . . View#
 //                                          ^^^^^^^^ definition local 46
 //                                                   display_name itemView
 //                                                   signature_documentation java unresolved_type itemView
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
 //                                                        ^^^^^^^^^^^^^^^ definition local 47
 //                                                                        display_name adapterPosition
 //                                                                        signature_documentation java int adapterPosition
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
 
     }
 
@@ -733,10 +776,12 @@ public void onDragReleased(T model, View itemView) {
 //                               ^^^^^ definition local 48
 //                                     display_name model
 //                                     signature_documentation java T model
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 49
 //                                                    display_name itemView
 //                                                    signature_documentation java unresolved_type itemView
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
 
     }
 
@@ -750,18 +795,22 @@ public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeing
 //                                        ^^^^^^^^^^^^ definition local 50
 //                                                     display_name fromPosition
 //                                                     signature_documentation java int fromPosition
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
 //                                                          ^^^^^^^^^^ definition local 51
 //                                                                     display_name toPosition
 //                                                                     signature_documentation java int toPosition
+//                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
 //                                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                                                        ^^^^^^^^^^^^^^^ definition local 52
 //                                                                                        display_name modelBeingMoved
 //                                                                                        signature_documentation java T modelBeingMoved
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
         View itemView);
 //      ^^^^ reference semanticdb maven . . View#
 //           ^^^^^^^^ definition local 53
 //                    display_name itemView
 //                    signature_documentation java unresolved_type itemView
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -774,10 +823,12 @@ public void clearView(T model, View itemView) {
 //                          ^^^^^ definition local 54
 //                                display_name model
 //                                signature_documentation java T model
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView().
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^^^^^ definition local 55
 //                                               display_name itemView
 //                                               signature_documentation java unresolved_type itemView
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView().
 
     }
 
@@ -795,6 +846,7 @@ public boolean isDragEnabledForModel(T model) {
 //                                         ^^^^^ definition local 56
 //                                               display_name model
 //                                               signature_documentation java T model
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#isDragEnabledForModel().
       return true;
     }
 
@@ -809,9 +861,11 @@ public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                                              ^^^^^ definition local 57
 //                                                    display_name model
 //                                                    signature_documentation java T model
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel().
 //                                                         ^^^^^^^^^^^^^^^ definition local 58
 //                                                                         display_name adapterPosition
 //                                                                         signature_documentation java int adapterPosition
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel().
       // No-Op this is not used
       return 0;
     }
@@ -823,6 +877,7 @@ public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                            ^^^^^^^^^^ definition local 19
 //                                       display_name controller
 //                                       signature_documentation java EpoxyController controller
+//                                       enclosing_symbol local 21
    */
   public static SwipeBuilder initSwiping(RecyclerView recyclerView) {
 //              ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#
@@ -834,6 +889,7 @@ public static SwipeBuilder initSwiping(RecyclerView recyclerView) {
 //                                                    ^^^^^^^^^^^^ definition local 59
 //                                                                 display_name recyclerView
 //                                                                 signature_documentation java unresolved_type recyclerView
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#initSwiping().
     return new SwipeBuilder(recyclerView);
 //             ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#`<init>`().
 //                          ^^^^^^^^^^^^ reference local 59
@@ -858,6 +914,7 @@ private SwipeBuilder(RecyclerView recyclerView) {
 //                                    ^^^^^^^^^^^^ definition local 60
 //                                                 display_name recyclerView
 //                                                 signature_documentation java unresolved_type recyclerView
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#`<init>`().
       this.recyclerView = recyclerView;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView.
 //                        ^^^^^^^^^^^^ reference local 60
@@ -922,6 +979,7 @@ public SwipeBuilder2 withDirections(int directionFlags) {
 //                                          ^^^^^^^^^^^^^^ definition local 61
 //                                                         display_name directionFlags
 //                                                         signature_documentation java int directionFlags
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
       return new SwipeBuilder2(recyclerView, makeMovementFlags(0, directionFlags));
 //               ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#`<init>`().
 //                             ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView.
@@ -953,10 +1011,12 @@ private SwipeBuilder2(RecyclerView recyclerView,
 //                                     ^^^^^^^^^^^^ definition local 62
 //                                                  display_name recyclerView
 //                                                  signature_documentation java unresolved_type recyclerView
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#`<init>`().
         int movementFlags) {
 //          ^^^^^^^^^^^^^ definition local 63
 //                        display_name movementFlags
 //                        signature_documentation java int movementFlags
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#`<init>`().
       this.recyclerView = recyclerView;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView.
 //                        ^^^^^^^^^^^^ reference local 62
@@ -985,9 +1045,11 @@ public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelCl
 //                                                                     ^^^^^^^^^^^^^^^^ definition local 22
 //                                                                                      display_name targetModelClass
 //                                                                                      signature_documentation java Class<U> targetModelClass
+//                                                                                      enclosing_symbol local 21
 //                                                                     ^^^^^^^^^^^^^^^^ definition local 64
 //                                                                                      display_name targetModelClass
 //                                                                                      signature_documentation java Class<U> targetModelClass
+//                                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().
       List<Class<? extends EpoxyModel>> targetClasses = new ArrayList<>(1);
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
@@ -995,6 +1057,7 @@ public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelCl
 //                                      ^^^^^^^^^^^^^ definition local 65
 //                                                    display_name targetClasses
 //                                                    signature_documentation java List<Class<? extends EpoxyModel>> targetClasses
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().
 //                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
       targetClasses.add(targetModelClass);
 //    ^^^^^^^^^^^^^ reference local 65
@@ -1029,6 +1092,7 @@ public SwipeBuilder3<EpoxyModel> withTargets(
 //                                     ^^^^^^^^^^^^^^^^^^ definition local 66
 //                                                        display_name targetModelClasses
 //                                                        signature_documentation java Class<? extends EpoxyModel>[] targetModelClasses
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTargets().
       return new SwipeBuilder3<>(recyclerView, movementFlags, EpoxyModel.class,
 //               ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView.
@@ -1102,21 +1166,25 @@ private SwipeBuilder3(
 //                   ^^^^^^^^^^^^ definition local 67
 //                                display_name recyclerView
 //                                signature_documentation java unresolved_type recyclerView
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
 //                                     ^^^^^^^^^^^^^ definition local 68
 //                                                   display_name movementFlags
 //                                                   signature_documentation java int movementFlags
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
         Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //               ^^^^^^^^^^^^^^^^ definition local 69
 //                                display_name targetModelClass
 //                                signature_documentation java Class<U> targetModelClass
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                   ^^^^^^^^^^^^^^^^^^ definition local 70
 //                                                                                      display_name targetModelClasses
 //                                                                                      signature_documentation java List<Class<? extends EpoxyModel>> targetModelClasses
+//                                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
 
       this.recyclerView = recyclerView;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#recyclerView.
@@ -1156,11 +1224,13 @@ public ItemTouchHelper andCallbacks(final SwipeCallbacks<U> callbacks) {
 //                                                              ^^^^^^^^^ definition local 71
 //                                                                        display_name callbacks
 //                                                                        signature_documentation java final SwipeCallbacks<U> callbacks
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#andCallbacks().
       ItemTouchHelper itemTouchHelper =
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper#
 //                    ^^^^^^^^^^^^^^^ definition local 72
 //                                    display_name itemTouchHelper
 //                                    signature_documentation java unresolved_type itemTouchHelper
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#andCallbacks().
           new ItemTouchHelper(new EpoxyModelTouchCallback<U>(null, targetModelClass) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
 //                                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
@@ -1172,14 +1242,17 @@ public int getMovementFlagsForModel(U model, int adapterPosition) {
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 77
 //                                              display_name getMovementFlagsForModel
 //                                              signature_documentation java @Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)
+//                                              enclosing_symbol local 74
 //                                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                                ^^^^^ definition local 78
 //                                                      display_name model
 //                                                      signature_documentation java U model
+//                                                      enclosing_symbol local 77
 //                                                           ^^^^^^^^^^^^^^^ definition local 79
 //                                                                           display_name adapterPosition
 //                                                                           signature_documentation java int adapterPosition
+//                                                                           enclosing_symbol local 77
               return movementFlags;
 //                   ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#movementFlags.
             }
@@ -1190,15 +1263,18 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                            ^^^^^^^^^^^^^^^^ definition local 80
 //                                             display_name isTouchableModel
 //                                             signature_documentation java @Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)
+//                                             enclosing_symbol local 74
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 81
 //                                                                 display_name model
 //                                                                 signature_documentation java EpoxyModel<?> model
+//                                                                 enclosing_symbol local 80
               boolean isTargetType = targetModelClasses.size() == 1
 //                    ^^^^^^^^^^^^ definition local 82
 //                                 display_name isTargetType
 //                                 signature_documentation java boolean isTargetType
+//                                 enclosing_symbol local 80
 //                                   ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClasses.
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
                   ? super.isTouchableModel(model)
@@ -1226,19 +1302,23 @@ public void onSwipeStarted(U model, View itemView, int adapterPosition) {
 //                      ^^^^^^^^^^^^^^ definition local 84
 //                                     display_name onSwipeStarted
 //                                     signature_documentation java @Override\npublic void onSwipeStarted(U model, unresolved_type itemView, int adapterPosition)
+//                                     enclosing_symbol local 74
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                       ^^^^^ definition local 85
 //                                             display_name model
 //                                             signature_documentation java U model
+//                                             enclosing_symbol local 84
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 86
 //                                                            display_name itemView
 //                                                            signature_documentation java unresolved_type itemView
+//                                                            enclosing_symbol local 84
 //                                                                 ^^^^^^^^^^^^^^^ definition local 87
 //                                                                                 display_name adapterPosition
 //                                                                                 signature_documentation java int adapterPosition
+//                                                                                 enclosing_symbol local 84
               callbacks.onSwipeStarted(model, itemView, adapterPosition);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
@@ -1253,24 +1333,29 @@ public void onSwipeProgressChanged(U model, View itemView, float swipeProgress,
 //                      ^^^^^^^^^^^^^^^^^^^^^^ definition local 88
 //                                             display_name onSwipeProgressChanged
 //                                             signature_documentation java @Override\npublic void onSwipeProgressChanged(U model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
+//                                             enclosing_symbol local 74
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                               ^^^^^ definition local 89
 //                                                     display_name model
 //                                                     signature_documentation java U model
+//                                                     enclosing_symbol local 88
 //                                                      ^^^^ reference semanticdb maven . . View#
 //                                                           ^^^^^^^^ definition local 90
 //                                                                    display_name itemView
 //                                                                    signature_documentation java unresolved_type itemView
+//                                                                    enclosing_symbol local 88
 //                                                                           ^^^^^^^^^^^^^ definition local 91
 //                                                                                         display_name swipeProgress
 //                                                                                         signature_documentation java float swipeProgress
+//                                                                                         enclosing_symbol local 88
                 Canvas canvas) {
 //              ^^^^^^ reference semanticdb maven . . Canvas#
 //                     ^^^^^^ definition local 92
 //                            display_name canvas
 //                            signature_documentation java unresolved_type canvas
+//                            enclosing_symbol local 88
               callbacks.onSwipeProgressChanged(model, itemView, swipeProgress, canvas);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
@@ -1286,22 +1371,27 @@ public void onSwipeCompleted(U model, View itemView, int position, int direction
 //                      ^^^^^^^^^^^^^^^^ definition local 93
 //                                       display_name onSwipeCompleted
 //                                       signature_documentation java @Override\npublic void onSwipeCompleted(U model, unresolved_type itemView, int position, int direction)
+//                                       enclosing_symbol local 74
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                         ^^^^^ definition local 94
 //                                               display_name model
 //                                               signature_documentation java U model
+//                                               enclosing_symbol local 93
 //                                                ^^^^ reference semanticdb maven . . View#
 //                                                     ^^^^^^^^ definition local 95
 //                                                              display_name itemView
 //                                                              signature_documentation java unresolved_type itemView
+//                                                              enclosing_symbol local 93
 //                                                                   ^^^^^^^^ definition local 96
 //                                                                            display_name position
 //                                                                            signature_documentation java int position
+//                                                                            enclosing_symbol local 93
 //                                                                                 ^^^^^^^^^ definition local 97
 //                                                                                           display_name direction
 //                                                                                           signature_documentation java int direction
+//                                                                                           enclosing_symbol local 93
               callbacks.onSwipeCompleted(model, itemView, position, direction);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
@@ -1317,16 +1407,19 @@ public void onSwipeReleased(U model, View itemView) {
 //                      ^^^^^^^^^^^^^^^ definition local 98
 //                                      display_name onSwipeReleased
 //                                      signature_documentation java @Override\npublic void onSwipeReleased(U model, unresolved_type itemView)
+//                                      enclosing_symbol local 74
 //                                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                        ^^^^^ definition local 99
 //                                              display_name model
 //                                              signature_documentation java U model
+//                                              enclosing_symbol local 98
 //                                               ^^^^ reference semanticdb maven . . View#
 //                                                    ^^^^^^^^ definition local 100
 //                                                             display_name itemView
 //                                                             signature_documentation java unresolved_type itemView
+//                                                             enclosing_symbol local 98
               callbacks.onSwipeReleased(model, itemView);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
@@ -1340,6 +1433,7 @@ public void clearView(U model, View itemView) {
 //                      ^^^^^^^^^ definition local 101
 //                                display_name clearView
 //                                signature_documentation java @Override\npublic void clearView(U model, unresolved_type itemView)
+//                                enclosing_symbol local 74
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
@@ -1349,10 +1443,12 @@ public void clearView(U model, View itemView) {
 //                                  ^^^^^ definition local 102
 //                                        display_name model
 //                                        signature_documentation java U model
+//                                        enclosing_symbol local 101
 //                                         ^^^^ reference semanticdb maven . . View#
 //                                              ^^^^^^^^ definition local 103
 //                                                       display_name itemView
 //                                                       signature_documentation java unresolved_type itemView
+//                                                       enclosing_symbol local 101
               callbacks.clearView(model, itemView);
 //            ^^^^^^^^^ reference local 71
 //                      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView().
@@ -1399,13 +1495,16 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //                               ^^^^^ definition local 104
 //                                     display_name model
 //                                     signature_documentation java T model
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^^^^ definition local 105
 //                                                    display_name itemView
 //                                                    signature_documentation java unresolved_type itemView
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
 //                                                         ^^^^^^^^^^^^^^^ definition local 106
 //                                                                         display_name adapterPosition
 //                                                                         signature_documentation java int adapterPosition
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
 
     }
 
@@ -1420,18 +1519,22 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //                                       ^^^^^ definition local 107
 //                                             display_name model
 //                                             signature_documentation java T model
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
 //                                              ^^^^ reference semanticdb maven . . View#
 //                                                   ^^^^^^^^ definition local 108
 //                                                            display_name itemView
 //                                                            signature_documentation java unresolved_type itemView
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
 //                                                                   ^^^^^^^^^^^^^ definition local 109
 //                                                                                 display_name swipeProgress
 //                                                                                 signature_documentation java float swipeProgress
+//                                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
         Canvas canvas) {
 //      ^^^^^^ reference semanticdb maven . . Canvas#
 //             ^^^^^^ definition local 110
 //                    display_name canvas
 //                    signature_documentation java unresolved_type canvas
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
 
     }
 
@@ -1446,16 +1549,20 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //                                          ^^^^^ definition local 111
 //                                                display_name model
 //                                                signature_documentation java T model
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
 //                                                 ^^^^ reference semanticdb maven . . View#
 //                                                      ^^^^^^^^ definition local 112
 //                                                               display_name itemView
 //                                                               signature_documentation java unresolved_type itemView
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
 //                                                                    ^^^^^^^^ definition local 113
 //                                                                             display_name position
 //                                                                             signature_documentation java int position
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
 //                                                                                  ^^^^^^^^^ definition local 114
 //                                                                                            display_name direction
 //                                                                                            signature_documentation java int direction
+//                                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -1468,10 +1575,12 @@ public void onSwipeReleased(T model, View itemView) {
 //                                ^^^^^ definition local 115
 //                                      display_name model
 //                                      signature_documentation java T model
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
 //                                       ^^^^ reference semanticdb maven . . View#
 //                                            ^^^^^^^^ definition local 116
 //                                                     display_name itemView
 //                                                     signature_documentation java unresolved_type itemView
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
 
     }
 
@@ -1486,10 +1595,12 @@ public void clearView(T model, View itemView) {
 //                          ^^^^^ definition local 117
 //                                display_name model
 //                                signature_documentation java T model
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView().
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^^^^^ definition local 118
 //                                               display_name itemView
 //                                               signature_documentation java unresolved_type itemView
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView().
 
     }
 
@@ -1507,6 +1618,7 @@ public boolean isSwipeEnabledForModel(T model) {
 //                                          ^^^^^ definition local 119
 //                                                display_name model
 //                                                signature_documentation java T model
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#isSwipeEnabledForModel().
       return true;
     }
 
@@ -1521,9 +1633,11 @@ public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                                              ^^^^^ definition local 120
 //                                                    display_name model
 //                                                    signature_documentation java T model
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel().
 //                                                         ^^^^^^^^^^^^^^^ definition local 121
 //                                                                         display_name adapterPosition
 //                                                                         signature_documentation java int adapterPosition
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel().
       // Not used
       return 0;
     }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
index 95ebd2f29..21cd94033 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
@@ -54,10 +54,12 @@ public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHold
 //                                               ^^^^^^^^^^^^ definition local 0
 //                                                            display_name recyclerView
 //                                                            signature_documentation java unresolved_type recyclerView
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
 //                                                             ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                        ^^^^^^^^^^ definition local 1
 //                                                                                   display_name viewHolder
 //                                                                                   signature_documentation java unresolved_type viewHolder
+//                                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
     return getMovementFlags(recyclerView, (EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
 //                          ^^^^^^^^^^^^ reference local 0
@@ -78,10 +80,12 @@ public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHold
 //                                                     ^^^^^^^^^^^^ definition local 2
 //                                                                  display_name recyclerView
 //                                                                  signature_documentation java unresolved_type recyclerView
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(+1).
 //                                                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                   ^^^^^^^^^^ definition local 3
 //                                                                                              display_name viewHolder
 //                                                                                              signature_documentation java EpoxyViewHolder viewHolder
+//                                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(+1).
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -94,14 +98,17 @@ public final boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder, Vi
 //                                         ^^^^^^^^^^^^ definition local 4
 //                                                      display_name recyclerView
 //                                                      signature_documentation java unresolved_type recyclerView
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 5
 //                                                                             display_name viewHolder
 //                                                                             signature_documentation java unresolved_type viewHolder
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                                                                              ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                                         ^^^^^^ definition local 6
 //                                                                                                display_name target
 //                                                                                                signature_documentation java unresolved_type target
+//                                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
     return onMove(recyclerView, (EpoxyViewHolder) viewHolder, (EpoxyViewHolder) target);
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                ^^^^^^^^^^^^ reference local 4
@@ -124,15 +131,18 @@ protected abstract boolean onMove(RecyclerView recyclerView, EpoxyViewHolder vie
 //                                               ^^^^^^^^^^^^ definition local 7
 //                                                            display_name recyclerView
 //                                                            signature_documentation java unresolved_type recyclerView
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
 //                                                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                             ^^^^^^^^^^ definition local 8
 //                                                                                        display_name viewHolder
 //                                                                                        signature_documentation java EpoxyViewHolder viewHolder
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
       EpoxyViewHolder target);
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 9
 //                           display_name target
 //                           signature_documentation java EpoxyViewHolder target
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -145,9 +155,11 @@ public final void onSwiped(ViewHolder viewHolder, int direction) {
 //                                      ^^^^^^^^^^ definition local 10
 //                                                 display_name viewHolder
 //                                                 signature_documentation java unresolved_type viewHolder
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
 //                                                      ^^^^^^^^^ definition local 11
 //                                                                display_name direction
 //                                                                signature_documentation java int direction
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
     onSwiped((EpoxyViewHolder) viewHolder, direction);
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
 //            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -167,9 +179,11 @@ public final void onSwiped(ViewHolder viewHolder, int direction) {
 //                                                 ^^^^^^^^^^ definition local 12
 //                                                            display_name viewHolder
 //                                                            signature_documentation java EpoxyViewHolder viewHolder
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped(+-1).
 //                                                                 ^^^^^^^^^ definition local 13
 //                                                                           display_name direction
 //                                                                           signature_documentation java int direction
+//                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped(+-1).
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -182,15 +196,18 @@ public final boolean canDropOver(RecyclerView recyclerView, ViewHolder current,
 //                                              ^^^^^^^^^^^^ definition local 14
 //                                                           display_name recyclerView
 //                                                           signature_documentation java unresolved_type recyclerView
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                       ^^^^^^^ definition local 15
 //                                                                               display_name current
 //                                                                               signature_documentation java unresolved_type current
+//                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
       ViewHolder target) {
 //    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //               ^^^^^^ definition local 16
 //                      display_name target
 //                      signature_documentation java unresolved_type target
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
     return canDropOver(recyclerView, (EpoxyViewHolder) current, (EpoxyViewHolder) target);
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
 //                     ^^^^^^^^^^^^ reference local 14
@@ -213,15 +230,18 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current
 //                                           ^^^^^^^^^^^^ definition local 17
 //                                                        display_name recyclerView
 //                                                        signature_documentation java unresolved_type recyclerView
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
 //                                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                         ^^^^^^^ definition local 18
 //                                                                                 display_name current
 //                                                                                 signature_documentation java EpoxyViewHolder current
+//                                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
       EpoxyViewHolder target) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 19
 //                           display_name target
 //                           signature_documentation java EpoxyViewHolder target
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
     return super.canDropOver(recyclerView, current, target);
 //         ^^^^^ reference semanticdb maven . . super#
 //               ^^^^^^^^^^^ reference semanticdb maven . . super#canDropOver#
@@ -240,6 +260,7 @@ public final float getSwipeThreshold(ViewHolder viewHolder) {
 //                                                ^^^^^^^^^^ definition local 20
 //                                                           display_name viewHolder
 //                                                           signature_documentation java unresolved_type viewHolder
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold().
     return getSwipeThreshold((EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold().
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -258,6 +279,7 @@ protected float getSwipeThreshold(EpoxyViewHolder viewHolder) {
 //                                                  ^^^^^^^^^^ definition local 21
 //                                                             display_name viewHolder
 //                                                             signature_documentation java EpoxyViewHolder viewHolder
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold(+-1).
     return super.getSwipeThreshold(viewHolder);
 //         ^^^^^ reference semanticdb maven . . super#
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . super#getSwipeThreshold#
@@ -274,6 +296,7 @@ public final float getMoveThreshold(ViewHolder viewHolder) {
 //                                               ^^^^^^^^^^ definition local 22
 //                                                          display_name viewHolder
 //                                                          signature_documentation java unresolved_type viewHolder
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold().
     return getMoveThreshold((EpoxyViewHolder) viewHolder);
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold().
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -292,6 +315,7 @@ protected float getMoveThreshold(EpoxyViewHolder viewHolder) {
 //                                                 ^^^^^^^^^^ definition local 23
 //                                                            display_name viewHolder
 //                                                            signature_documentation java EpoxyViewHolder viewHolder
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold(+-1).
     return super.getMoveThreshold(viewHolder);
 //         ^^^^^ reference semanticdb maven . . super#
 //               ^^^^^^^^^^^^^^^^ reference semanticdb maven . . super#getMoveThreshold#
@@ -309,17 +333,21 @@ public final ViewHolder chooseDropTarget(ViewHolder selected, List dropTargets,
 //                                                    ^^^^^^^^ definition local 24
 //                                                             display_name selected
 //                                                             signature_documentation java unresolved_type selected
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget().
 //                                                              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                   ^^^^^^^^^^^ definition local 25
 //                                                                               display_name dropTargets
 //                                                                               signature_documentation java List dropTargets
+//                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget().
 //                                                                                    ^^^^ definition local 26
 //                                                                                         display_name curX
 //                                                                                         signature_documentation java int curX
+//                                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget().
       int curY) {
 //        ^^^^ definition local 27
 //             display_name curY
 //             signature_documentation java int curY
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget().
     //noinspection unchecked
     return chooseDropTarget((EpoxyViewHolder) selected, (List<EpoxyViewHolder>) dropTargets, curX,
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
@@ -346,18 +374,22 @@ protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected,
 //                                                           ^^^^^^^^ definition local 28
 //                                                                    display_name selected
 //                                                                    signature_documentation java EpoxyViewHolder selected
+//                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
       List<EpoxyViewHolder> dropTargets, int curX, int curY) {
 //    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                          ^^^^^^^^^^^ definition local 29
 //                                      display_name dropTargets
 //                                      signature_documentation java List<EpoxyViewHolder> dropTargets
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
 //                                           ^^^^ definition local 30
 //                                                display_name curX
 //                                                signature_documentation java int curX
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
 //                                                     ^^^^ definition local 31
 //                                                          display_name curY
 //                                                          signature_documentation java int curY
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
 
     //noinspection unchecked
     return (EpoxyViewHolder) super.chooseDropTarget(selected, (List) dropTargets, curX, curY);
@@ -382,9 +414,11 @@ public final void onSelectedChanged(ViewHolder viewHolder, int actionState) {
 //                                               ^^^^^^^^^^ definition local 32
 //                                                          display_name viewHolder
 //                                                          signature_documentation java unresolved_type viewHolder
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
 //                                                               ^^^^^^^^^^^ definition local 33
 //                                                                           display_name actionState
 //                                                                           signature_documentation java int actionState
+//                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
     onSelectedChanged((EpoxyViewHolder) viewHolder, actionState);
 //  ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
 //                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -404,9 +438,11 @@ protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) {
 //                                                 ^^^^^^^^^^ definition local 34
 //                                                            display_name viewHolder
 //                                                            signature_documentation java EpoxyViewHolder viewHolder
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged(+-1).
 //                                                                 ^^^^^^^^^^^ definition local 35
 //                                                                             display_name actionState
 //                                                                             signature_documentation java int actionState
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged(+-1).
     super.onSelectedChanged(viewHolder, actionState);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . super#onSelectedChanged#
@@ -424,27 +460,34 @@ public final void onMoved(RecyclerView recyclerView, ViewHolder viewHolder, int
 //                                       ^^^^^^^^^^^^ definition local 36
 //                                                    display_name recyclerView
 //                                                    signature_documentation java unresolved_type recyclerView
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
 //                                                     ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                ^^^^^^^^^^ definition local 37
 //                                                                           display_name viewHolder
 //                                                                           signature_documentation java unresolved_type viewHolder
+//                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
 //                                                                                ^^^^^^^ definition local 38
 //                                                                                        display_name fromPos
 //                                                                                        signature_documentation java int fromPos
+//                                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
       ViewHolder target, int toPos, int x, int y) {
 //    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //               ^^^^^^ definition local 39
 //                      display_name target
 //                      signature_documentation java unresolved_type target
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
 //                           ^^^^^ definition local 40
 //                                 display_name toPos
 //                                 signature_documentation java int toPos
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
 //                                      ^ definition local 41
 //                                        display_name x
 //                                        signature_documentation java int x
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
 //                                             ^ definition local 42
 //                                               display_name y
 //                                               signature_documentation java int y
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
 
     onMoved(recyclerView, (EpoxyViewHolder) viewHolder, fromPos, (EpoxyViewHolder) target, toPos, x,
 //  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
@@ -472,27 +515,34 @@ protected void onMoved(RecyclerView recyclerView, EpoxyViewHolder viewHolder, in
 //                                    ^^^^^^^^^^^^ definition local 43
 //                                                 display_name recyclerView
 //                                                 signature_documentation java unresolved_type recyclerView
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
 //                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 44
 //                                                                             display_name viewHolder
 //                                                                             signature_documentation java EpoxyViewHolder viewHolder
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
 //                                                                                  ^^^^^^^ definition local 45
 //                                                                                          display_name fromPos
 //                                                                                          signature_documentation java int fromPos
+//                                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
       EpoxyViewHolder target, int toPos, int x, int y) {
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                    ^^^^^^ definition local 46
 //                           display_name target
 //                           signature_documentation java EpoxyViewHolder target
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
 //                                ^^^^^ definition local 47
 //                                      display_name toPos
 //                                      signature_documentation java int toPos
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
 //                                           ^ definition local 48
 //                                             display_name x
 //                                             signature_documentation java int x
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
 //                                                  ^ definition local 49
 //                                                    display_name y
 //                                                    signature_documentation java int y
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
     super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^ reference semanticdb maven . . super#onMoved#
@@ -517,10 +567,12 @@ public final void clearView(RecyclerView recyclerView, ViewHolder viewHolder) {
 //                                         ^^^^^^^^^^^^ definition local 50
 //                                                      display_name recyclerView
 //                                                      signature_documentation java unresolved_type recyclerView
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                  ^^^^^^^^^^ definition local 51
 //                                                                             display_name viewHolder
 //                                                                             signature_documentation java unresolved_type viewHolder
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
     clearView(recyclerView, (EpoxyViewHolder) viewHolder);
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //            ^^^^^^^^^^^^ reference local 50
@@ -542,10 +594,12 @@ protected void clearView(RecyclerView recyclerView, EpoxyViewHolder viewHolder)
 //                                      ^^^^^^^^^^^^ definition local 52
 //                                                   display_name recyclerView
 //                                                   signature_documentation java unresolved_type recyclerView
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                    ^^^^^^^^^^ definition local 53
 //                                                                               display_name viewHolder
 //                                                                               signature_documentation java EpoxyViewHolder viewHolder
+//                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
     super.clearView(recyclerView, viewHolder);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^ reference semanticdb maven . . super#clearView#
@@ -564,28 +618,35 @@ public final void onChildDraw(Canvas c, RecyclerView recyclerView, ViewHolder vi
 //                                     ^ definition local 54
 //                                       display_name c
 //                                       signature_documentation java unresolved_type c
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                     ^^^^^^^^^^^^ definition local 55
 //                                                                  display_name recyclerView
 //                                                                  signature_documentation java unresolved_type recyclerView
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                                                                   ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                              ^^^^^^^^^^ definition local 56
 //                                                                                         display_name viewHolder
 //                                                                                         signature_documentation java unresolved_type viewHolder
+//                                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
       float dX,
 //          ^^ definition local 57
 //             display_name dX
 //             signature_documentation java float dX
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
       float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 58
 //             display_name dY
 //             signature_documentation java float dY
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                  ^^^^^^^^^^^ definition local 59
 //                              display_name actionState
 //                              signature_documentation java int actionState
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                                       ^^^^^^^^^^^^^^^^^ definition local 60
 //                                                         display_name isCurrentlyActive
 //                                                         signature_documentation java boolean isCurrentlyActive
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 
     onChildDraw(c, recyclerView, (EpoxyViewHolder) viewHolder, dX, dY, actionState,
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
@@ -613,27 +674,34 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //                                  ^ definition local 61
 //                                    display_name c
 //                                    signature_documentation java unresolved_type c
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                  ^^^^^^^^^^^^ definition local 62
 //                                                               display_name recyclerView
 //                                                               signature_documentation java unresolved_type recyclerView
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                ^^^^^^^^^^ definition local 63
 //                                                                                           display_name viewHolder
 //                                                                                           signature_documentation java EpoxyViewHolder viewHolder
+//                                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 64
 //             display_name dX
 //             signature_documentation java float dX
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                    ^^ definition local 65
 //                       display_name dY
 //                       signature_documentation java float dY
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                            ^^^^^^^^^^^ definition local 66
 //                                        display_name actionState
 //                                        signature_documentation java int actionState
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 67
 //                                                                   display_name isCurrentlyActive
 //                                                                   signature_documentation java boolean isCurrentlyActive
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
     super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^^^^^^^ reference semanticdb maven . . super#onChildDraw#
@@ -656,28 +724,35 @@ public final void onChildDrawOver(Canvas c, RecyclerView recyclerView, ViewHolde
 //                                         ^ definition local 68
 //                                           display_name c
 //                                           signature_documentation java unresolved_type c
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
 //                                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                         ^^^^^^^^^^^^ definition local 69
 //                                                                      display_name recyclerView
 //                                                                      signature_documentation java unresolved_type recyclerView
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
 //                                                                       ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                                                  ^^^^^^^^^^ definition local 70
 //                                                                                             display_name viewHolder
 //                                                                                             signature_documentation java unresolved_type viewHolder
+//                                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
       float dX,
 //          ^^ definition local 71
 //             display_name dX
 //             signature_documentation java float dX
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
       float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 72
 //             display_name dY
 //             signature_documentation java float dY
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
 //                  ^^^^^^^^^^^ definition local 73
 //                              display_name actionState
 //                              signature_documentation java int actionState
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
 //                                       ^^^^^^^^^^^^^^^^^ definition local 74
 //                                                         display_name isCurrentlyActive
 //                                                         signature_documentation java boolean isCurrentlyActive
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
 
     onChildDrawOver(c, recyclerView, (EpoxyViewHolder) viewHolder, dX, dY, actionState,
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
@@ -704,27 +779,34 @@ protected void onChildDrawOver(Canvas c, RecyclerView recyclerView, EpoxyViewHol
 //                                      ^ definition local 75
 //                                        display_name c
 //                                        signature_documentation java unresolved_type c
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                      ^^^^^^^^^^^^ definition local 76
 //                                                                   display_name recyclerView
 //                                                                   signature_documentation java unresolved_type recyclerView
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
 //                                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                                                    ^^^^^^^^^^ definition local 77
 //                                                                                               display_name viewHolder
 //                                                                                               signature_documentation java EpoxyViewHolder viewHolder
+//                                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
       float dX, float dY, int actionState, boolean isCurrentlyActive) {
 //          ^^ definition local 78
 //             display_name dX
 //             signature_documentation java float dX
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
 //                    ^^ definition local 79
 //                       display_name dY
 //                       signature_documentation java float dY
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
 //                            ^^^^^^^^^^^ definition local 80
 //                                        display_name actionState
 //                                        signature_documentation java int actionState
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
 //                                                 ^^^^^^^^^^^^^^^^^ definition local 81
 //                                                                   display_name isCurrentlyActive
 //                                                                   signature_documentation java boolean isCurrentlyActive
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
 
     super.onChildDrawOver(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
 //  ^^^^^ reference semanticdb maven . . super#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
index 987e9edaf..d98d98066 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
@@ -98,13 +98,16 @@ public EpoxyViewHolder(ViewParent parent, View view, boolean saveInitialState) {
 //                                  ^^^^^^ definition local 0
 //                                         display_name parent
 //                                         signature_documentation java unresolved_type parent
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#`<init>`().
 //                                          ^^^^ reference semanticdb maven . . View#
 //                                               ^^^^ definition local 1
 //                                                    display_name view
 //                                                    signature_documentation java unresolved_type view
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#`<init>`().
 //                                                             ^^^^^^^^^^^^^^^^ definition local 2
 //                                                                              display_name saveInitialState
 //                                                                              signature_documentation java boolean saveInitialState
+//                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#`<init>`().
     super(view);
 //        ^^^^ reference local 1
 
@@ -148,20 +151,24 @@ public void bind(@SuppressWarnings("rawtypes") EpoxyModel model,
 //                                                          ^^^^^ definition local 3
 //                                                                display_name model
 //                                                                signature_documentation java @SuppressWarnings("rawtypes")\nEpoxyModel model
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#bind().
       @Nullable EpoxyModel<?> previouslyBoundModel, List<Object> payloads, int position) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^^^^^^^^^^ definition local 4
 //                                                 display_name previouslyBoundModel
 //                                                 signature_documentation java @Nullable\nEpoxyModel<?> previouslyBoundModel
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#bind().
 //                                                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                               ^^^^^^^^ definition local 5
 //                                                                        display_name payloads
 //                                                                        signature_documentation java List<Object> payloads
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#bind().
 //                                                                             ^^^^^^^^ definition local 6
 //                                                                                      display_name position
 //                                                                                      signature_documentation java int position
+//                                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#bind().
     this.payloads = payloads;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#payloads.
 //                  ^^^^^^^^ reference local 5
@@ -280,6 +287,7 @@ public void visibilityStateChanged(@Visibility int visibilityState) {
 //                                                   ^^^^^^^^^^^^^^^ definition local 7
 //                                                                   display_name visibilityState
 //                                                                   signature_documentation java @Visibility\nint visibilityState
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityStateChanged().
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     // noinspection unchecked
@@ -301,6 +309,7 @@ public void visibilityChanged(
 //                                                ^^^^^^^^^^^^^^^^^^^^ definition local 8
 //                                                                     display_name percentVisibleHeight
 //                                                                     signature_documentation java @FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleHeight
+//                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityChanged().
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
@@ -308,16 +317,19 @@ public void visibilityChanged(
 //                                                ^^^^^^^^^^^^^^^^^^^ definition local 9
 //                                                                    display_name percentVisibleWidth
 //                                                                    signature_documentation java @FloatRange(from = 0.0f, to = 100.0f)\nfloat percentVisibleWidth
+//                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityChanged().
       @Px int visibleHeight,
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 10
 //                          display_name visibleHeight
 //                          signature_documentation java @Px\nint visibleHeight
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityChanged().
       @Px int visibleWidth
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^ definition local 11
 //                         display_name visibleWidth
 //                         signature_documentation java @Px\nint visibleWidth
+//                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityChanged().
   ) {
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
index 84a0528d1..d9283c54f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
@@ -24,13 +24,16 @@ public interface GeneratedModel<T> {
 //                                   ^^^^^^ definition local 0
 //                                          display_name holder
 //                                          signature_documentation java EpoxyViewHolder holder
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePreBind().
 //                                           ^ reference semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
 //                                             ^^^^^^^^^^^^ definition local 1
 //                                                          display_name objectToBind
 //                                                          signature_documentation java T objectToBind
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePreBind().
 //                                                               ^^^^^^^^ definition local 2
 //                                                                        display_name position
 //                                                                        signature_documentation java int position
+//                                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePreBind().
   /**
    * Called on the generated model immediately after the main model onBind method has been called.
    * This let's the generated model handle binding of its own and dispatch calls to its onBind
@@ -49,7 +52,9 @@ public interface GeneratedModel<T> {
 //                      ^^^^^^^^^^^^ definition local 3
 //                                   display_name objectToBind
 //                                   signature_documentation java T objectToBind
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePostBind().
 //                                        ^^^^^^^^ definition local 4
 //                                                 display_name position
 //                                                 signature_documentation java int position
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePostBind().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
index e7af2dc91..3af455e9b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
@@ -47,6 +47,7 @@ class HandlerExecutor implements Executor {
 //                        ^^^^^^^ definition local 0
 //                                display_name handler
 //                                signature_documentation java unresolved_type handler
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#`<init>`().
     this.handler = handler;
 //       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
 //                 ^^^^^^^ reference local 0
@@ -64,6 +65,7 @@ public void execute(@NonNull Runnable command) {
 //                                      ^^^^^^^ definition local 1
 //                                              display_name command
 //                                              signature_documentation java @NonNull\nRunnable command
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#execute().
     // If we're already on the same thread then we can execute this synchronously
     if (Looper.myLooper() == handler.getLooper()) {
 //      ^^^^^^ reference semanticdb maven . . Looper#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
index d082e27eb..7279603b9 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
@@ -51,12 +51,15 @@ public int getSpanSize(int spanCount, int position, int itemCount) {
 //                           ^^^^^^^^^ definition local 0
 //                                     display_name spanCount
 //                                     signature_documentation java int spanCount
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
 //                                          ^^^^^^^^ definition local 1
 //                                                   display_name position
 //                                                   signature_documentation java int position
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
 //                                                        ^^^^^^^^^ definition local 2
 //                                                                  display_name itemCount
 //                                                                  signature_documentation java int itemCount
+//                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
     return 0;
   }
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
index feef94178..5a7c6ee2f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
@@ -35,6 +35,7 @@ public static long hashLong64Bit(long value) {
 //                                      ^^^^^ definition local 0
 //                                            display_name value
 //                                            signature_documentation java long value
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IdUtils#hashLong64Bit().
     value ^= (value << 21);
 //  ^^^^^ reference local 0
 //            ^^^^^ reference local 0
@@ -67,6 +68,7 @@ public static long hashString64Bit(@Nullable CharSequence str) {
 //                                                          ^^^ definition local 1
 //                                                              display_name str
 //                                                              signature_documentation java @Nullable\nCharSequence str
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
     if (str == null) {
 //      ^^^ reference local 1
       return 0;
@@ -76,16 +78,19 @@ public static long hashString64Bit(@Nullable CharSequence str) {
 //       ^^^^^^ definition local 2
 //              display_name result
 //              signature_documentation java long result
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
     final int len = str.length();
 //            ^^^ definition local 3
 //                display_name len
 //                signature_documentation java final int len
+//                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                  ^^^ reference local 1
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     for (int i = 0; i < len; i++) {
 //           ^ definition local 4
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                  ^ reference local 4
 //                      ^^^ reference local 3
 //                           ^ reference local 4
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
index cdf924f76..53367faec 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
@@ -17,6 +17,7 @@ public IllegalEpoxyUsage(String message) {
 //                                ^^^^^^^ definition local 0
 //                                        display_name message
 //                                        signature_documentation java String message
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IllegalEpoxyUsage#`<init>`().
     super(message);
 //  ^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+1).
 //        ^^^^^^^ reference local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
index 74d376cb8..6c51c9084 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
@@ -39,9 +39,11 @@ class ImmutableModelException extends RuntimeException {
 //                                   ^^^^^ definition local 0
 //                                         display_name model
 //                                         signature_documentation java EpoxyModel model
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`().
 //                                              ^^^^^^^^^^^^^ definition local 1
 //                                                            display_name modelPosition
 //                                                            signature_documentation java int modelPosition
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`().
     this(model, "", modelPosition);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
 //       ^^^^^ reference local 0
@@ -56,14 +58,17 @@ class ImmutableModelException extends RuntimeException {
 //                                   ^^^^^ definition local 2
 //                                         display_name model
 //                                         signature_documentation java EpoxyModel model
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
       String descriptionOfWhenChangeHappened, int modelPosition) {
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 3
 //                                           display_name descriptionOfWhenChangeHappened
 //                                           signature_documentation java String descriptionOfWhenChangeHappened
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
 //                                                ^^^^^^^^^^^^^ definition local 4
 //                                                              display_name modelPosition
 //                                                              signature_documentation java int modelPosition
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
     super(buildMessage(model, descriptionOfWhenChangeHappened, modelPosition));
 //  ^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#`<init>`(+1).
 //        ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#buildMessage().
@@ -83,14 +88,17 @@ private static String buildMessage(EpoxyModel model,
 //                                              ^^^^^ definition local 5
 //                                                    display_name model
 //                                                    signature_documentation java EpoxyModel model
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#buildMessage().
       String descriptionOfWhenChangeHappened, int modelPosition) {
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 6
 //                                           display_name descriptionOfWhenChangeHappened
 //                                           signature_documentation java String descriptionOfWhenChangeHappened
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#buildMessage().
 //                                                ^^^^^^^^^^^^^ definition local 7
 //                                                              display_name modelPosition
 //                                                              signature_documentation java int modelPosition
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#buildMessage().
     return new StringBuilder(descriptionOfWhenChangeHappened)
 //             ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/StringBuilder#`<init>`(+2).
 //                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local 6
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
index 9814c2e09..67a5c448c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
@@ -44,11 +44,13 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
 //                                                       ^ definition local 0
 //                                                         display_name v
 //                                                         signature_documentation java unresolved_type v
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
     RecyclerView recyclerView = findParentRecyclerView(v);
 //  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //               ^^^^^^^^^^^^ definition local 1
 //                            display_name recyclerView
 //                            signature_documentation java unresolved_type recyclerView
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
 //                              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
 //                                                     ^ reference local 0
     if (recyclerView == null) {
@@ -61,6 +63,7 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
 //             ^^^^^^^^^^ definition local 2
 //                        display_name viewHolder
 //                        signature_documentation java unresolved_type viewHolder
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
 //                          ^^^^^^^^^^^^ reference local 1
 //                                       ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#findContainingViewHolder#
 //                                                                ^ reference local 0
@@ -92,6 +95,7 @@ private static RecyclerView findParentRecyclerView(@Nullable View v) {
 //                                                                  ^ definition local 3
 //                                                                    display_name v
 //                                                                    signature_documentation java @Nullable\nunresolved_type v
+//                                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
     if (v == null) {
 //      ^ reference local 3
       return null;
@@ -102,6 +106,7 @@ private static RecyclerView findParentRecyclerView(@Nullable View v) {
 //             ^^^^^^ definition local 4
 //                    display_name parent
 //                    signature_documentation java unresolved_type parent
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
 //                      ^ reference local 3
 //                        ^^^^^^^^^ reference semanticdb maven . . View#getParent#
     if (parent instanceof RecyclerView) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
index ad2b5815b..7a8801ec1 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
@@ -38,6 +38,7 @@ class MainThreadExecutor extends HandlerExecutor {
 //                           ^^^^^ definition local 0
 //                                 display_name async
 //                                 signature_documentation java boolean async
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
     super(async ? AYSNC_MAIN_THREAD_HANDLER : MAIN_THREAD_HANDLER);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#`<init>`().
 //        ^^^^^ reference local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
index 20a40b844..d662367f2 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
@@ -67,6 +67,7 @@ class ModelList extends ArrayList<EpoxyModel<?>> {
 //              ^^^^^^^^^^^^^^^^^^ definition local 0
 //                                 display_name expectedModelCount
 //                                 signature_documentation java int expectedModelCount
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`().
     super(expectedModelCount);
 //  ^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
 //        ^^^^^^^^^^^^^^^^^^ reference local 0
@@ -90,9 +91,11 @@ interface ModelListObserver {
 //                               ^^^^^^^^^^^^^ definition local 1
 //                                             display_name positionStart
 //                                             signature_documentation java int positionStart
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
 //                                                  ^^^^^^^^^ definition local 2
 //                                                            display_name itemCount
 //                                                            signature_documentation java int itemCount
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
     void onItemRangeRemoved(int positionStart, int itemCount);
 //       ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
 //                          display_name onItemRangeRemoved
@@ -100,9 +103,11 @@ interface ModelListObserver {
 //                              ^^^^^^^^^^^^^ definition local 3
 //                                            display_name positionStart
 //                                            signature_documentation java int positionStart
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
 //                                                 ^^^^^^^^^ definition local 4
 //                                                           display_name itemCount
 //                                                           signature_documentation java int itemCount
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
   }
 
   private boolean notificationsPaused;
@@ -149,6 +154,7 @@ void setObserver(ModelListObserver observer) {
 //                                   ^^^^^^^^ definition local 5
 //                                            display_name observer
 //                                            signature_documentation java ModelListObserver observer
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#setObserver().
     this.observer = observer;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
 //                  ^^^^^^^^ reference local 5
@@ -161,9 +167,11 @@ private void notifyInsertion(int positionStart, int itemCount) {
 //                                 ^^^^^^^^^^^^^ definition local 6
 //                                               display_name positionStart
 //                                               signature_documentation java int positionStart
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                                                    ^^^^^^^^^ definition local 7
 //                                                              display_name itemCount
 //                                                              signature_documentation java int itemCount
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
     if (!notificationsPaused && observer != null) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
 //                              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
@@ -182,9 +190,11 @@ private void notifyRemoval(int positionStart, int itemCount) {
 //                               ^^^^^^^^^^^^^ definition local 8
 //                                             display_name positionStart
 //                                             signature_documentation java int positionStart
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#notifyRemoval().
 //                                                  ^^^^^^^^^ definition local 9
 //                                                            display_name itemCount
 //                                                            signature_documentation java int itemCount
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#notifyRemoval().
     if (!notificationsPaused && observer != null) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
 //                              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
@@ -209,15 +219,18 @@ public EpoxyModel<?> set(int index, EpoxyModel<?> element) {
 //                             ^^^^^ definition local 10
 //                                   display_name index
 //                                   signature_documentation java int index
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#set().
 //                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                  ^^^^^^^ definition local 11
 //                                                          display_name element
 //                                                          signature_documentation java EpoxyModel<?> element
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#set().
     EpoxyModel<?> previousModel = super.set(index, element);
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                ^^^^^^^^^^^^^ definition local 12
 //                              display_name previousModel
 //                              signature_documentation java EpoxyModel<?> previousModel
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#set().
 //                                ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#super.
 //                                      ^^^ reference semanticdb maven jdk 11 java/util/ArrayList#set().
 //                                          ^^^^^ reference local 10
@@ -255,6 +268,7 @@ public boolean add(EpoxyModel<?> epoxyModel) {
 //                                 ^^^^^^^^^^ definition local 13
 //                                            display_name epoxyModel
 //                                            signature_documentation java EpoxyModel<?> epoxyModel
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#add().
     notifyInsertion(size(), 1);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                  ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
@@ -276,10 +290,12 @@ public void add(int index, EpoxyModel<?> element) {
 //                    ^^^^^ definition local 14
 //                          display_name index
 //                          signature_documentation java int index
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#add(+1).
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^^^ definition local 15
 //                                                 display_name element
 //                                                 signature_documentation java EpoxyModel<?> element
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#add(+1).
     notifyInsertion(index, 1);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                  ^^^^^ reference local 14
@@ -305,6 +321,7 @@ public boolean addAll(Collection<? extends EpoxyModel<?>> c) {
 //                                                          ^ definition local 16
 //                                                            display_name c
 //                                                            signature_documentation java Collection<? extends EpoxyModel<?>> c
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#addAll().
     notifyInsertion(size(), c.size());
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                  ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
@@ -328,11 +345,13 @@ public boolean addAll(int index, Collection<? extends EpoxyModel<?>> c) {
 //                          ^^^^^ definition local 17
 //                                display_name index
 //                                signature_documentation java int index
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ definition local 18
 //                                                                       display_name c
 //                                                                       signature_documentation java Collection<? extends EpoxyModel<?>> c
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
     notifyInsertion(index, c.size());
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                  ^^^^^ reference local 17
@@ -358,6 +377,7 @@ public EpoxyModel<?> remove(int index) {
 //                                ^^^^^ definition local 19
 //                                      display_name index
 //                                      signature_documentation java int index
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#remove().
     notifyRemoval(index, 1);
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notifyRemoval().
 //                ^^^^^ reference local 19
@@ -381,10 +401,12 @@ public boolean remove(Object o) {
 //                             ^ definition local 20
 //                               display_name o
 //                               signature_documentation java Object o
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#remove(+1).
     int index = indexOf(o);
 //      ^^^^^ definition local 21
 //            display_name index
 //            signature_documentation java int index
+//            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#remove(+1).
 //              ^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#indexOf().
 //                      ^ reference local 20
 
@@ -436,9 +458,11 @@ protected void removeRange(int fromIndex, int toIndex) {
 //                               ^^^^^^^^^ definition local 22
 //                                         display_name fromIndex
 //                                         signature_documentation java int fromIndex
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#removeRange().
 //                                              ^^^^^^^ definition local 23
 //                                                      display_name toIndex
 //                                                      signature_documentation java int toIndex
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#removeRange().
     if (fromIndex == toIndex) {
 //      ^^^^^^^^^ reference local 22
 //                   ^^^^^^^ reference local 23
@@ -471,6 +495,7 @@ public boolean removeAll(Collection<?> collection) {
 //                                       ^^^^^^^^^^ definition local 24
 //                                                  display_name collection
 //                                                  signature_documentation java Collection<?> collection
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#removeAll().
     // Using this implementation from the Android ArrayList since the Java 1.8 ArrayList
     // doesn't call through to remove. Calling through to remove lets us leverage the notification
     // done there
@@ -478,11 +503,13 @@ public boolean removeAll(Collection<?> collection) {
 //          ^^^^^^ definition local 25
 //                 display_name result
 //                 signature_documentation java boolean result
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#removeAll().
     Iterator<?> it = iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //              ^^ definition local 26
 //                 display_name it
 //                 signature_documentation java Iterator<?> it
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#removeAll().
 //                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
     while (it.hasNext()) {
 //         ^^ reference local 26
@@ -517,6 +544,7 @@ public boolean retainAll(Collection<?> collection) {
 //                                       ^^^^^^^^^^ definition local 27
 //                                                  display_name collection
 //                                                  signature_documentation java Collection<?> collection
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#retainAll().
     // Using this implementation from the Android ArrayList since the Java 1.8 ArrayList
     // doesn't call through to remove. Calling through to remove lets us leverage the notification
     // done there
@@ -524,11 +552,13 @@ public boolean retainAll(Collection<?> collection) {
 //          ^^^^^^ definition local 28
 //                 display_name result
 //                 signature_documentation java boolean result
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#retainAll().
     Iterator<?> it = iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //              ^^ definition local 29
 //                 display_name it
 //                 signature_documentation java Iterator<?> it
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#retainAll().
 //                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
     while (it.hasNext()) {
 //         ^^ reference local 29
@@ -624,6 +654,7 @@ public EpoxyModel<?> next() {
 //        ^ definition local 30
 //          display_name i
 //          signature_documentation java int i
+//          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#next().
 //            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
       cursor = i + 1;
 //    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -670,6 +701,7 @@ public void remove() {
 //                                       ^^ definition local 31
 //                                          display_name ex
 //                                          signature_documentation java IndexOutOfBoundsException ex
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#remove().
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
       }
@@ -721,6 +753,7 @@ public ListIterator<EpoxyModel<?>> listIterator(int index) {
 //                                                    ^^^^^ definition local 32
 //                                                          display_name index
 //                                                          signature_documentation java int index
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#listIterator(+1).
     return new ListItr(index);
 //             ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#`<init>`().
 //                     ^^^^^ reference local 32
@@ -750,6 +783,7 @@ private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
 //              ^^^^^ definition local 33
 //                    display_name index
 //                    signature_documentation java int index
+//                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#`<init>`().
       cursor = index;
 //    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
 //             ^^^^^ reference local 33
@@ -796,6 +830,7 @@ public EpoxyModel<?> previous() {
 //        ^ definition local 34
 //          display_name i
 //          signature_documentation java int i
+//          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#previous().
 //            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
       if (i < 0) {
 //        ^ reference local 34
@@ -825,6 +860,7 @@ public void set(EpoxyModel<?> e) {
 //                                ^ definition local 35
 //                                  display_name e
 //                                  signature_documentation java EpoxyModel<?> e
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#set().
       if (lastRet < 0) {
 //        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#lastRet.
         throw new IllegalStateException();
@@ -845,6 +881,7 @@ public void set(EpoxyModel<?> e) {
 //                                       ^^ definition local 36
 //                                          display_name ex
 //                                          signature_documentation java IndexOutOfBoundsException ex
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#set().
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
       }
@@ -859,6 +896,7 @@ public void add(EpoxyModel<?> e) {
 //                                ^ definition local 37
 //                                  display_name e
 //                                  signature_documentation java EpoxyModel<?> e
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#add().
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
 
@@ -867,6 +905,7 @@ public void add(EpoxyModel<?> e) {
 //          ^ definition local 38
 //            display_name i
 //            signature_documentation java int i
+//            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#add().
 //              ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
         ModelList.this.add(i, e);
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
@@ -887,6 +926,7 @@ public void add(EpoxyModel<?> e) {
 //                                       ^^ definition local 39
 //                                          display_name ex
 //                                          signature_documentation java IndexOutOfBoundsException ex
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#add().
         throw new ConcurrentModificationException();
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ConcurrentModificationException#`<init>`().
       }
@@ -909,9 +949,11 @@ public List<EpoxyModel<?>> subList(int start, int end) {
 //                                       ^^^^^ definition local 40
 //                                             display_name start
 //                                             signature_documentation java int start
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#subList().
 //                                                  ^^^ definition local 41
 //                                                      display_name end
 //                                                      signature_documentation java int end
+//                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#subList().
     if (start >= 0 && end <= size()) {
 //      ^^^^^ reference local 40
 //                    ^^^ reference local 41
@@ -1000,16 +1042,20 @@ private static final class SubListIterator implements ListIterator<EpoxyModel<?>
 //                                                ^^ definition local 42
 //                                                   display_name it
 //                                                   signature_documentation java ListIterator<EpoxyModel<?>> it
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#`<init>`().
 //                                                    ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#
 //                                                            ^^^^ definition local 43
 //                                                                 display_name list
 //                                                                 signature_documentation java SubList list
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#`<init>`().
 //                                                                      ^^^^^^ definition local 44
 //                                                                             display_name offset
 //                                                                             signature_documentation java int offset
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#`<init>`().
 //                                                                                  ^^^^^^ definition local 45
 //                                                                                         display_name length
 //                                                                                         signature_documentation java int length
+//                                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#`<init>`().
         iterator = it;
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //                 ^^ reference local 42
@@ -1034,6 +1080,7 @@ public void add(EpoxyModel<?> object) {
 //                                  ^^^^^^ definition local 46
 //                                         display_name object
 //                                         signature_documentation java EpoxyModel<?> object
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#add().
         iterator.add(object);
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //               ^^^ reference semanticdb maven jdk 11 java/util/ListIterator#add().
@@ -1125,6 +1172,7 @@ public int previousIndex() {
 //          ^^^^^^^^ definition local 47
 //                   display_name previous
 //                   signature_documentation java int previous
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#previousIndex().
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //                              ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         if (previous >= start) {
@@ -1162,6 +1210,7 @@ public void set(EpoxyModel<?> object) {
 //                                  ^^^^^^ definition local 48
 //                                         display_name object
 //                                         signature_documentation java EpoxyModel<?> object
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#set().
         iterator.set(object);
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //               ^^^ reference semanticdb maven jdk 11 java/util/ListIterator#set().
@@ -1177,12 +1226,15 @@ public void set(EpoxyModel<?> object) {
 //                    ^^^^ definition local 49
 //                         display_name list
 //                         signature_documentation java ModelList list
+//                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#`<init>`().
 //                              ^^^^^ definition local 50
 //                                    display_name start
 //                                    signature_documentation java int start
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#`<init>`().
 //                                         ^^^ definition local 51
 //                                             display_name end
 //                                             signature_documentation java int end
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#`<init>`().
       fullList = list;
 //    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //               ^^^^ reference local 49
@@ -1210,10 +1262,12 @@ public void add(int location, EpoxyModel<?> object) {
 //                      ^^^^^^^^ definition local 52
 //                               display_name location
 //                               signature_documentation java int location
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#add().
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^ definition local 53
 //                                                     display_name object
 //                                                     signature_documentation java EpoxyModel<?> object
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#add().
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1255,11 +1309,13 @@ public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collecti
 //                            ^^^^^^^^ definition local 54
 //                                     display_name location
 //                                     signature_documentation java int location
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll().
 //                                      ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^^^^^^^^^^ definition local 55
 //                                                                                     display_name collection
 //                                                                                     signature_documentation java Collection<? extends EpoxyModel<?>> collection
+//                                                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll().
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1272,6 +1328,7 @@ public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collecti
 //                ^^^^^^ definition local 56
 //                       display_name result
 //                       signature_documentation java boolean result
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll().
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                                         ^^^^^^^^ reference local 54
@@ -1313,6 +1370,7 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //                                                                     ^^^^^^^^^^ definition local 57
 //                                                                                display_name collection
 //                                                                                signature_documentation java @NonNull\nCollection<? extends EpoxyModel<?>> collection
+//                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll(+1).
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1321,6 +1379,7 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //              ^^^^^^ definition local 58
 //                     display_name result
 //                     signature_documentation java boolean result
+//                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll(+1).
 //                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                                       ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#offset.
@@ -1356,6 +1415,7 @@ public EpoxyModel<?> get(int location) {
 //                               ^^^^^^^^ definition local 59
 //                                        display_name location
 //                                        signature_documentation java int location
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#get().
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1411,6 +1471,7 @@ public ListIterator<EpoxyModel<?>> listIterator(int location) {
 //                                                      ^^^^^^^^ definition local 60
 //                                                               display_name location
 //                                                               signature_documentation java int location
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#listIterator().
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1447,6 +1508,7 @@ public EpoxyModel<?> remove(int location) {
 //                                  ^^^^^^^^ definition local 61
 //                                           display_name location
 //                                           signature_documentation java int location
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#remove().
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1460,6 +1522,7 @@ public EpoxyModel<?> remove(int location) {
 //                      ^^^^^^ definition local 62
 //                             display_name result
 //                             signature_documentation java EpoxyModel<?> result
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#remove().
 //                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#remove().
 //                                               ^^^^^^^^ reference local 61
@@ -1490,9 +1553,11 @@ protected void removeRange(int start, int end) {
 //                                 ^^^^^ definition local 63
 //                                       display_name start
 //                                       signature_documentation java int start
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#removeRange().
 //                                            ^^^ definition local 64
 //                                                display_name end
 //                                                signature_documentation java int end
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#removeRange().
       if (start != end) {
 //        ^^^^^ reference local 63
 //                 ^^^ reference local 64
@@ -1534,10 +1599,12 @@ public EpoxyModel<?> set(int location, EpoxyModel<?> object) {
 //                               ^^^^^^^^ definition local 65
 //                                        display_name location
 //                                        signature_documentation java int location
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#set().
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                       ^^^^^^ definition local 66
 //                                                              display_name object
 //                                                              signature_documentation java EpoxyModel<?> object
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#set().
       if (modCount == fullList.modCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
@@ -1587,6 +1654,7 @@ void sizeChanged(boolean increment) {
 //                           ^^^^^^^^^ definition local 67
 //                                     display_name increment
 //                                     signature_documentation java boolean increment
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#sizeChanged().
       if (increment) {
 //        ^^^^^^^^^ reference local 67
         size++;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
index 943a6e491..6e6f39f61 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
@@ -62,17 +62,21 @@ static ModelState build(EpoxyModel<?> model, int position, boolean immutableMode
 //                                      ^^^^^ definition local 0
 //                                            display_name model
 //                                            signature_documentation java EpoxyModel<?> model
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelState#build().
 //                                                 ^^^^^^^^ definition local 1
 //                                                          display_name position
 //                                                          signature_documentation java int position
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelState#build().
 //                                                                   ^^^^^^^^^^^^^^ definition local 2
 //                                                                                  display_name immutableModel
 //                                                                                  signature_documentation java boolean immutableModel
+//                                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelState#build().
     ModelState state = new ModelState();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //             ^^^^^ definition local 3
 //                   display_name state
 //                   signature_documentation java ModelState state
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelState#build().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#`<init>`().
 
     state.lastMoveOp = 0;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
index b23649abf..45bb69b71 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
@@ -20,6 +20,7 @@ public void start(String sectionName) {
 //                         ^^^^^^^^^^^ definition local 0
 //                                     display_name sectionName
 //                                     signature_documentation java String sectionName
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NoOpTimer#start().
 
   }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
index 10053f3d3..dc3b7e91a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
@@ -69,9 +69,11 @@ public void onItemRangeChanged(int positionStart, int itemCount) {
 //                                   ^^^^^^^^^^^^^ definition local 0
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged().
 //                                                      ^^^^^^^^^ definition local 1
 //                                                                display_name itemCount
 //                                                                signature_documentation java int itemCount
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged().
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
@@ -85,13 +87,16 @@ public void onItemRangeChanged(int positionStart, int itemCount, Object payload)
 //                                   ^^^^^^^^^^^^^ definition local 2
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(+1).
 //                                                      ^^^^^^^^^ definition local 3
 //                                                                display_name itemCount
 //                                                                signature_documentation java int itemCount
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(+1).
 //                                                                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                        ^^^^^^^ definition local 4
 //                                                                                display_name payload
 //                                                                                signature_documentation java Object payload
+//                                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(+1).
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
@@ -105,9 +110,11 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 //                                    ^^^^^^^^^^^^^ definition local 5
 //                                                  display_name positionStart
 //                                                  signature_documentation java int positionStart
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeInserted().
 //                                                       ^^^^^^^^^ definition local 6
 //                                                                 display_name itemCount
 //                                                                 signature_documentation java int itemCount
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeInserted().
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
@@ -121,9 +128,11 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 //                                   ^^^^^^^^^^^^^ definition local 7
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeRemoved().
 //                                                      ^^^^^^^^^ definition local 8
 //                                                                display_name itemCount
 //                                                                signature_documentation java int itemCount
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeRemoved().
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
@@ -137,12 +146,15 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 //                                 ^^^^^^^^^^^^ definition local 9
 //                                              display_name fromPosition
 //                                              signature_documentation java int fromPosition
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeMoved().
 //                                                   ^^^^^^^^^^ definition local 10
 //                                                              display_name toPosition
 //                                                              signature_documentation java int toPosition
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeMoved().
 //                                                                   ^^^^^^^^^ definition local 11
 //                                                                             display_name itemCount
 //                                                                             signature_documentation java int itemCount
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeMoved().
     onChanged();
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
index 4c10f6d26..4fa6971f1 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
@@ -30,11 +30,14 @@ public interface OnModelBoundListener<T extends EpoxyModel<?>, V> {
 //                    ^^^^^ definition local 0
 //                          display_name model
 //                          signature_documentation java T model
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#onModelBound().
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[V]
 //                             ^^^^ definition local 1
 //                                  display_name view
 //                                  signature_documentation java V view
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#onModelBound().
 //                                       ^^^^^^^^ definition local 2
 //                                                display_name position
 //                                                signature_documentation java int position
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#onModelBound().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
index e400f6280..ec9febe7e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
@@ -28,4 +28,5 @@ public interface OnModelBuildFinishedListener {
 //                                              ^^^^^^ definition local 0
 //                                                     display_name result
 //                                                     signature_documentation java @NonNull\nDiffResult result
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
index 039ac7adf..08e2c88ba 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
@@ -35,19 +35,24 @@ void onChecked(T model, V parentView,
 //                 ^^^^^ definition local 0
 //                       display_name model
 //                       signature_documentation java T model
+//                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked().
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[V]
 //                          ^^^^^^^^^^ definition local 1
 //                                     display_name parentView
 //                                     signature_documentation java V parentView
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked().
       CompoundButton checkedView, boolean isChecked, int position);
 //    ^^^^^^^^^^^^^^ reference semanticdb maven . . CompoundButton#
 //                   ^^^^^^^^^^^ definition local 2
 //                               display_name checkedView
 //                               signature_documentation java unresolved_type checkedView
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked().
 //                                        ^^^^^^^^^ definition local 3
 //                                                  display_name isChecked
 //                                                  signature_documentation java boolean isChecked
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked().
 //                                                       ^^^^^^^^ definition local 4
 //                                                                display_name position
 //                                                                signature_documentation java int position
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
index b52c9fcf8..34a3f7303 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
@@ -36,15 +36,19 @@ public interface OnModelClickListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^ definition local 0
 //                     display_name model
 //                     signature_documentation java T model
+//                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#onClick().
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[V]
 //                        ^^^^^^^^^^ definition local 1
 //                                   display_name parentView
 //                                   signature_documentation java V parentView
+//                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#onClick().
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^^^^^^^ definition local 2
 //                                                     display_name clickedView
 //                                                     signature_documentation java unresolved_type clickedView
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#onClick().
 //                                                          ^^^^^^^^ definition local 3
 //                                                                   display_name position
 //                                                                   signature_documentation java int position
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#onClick().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
index 89c77b687..5507b3a27 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
@@ -34,15 +34,19 @@ public interface OnModelLongClickListener<T extends EpoxyModel<?>, V> {
 //                      ^^^^^ definition local 0
 //                            display_name model
 //                            signature_documentation java T model
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#onLongClick().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[V]
 //                               ^^^^^^^^^^ definition local 1
 //                                          display_name parentView
 //                                          signature_documentation java V parentView
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#onLongClick().
 //                                           ^^^^ reference semanticdb maven . . View#
 //                                                ^^^^^^^^^^^ definition local 2
 //                                                            display_name clickedView
 //                                                            signature_documentation java unresolved_type clickedView
+//                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#onLongClick().
 //                                                                 ^^^^^^^^ definition local 3
 //                                                                          display_name position
 //                                                                          signature_documentation java int position
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#onLongClick().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
index 37605d00c..37943883f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
@@ -26,8 +26,10 @@ public interface OnModelUnboundListener<T extends EpoxyModel<?>, V> {
 //                      ^^^^^ definition local 0
 //                            display_name model
 //                            signature_documentation java T model
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[V]
 //                               ^^^^ definition local 1
 //                                    display_name view
 //                                    signature_documentation java V view
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
index 224e4a5c0..18f6d3b29 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
@@ -48,10 +48,12 @@ void onVisibilityChanged(T model, V view,
 //                           ^^^^^ definition local 0
 //                                 display_name model
 //                                 signature_documentation java T model
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
 //                                  ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
 //                                    ^^^^ definition local 1
 //                                         display_name view
 //                                         signature_documentation java V view
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
       @FloatRange(from = 0, to = 100) float percentVisibleHeight,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
@@ -59,6 +61,7 @@ void onVisibilityChanged(T model, V view,
 //                                          ^^^^^^^^^^^^^^^^^^^^ definition local 2
 //                                                               display_name percentVisibleHeight
 //                                                               signature_documentation java @FloatRange(from = 0, to = 100)\nfloat percentVisibleHeight
+//                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
       @FloatRange(from = 0, to = 100) float percentVisibleWidth,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
@@ -66,13 +69,16 @@ void onVisibilityChanged(T model, V view,
 //                                          ^^^^^^^^^^^^^^^^^^^ definition local 3
 //                                                              display_name percentVisibleWidth
 //                                                              signature_documentation java @FloatRange(from = 0, to = 100)\nfloat percentVisibleWidth
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
       @Px int heightVisible, @Px int widthVisible);
 //     ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //            ^^^^^^^^^^^^^ definition local 4
 //                          display_name heightVisible
 //                          signature_documentation java @Px\nint heightVisible
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
 //                            ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                   ^^^^^^^^^^^^ definition local 5
 //                                                display_name widthVisible
 //                                                signature_documentation java @Px\nint widthVisible
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
index cbed93c9c..5ecc9a22a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
@@ -40,12 +40,15 @@ public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>,
 //                                ^^^^^ definition local 0
 //                                      display_name model
 //                                      signature_documentation java T model
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged().
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
 //                                         ^^^^ definition local 1
 //                                              display_name view
 //                                              signature_documentation java V view
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged().
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                               ^^^^^^^^^^^^^^^ definition local 2
 //                                                                               display_name visibilityState
 //                                                                               signature_documentation java @Visibility\nint visibilityState
+//                                                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
index 2f5e9bde2..931707649 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
@@ -47,15 +47,18 @@ public QuantityStringResAttribute(@PluralsRes int id, int quantity,
 //                                                  ^^ definition local 0
 //                                                     display_name id
 //                                                     signature_documentation java @PluralsRes\nint id
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
 //                                                          ^^^^^^^^ definition local 1
 //                                                                   display_name quantity
 //                                                                   signature_documentation java int quantity
+//                                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
       @Nullable Object[] formatArgs) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                       ^^^^^^^^^^ definition local 2
 //                                  display_name formatArgs
 //                                  signature_documentation java @Nullable\nObject[] formatArgs
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
     this.quantity = quantity;
 //       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
 //                  ^^^^^^^^ reference local 1
@@ -74,9 +77,11 @@ public QuantityStringResAttribute(int id, int quantity) {
 //                                      ^^ definition local 3
 //                                         display_name id
 //                                         signature_documentation java int id
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`(+1).
 //                                              ^^^^^^^^ definition local 4
 //                                                       display_name quantity
 //                                                       signature_documentation java int quantity
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`(+1).
     this(id, quantity, null);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
 //       ^^ reference local 3
@@ -121,6 +126,7 @@ public CharSequence toString(Context context) {
 //                                     ^^^^^^^ definition local 5
 //                                             display_name context
 //                                             signature_documentation java unresolved_type context
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#toString().
     if (formatArgs == null || formatArgs.length == 0) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
@@ -153,6 +159,7 @@ public boolean equals(Object o) {
 //                             ^ definition local 6
 //                               display_name o
 //                               signature_documentation java Object o
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#equals().
     if (this == o) {
 //              ^ reference local 6
       return true;
@@ -168,6 +175,7 @@ public boolean equals(Object o) {
 //                             ^^^^ definition local 7
 //                                  display_name that
 //                                  signature_documentation java QuantityStringResAttribute that
+//                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#equals().
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
 //                                                                 ^ reference local 6
 
@@ -203,6 +211,7 @@ public int hashCode() {
 //      ^^^^^^ definition local 8
 //             display_name result
 //             signature_documentation java int result
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#hashCode().
 //               ^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
     result = 31 * result + quantity;
 //  ^^^^^^ reference local 8
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
index 38ec567d0..7306a3f80 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
@@ -86,6 +86,7 @@ public void notifyModelChanged(EpoxyModel<?> model) {
 //                                             ^^^^^ definition local 0
 //                                                   display_name model
 //                                                   signature_documentation java EpoxyModel<?> model
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged().
     super.notifyModelChanged(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
@@ -103,6 +104,7 @@ public void addModels(EpoxyModel<?>... modelsToAdd) {
 //                                       ^^^^^^^^^^^ definition local 1
 //                                                   display_name modelsToAdd
 //                                                   signature_documentation java EpoxyModel<?>[] modelsToAdd
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels().
     super.addModels(modelsToAdd);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
@@ -121,6 +123,7 @@ public void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //                                                          ^^^^^^^^^^^ definition local 2
 //                                                                      display_name modelsToAdd
 //                                                                      signature_documentation java Collection<? extends EpoxyModel<?>> modelsToAdd
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1).
     super.addModels(modelsToAdd);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
@@ -138,10 +141,12 @@ public void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelTo
 //                                            ^^^^^^^^^^^^^ definition local 3
 //                                                          display_name modelToInsert
 //                                                          signature_documentation java EpoxyModel<?> modelToInsert
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore().
 //                                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                         ^^^^^^^^^^^^^^^^^^^ definition local 4
 //                                                                                             display_name modelToInsertBefore
 //                                                                                             signature_documentation java EpoxyModel<?> modelToInsertBefore
+//                                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore().
     super.insertModelBefore(modelToInsert, modelToInsertBefore);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
@@ -160,10 +165,12 @@ public void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToI
 //                                           ^^^^^^^^^^^^^ definition local 5
 //                                                         display_name modelToInsert
 //                                                         signature_documentation java EpoxyModel<?> modelToInsert
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter().
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                        ^^^^^^^^^^^^^^^^^^ definition local 6
 //                                                                                           display_name modelToInsertAfter
 //                                                                                           signature_documentation java EpoxyModel<?> modelToInsertAfter
+//                                                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter().
     super.insertModelAfter(modelToInsert, modelToInsertAfter);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
@@ -182,6 +189,7 @@ public void removeModel(EpoxyModel<?> model) {
 //                                      ^^^^^ definition local 7
 //                                            display_name model
 //                                            signature_documentation java EpoxyModel<?> model
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel().
     super.removeModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
@@ -211,6 +219,7 @@ public void removeAllAfterModel(EpoxyModel<?> model) {
 //                                              ^^^^^ definition local 8
 //                                                    display_name model
 //                                                    signature_documentation java EpoxyModel<?> model
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel().
     super.removeAllAfterModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
@@ -228,9 +237,11 @@ public void showModel(EpoxyModel<?> model, boolean show) {
 //                                    ^^^^^ definition local 9
 //                                          display_name model
 //                                          signature_documentation java EpoxyModel<?> model
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel().
 //                                                   ^^^^ definition local 10
 //                                                        display_name show
 //                                                        signature_documentation java boolean show
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel().
     super.showModel(model, show);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
@@ -249,6 +260,7 @@ public void showModel(EpoxyModel<?> model) {
 //                                    ^^^^^ definition local 11
 //                                          display_name model
 //                                          signature_documentation java EpoxyModel<?> model
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1).
     super.showModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
@@ -266,6 +278,7 @@ public void showModels(EpoxyModel<?>... models) {
 //                                        ^^^^^^ definition local 12
 //                                               display_name models
 //                                               signature_documentation java EpoxyModel<?>[] models
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels().
     super.showModels(models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
@@ -282,10 +295,12 @@ public void showModels(boolean show, EpoxyModel<?>... models) {
 //                               ^^^^ definition local 13
 //                                    display_name show
 //                                    signature_documentation java boolean show
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1).
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                      ^^^^^^ definition local 14
 //                                                             display_name models
 //                                                             signature_documentation java EpoxyModel<?>[] models
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1).
     super.showModels(show, models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
@@ -305,6 +320,7 @@ public void showModels(Iterable<EpoxyModel<?>> epoxyModels) {
 //                                               ^^^^^^^^^^^ definition local 15
 //                                                           display_name epoxyModels
 //                                                           signature_documentation java Iterable<EpoxyModel<?>> epoxyModels
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2).
     super.showModels(epoxyModels);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
@@ -323,9 +339,11 @@ public void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show) {
 //                                               ^^^^^^^^^^^ definition local 16
 //                                                           display_name epoxyModels
 //                                                           signature_documentation java Iterable<EpoxyModel<?>> epoxyModels
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3).
 //                                                                    ^^^^ definition local 17
 //                                                                         display_name show
 //                                                                         signature_documentation java boolean show
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3).
     super.showModels(epoxyModels, show);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
@@ -344,6 +362,7 @@ public void hideModel(EpoxyModel<?> model) {
 //                                    ^^^^^ definition local 18
 //                                          display_name model
 //                                          signature_documentation java EpoxyModel<?> model
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel().
     super.hideModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
@@ -362,6 +381,7 @@ public void hideModels(Iterable<EpoxyModel<?>> epoxyModels) {
 //                                               ^^^^^^^^^^^ definition local 19
 //                                                           display_name epoxyModels
 //                                                           signature_documentation java Iterable<EpoxyModel<?>> epoxyModels
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels().
     super.hideModels(epoxyModels);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
@@ -379,6 +399,7 @@ public void hideModels(EpoxyModel<?>... models) {
 //                                        ^^^^^^ definition local 20
 //                                               display_name models
 //                                               signature_documentation java EpoxyModel<?>[] models
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1).
     super.hideModels(models);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
@@ -396,6 +417,7 @@ public void hideAllAfterModel(EpoxyModel<?> model) {
 //                                            ^^^^^ definition local 21
 //                                                  display_name model
 //                                                  signature_documentation java EpoxyModel<?> model
+//                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel().
     super.hideAllAfterModel(model);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
@@ -415,6 +437,7 @@ public List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //                                                           ^^^^^ definition local 22
 //                                                                 display_name model
 //                                                                 signature_documentation java EpoxyModel<?> model
+//                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter().
     return super.getAllModelsAfter(model);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
@@ -432,6 +455,7 @@ public int getModelPosition(EpoxyModel<?> model) {
 //                                          ^^^^^ definition local 23
 //                                                display_name model
 //                                                signature_documentation java EpoxyModel<?> model
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition().
     return super.getModelPosition(model);
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
 //               ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
index 754106881..e7131f793 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
@@ -46,6 +46,7 @@ public void setModels(List<? extends EpoxyModel<?>> models) {
 //                                                    ^^^^^^ definition local 0
 //                                                           display_name models
 //                                                           signature_documentation java List<? extends EpoxyModel<?>> models
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#setModels().
     currentModels = models;
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#currentModels.
 //                  ^^^^^^ reference local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
index 47628cb17..f96894c25 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
@@ -56,6 +56,7 @@ public SimpleEpoxyModel(@LayoutRes int layoutRes) {
 //                                       ^^^^^^^^^ definition local 0
 //                                                 display_name layoutRes
 //                                                 signature_documentation java @LayoutRes\nint layoutRes
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#`<init>`().
     this.layoutRes = layoutRes;
 //       ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#layoutRes.
 //                   ^^^^^^^^^ reference local 0
@@ -71,6 +72,7 @@ public SimpleEpoxyModel onClick(View.OnClickListener listener) {
 //                                                     ^^^^^^^^ definition local 1
 //                                                              display_name listener
 //                                                              signature_documentation java unresolved_type listener
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClick().
     this.onClickListener = listener;
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClickListener.
 //                         ^^^^^^^^ reference local 1
@@ -85,6 +87,7 @@ public SimpleEpoxyModel span(int span) {
 //                                 ^^^^ definition local 2
 //                                      display_name span
 //                                      signature_documentation java int span
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#span().
     spanCount = span;
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
 //              ^^^^ reference local 2
@@ -105,6 +108,7 @@ public void bind(@NonNull View view) {
 //                               ^^^^ definition local 3
 //                                    display_name view
 //                                    signature_documentation java @NonNull\nunresolved_type view
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#bind().
     super.bind(view);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
 //        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
@@ -133,6 +137,7 @@ public void unbind(@NonNull View view) {
 //                                 ^^^^ definition local 4
 //                                      display_name view
 //                                      signature_documentation java @NonNull\nunresolved_type view
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#unbind().
     super.unbind(view);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
 //        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
@@ -163,12 +168,15 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //                           ^^^^^^^^^^^^^^ definition local 5
 //                                          display_name totalSpanCount
 //                                          signature_documentation java int totalSpanCount
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize().
 //                                               ^^^^^^^^ definition local 6
 //                                                        display_name position
 //                                                        signature_documentation java int position
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize().
 //                                                             ^^^^^^^^^ definition local 7
 //                                                                       display_name itemCount
 //                                                                       signature_documentation java int itemCount
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize().
     return spanCount;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
   }
@@ -185,6 +193,7 @@ public boolean equals(Object o) {
 //                             ^ definition local 8
 //                               display_name o
 //                               signature_documentation java Object o
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
     if (this == o) {
 //              ^ reference local 8
       return true;
@@ -206,6 +215,7 @@ public boolean equals(Object o) {
 //                   ^^^^ definition local 9
 //                        display_name that
 //                        signature_documentation java SimpleEpoxyModel that
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                                             ^ reference local 8
 
@@ -244,6 +254,7 @@ public int hashCode() {
 //      ^^^^^^ definition local 10
 //             display_name result
 //             signature_documentation java int result
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#hashCode().
 //               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
     result = 31 * result + layoutRes;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
index 96f483814..b025aa7fe 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
@@ -91,6 +91,7 @@ public StringAttributeData(@Nullable CharSequence defaultString) {
 //                                                  ^^^^^^^^^^^^^ definition local 0
 //                                                                display_name defaultString
 //                                                                signature_documentation java @Nullable\nCharSequence defaultString
+//                                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`(+1).
     hasDefault = true;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
     this.defaultString = defaultString;
@@ -111,6 +112,7 @@ public StringAttributeData(@StringRes int defaultStringRes) {
 //                                          ^^^^^^^^^^^^^^^^ definition local 1
 //                                                           display_name defaultStringRes
 //                                                           signature_documentation java @StringRes\nint defaultStringRes
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`(+2).
     hasDefault = true;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
     this.defaultStringRes = defaultStringRes;
@@ -132,6 +134,7 @@ public void setValue(@Nullable CharSequence string) {
 //                                            ^^^^^^ definition local 2
 //                                                   display_name string
 //                                                   signature_documentation java @Nullable\nCharSequence string
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue().
     this.string = string;
 //       ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                ^^^^^^ reference local 2
@@ -149,6 +152,7 @@ public void setValue(@StringRes int stringRes) {
 //                                    ^^^^^^^^^ definition local 3
 //                                              display_name stringRes
 //                                              signature_documentation java @StringRes\nint stringRes
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+1).
     setValue(stringRes, null);
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+2).
 //           ^^^^^^^^^ reference local 3
@@ -162,11 +166,13 @@ public void setValue(@StringRes int stringRes, @Nullable Object[] formatArgs) {
 //                                    ^^^^^^^^^ definition local 4
 //                                              display_name stringRes
 //                                              signature_documentation java @StringRes\nint stringRes
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+2).
 //                                                ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                  ^^^^^^^^^^ definition local 5
 //                                                                             display_name formatArgs
 //                                                                             signature_documentation java @Nullable\nObject[] formatArgs
+//                                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+2).
     if (stringRes != 0) {
 //      ^^^^^^^^^ reference local 4
       this.stringRes = stringRes;
@@ -215,14 +221,17 @@ public void setValue(@PluralsRes int pluralRes, int quantity, @Nullable Object[]
 //                                     ^^^^^^^^^ definition local 6
 //                                               display_name pluralRes
 //                                               signature_documentation java @PluralsRes\nint pluralRes
+//                                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+3).
 //                                                    ^^^^^^^^ definition local 7
 //                                                             display_name quantity
 //                                                             signature_documentation java int quantity
+//                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+3).
 //                                                               ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                                                                 ^^^^^^^^^^ definition local 8
 //                                                                                            display_name formatArgs
 //                                                                                            signature_documentation java @Nullable\nObject[] formatArgs
+//                                                                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+3).
     if (pluralRes != 0) {
 //      ^^^^^^^^^ reference local 6
       this.pluralRes = pluralRes;
@@ -253,6 +262,7 @@ public CharSequence toString(Context context) {
 //                                     ^^^^^^^ definition local 9
 //                                             display_name context
 //                                             signature_documentation java unresolved_type context
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#toString().
     if (pluralRes != 0) {
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#pluralRes.
       if (formatArgs != null) {
@@ -306,6 +316,7 @@ public boolean equals(Object o) {
 //                             ^ definition local 10
 //                               display_name o
 //                               signature_documentation java Object o
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#equals().
     if (this == o) {
 //              ^ reference local 10
       return true;
@@ -321,6 +332,7 @@ public boolean equals(Object o) {
 //                      ^^^^ definition local 11
 //                           display_name that
 //                           signature_documentation java StringAttributeData that
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#equals().
 //                              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
 //                                                   ^ reference local 10
 
@@ -372,6 +384,7 @@ public int hashCode() {
 //      ^^^^^^ definition local 12
 //             display_name result
 //             signature_documentation java int result
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hashCode().
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#hashCode().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
index 32c40b668..48123c56f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
@@ -20,4 +20,5 @@ public interface StyleBuilderCallback<T> {
 //                  ^^^^^^^ definition local 0
 //                          display_name builder
 //                          signature_documentation java T builder
+//                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#buildStyle().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
index d4799bb0b..952954602 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
@@ -14,6 +14,7 @@ interface Timer {
 //                  ^^^^^^^^^^^ definition local 0
 //                              display_name sectionName
 //                              signature_documentation java String sectionName
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Timer#start().
   void stop();
 //     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#stop().
 //          display_name stop
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
index 78d5f5c65..ea742f0fc 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
@@ -64,10 +64,12 @@ public Typed2EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
 //                                                          signature_documentation java unresolved_type modelBuildingHandler
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#`<init>`(+1).
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
 //                                                                                  display_name diffingHandler
 //                                                                                  signature_documentation java unresolved_type diffingHandler
+//                                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#`<init>`(+1).
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 0
@@ -87,10 +89,12 @@ public void setData(T data1, U data2) {
 //                      ^^^^^ definition local 2
 //                            display_name data1
 //                            signature_documentation java T data1
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#setData().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //                               ^^^^^ definition local 3
 //                                     display_name data2
 //                                     signature_documentation java U data2
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#setData().
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data1.
 //               ^^^^^ reference local 2
@@ -134,9 +138,11 @@ public void moveModel(int fromPosition, int toPosition) {
 //                          ^^^^^^^^^^^^ definition local 4
 //                                       display_name fromPosition
 //                                       signature_documentation java int fromPosition
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#moveModel().
 //                                            ^^^^^^^^^^ definition local 5
 //                                                       display_name toPosition
 //                                                       signature_documentation java int toPosition
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#moveModel().
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
     super.moveModel(fromPosition, toPosition);
@@ -158,6 +164,7 @@ public void requestDelayedModelBuild(int delayMs) {
 //                                         ^^^^^^^ definition local 6
 //                                                 display_name delayMs
 //                                                 signature_documentation java int delayMs
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
       throw new IllegalStateException(
@@ -199,8 +206,10 @@ protected final void buildModels() {
 //                                      ^^^^^ definition local 7
 //                                            display_name data1
 //                                            signature_documentation java T data1
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels(+1).
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //                                               ^^^^^ definition local 8
 //                                                     display_name data2
 //                                                     signature_documentation java U data2
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels(+1).
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
index 7ceb95dcb..68e39d6fc 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
@@ -72,10 +72,12 @@ public Typed3EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
 //                                                          signature_documentation java unresolved_type modelBuildingHandler
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#`<init>`(+1).
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
 //                                                                                  display_name diffingHandler
 //                                                                                  signature_documentation java unresolved_type diffingHandler
+//                                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#`<init>`(+1).
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 0
@@ -95,14 +97,17 @@ public void setData(T data1, U data2, V data3) {
 //                      ^^^^^ definition local 2
 //                            display_name data1
 //                            signature_documentation java T data1
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#setData().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //                               ^^^^^ definition local 3
 //                                     display_name data2
 //                                     signature_documentation java U data2
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#setData().
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //                                        ^^^^^ definition local 4
 //                                              display_name data3
 //                                              signature_documentation java V data3
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#setData().
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data1.
 //               ^^^^^ reference local 2
@@ -149,9 +154,11 @@ public void moveModel(int fromPosition, int toPosition) {
 //                          ^^^^^^^^^^^^ definition local 5
 //                                       display_name fromPosition
 //                                       signature_documentation java int fromPosition
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#moveModel().
 //                                            ^^^^^^^^^^ definition local 6
 //                                                       display_name toPosition
 //                                                       signature_documentation java int toPosition
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#moveModel().
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
     super.moveModel(fromPosition, toPosition);
@@ -173,6 +180,7 @@ public void requestDelayedModelBuild(int delayMs) {
 //                                         ^^^^^^^ definition local 7
 //                                                 display_name delayMs
 //                                                 signature_documentation java int delayMs
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestDelayedModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
       throw new IllegalStateException(
@@ -215,12 +223,15 @@ protected final void buildModels() {
 //                                      ^^^^^ definition local 8
 //                                            display_name data1
 //                                            signature_documentation java T data1
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels(+1).
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //                                               ^^^^^ definition local 9
 //                                                     display_name data2
 //                                                     signature_documentation java U data2
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels(+1).
 //                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //                                                        ^^^^^ definition local 10
 //                                                              display_name data3
 //                                                              signature_documentation java V data3
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels(+1).
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
index 289cae803..26a4f66c9 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
@@ -80,10 +80,12 @@ public Typed4EpoxyController(Handler modelBuildingHandler, Handler diffingHandle
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
 //                                                          signature_documentation java unresolved_type modelBuildingHandler
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#`<init>`(+1).
 //                                                           ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                   ^^^^^^^^^^^^^^ definition local 1
 //                                                                                  display_name diffingHandler
 //                                                                                  signature_documentation java unresolved_type diffingHandler
+//                                                                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#`<init>`(+1).
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 0
@@ -103,18 +105,22 @@ public void setData(T data1, U data2, V data3, W data4) {
 //                      ^^^^^ definition local 2
 //                            display_name data1
 //                            signature_documentation java T data1
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#setData().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //                               ^^^^^ definition local 3
 //                                     display_name data2
 //                                     signature_documentation java U data2
+//                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#setData().
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //                                        ^^^^^ definition local 4
 //                                              display_name data3
 //                                              signature_documentation java V data3
+//                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#setData().
 //                                               ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //                                                 ^^^^^ definition local 5
 //                                                       display_name data4
 //                                                       signature_documentation java W data4
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#setData().
     this.data1 = data1;
 //       ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data1.
 //               ^^^^^ reference local 2
@@ -164,9 +170,11 @@ public void moveModel(int fromPosition, int toPosition) {
 //                          ^^^^^^^^^^^^ definition local 6
 //                                       display_name fromPosition
 //                                       signature_documentation java int fromPosition
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#moveModel().
 //                                            ^^^^^^^^^^ definition local 7
 //                                                       display_name toPosition
 //                                                       signature_documentation java int toPosition
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#moveModel().
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
     super.moveModel(fromPosition, toPosition);
@@ -188,6 +196,7 @@ public void requestDelayedModelBuild(int delayMs) {
 //                                         ^^^^^^^ definition local 8
 //                                                 display_name delayMs
 //                                                 signature_documentation java int delayMs
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#requestDelayedModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
       throw new IllegalStateException(
@@ -231,17 +240,21 @@ protected final void buildModels() {
 //                                      ^^^^^ definition local 9
 //                                            display_name data1
 //                                            signature_documentation java T data1
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels(+1).
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //                                               ^^^^^ definition local 10
 //                                                     display_name data2
 //                                                     signature_documentation java U data2
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels(+1).
 //                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //                                                        ^^^^^ definition local 11
 //                                                              display_name data3
 //                                                              signature_documentation java V data3
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels(+1).
 //                                                               ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //                                                                 ^^^^^ definition local 12
 //                                                                       display_name data4
 //                                                                       signature_documentation java W data4
+//                                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels(+1).
 }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
index c62d4774d..ef54e31f4 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
@@ -59,10 +59,12 @@ public TypedEpoxyController(Handler modelBuildingHandler, Handler diffingHandler
 //                                    ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                         display_name modelBuildingHandler
 //                                                         signature_documentation java unresolved_type modelBuildingHandler
+//                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#`<init>`(+1).
 //                                                          ^^^^^^^ reference semanticdb maven . . Handler#
 //                                                                  ^^^^^^^^^^^^^^ definition local 1
 //                                                                                 display_name diffingHandler
 //                                                                                 signature_documentation java unresolved_type diffingHandler
+//                                                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#`<init>`(+1).
     super(modelBuildingHandler, diffingHandler);
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //        ^^^^^^^^^^^^^^^^^^^^ reference local 0
@@ -77,6 +79,7 @@ public final void setData(T data) {
 //                            ^^^^ definition local 2
 //                                 display_name data
 //                                 signature_documentation java T data
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#setData().
     currentData = data;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
 //                ^^^^ reference local 2
@@ -117,9 +120,11 @@ public void moveModel(int fromPosition, int toPosition) {
 //                          ^^^^^^^^^^^^ definition local 3
 //                                       display_name fromPosition
 //                                       signature_documentation java int fromPosition
+//                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#moveModel().
 //                                            ^^^^^^^^^^ definition local 4
 //                                                       display_name toPosition
 //                                                       signature_documentation java int toPosition
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#moveModel().
     allowModelBuildRequests = true;
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
     super.moveModel(fromPosition, toPosition);
@@ -141,6 +146,7 @@ public void requestDelayedModelBuild(int delayMs) {
 //                                         ^^^^^^^ definition local 5
 //                                                 display_name delayMs
 //                                                 signature_documentation java int delayMs
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestDelayedModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
       throw new IllegalStateException(
@@ -192,4 +198,5 @@ protected final void buildModels() {
 //                                      ^^^^ definition local 6
 //                                           display_name data
 //                                           signature_documentation java T data
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#buildModels(+1).
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
index bf943ddff..2e9860d1b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
@@ -103,23 +103,28 @@ static UpdateOp instance(@Type int type, int positionStart, int itemCount,
 //                                   ^^^^ definition local 0
 //                                        display_name type
 //                                        signature_documentation java @Type\nint type
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
 //                                             ^^^^^^^^^^^^^ definition local 1
 //                                                           display_name positionStart
 //                                                           signature_documentation java int positionStart
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
 //                                                                ^^^^^^^^^ definition local 2
 //                                                                          display_name itemCount
 //                                                                          signature_documentation java int itemCount
+//                                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
       @Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^ definition local 3
 //                                    display_name payload
 //                                    signature_documentation java @Nullable\nEpoxyModel<?> payload
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
     UpdateOp op = new UpdateOp();
 //  ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //           ^^ definition local 4
 //              display_name op
 //              signature_documentation java UpdateOp op
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#`<init>`().
 
     op.type = type;
@@ -162,6 +167,7 @@ boolean isAfter(int position) {
 //                    ^^^^^^^^ definition local 5
 //                             display_name position
 //                             signature_documentation java int position
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#isAfter().
     return position < positionStart;
 //         ^^^^^^^^ reference local 5
 //                    ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
@@ -174,6 +180,7 @@ boolean isBefore(int position) {
 //                     ^^^^^^^^ definition local 6
 //                              display_name position
 //                              signature_documentation java int position
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#isBefore().
     return position >= positionEnd();
 //         ^^^^^^^^ reference local 6
 //                     ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionEnd().
@@ -186,6 +193,7 @@ boolean contains(int position) {
 //                     ^^^^^^^^ definition local 7
 //                              display_name position
 //                              signature_documentation java int position
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#contains().
     return position >= positionStart && position < positionEnd();
 //         ^^^^^^^^ reference local 7
 //                     ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
@@ -202,6 +210,7 @@ void addPayload(@Nullable EpoxyModel<?> payload) {
 //                                        ^^^^^^^ definition local 8
 //                                                display_name payload
 //                                                signature_documentation java @Nullable\nEpoxyModel<?> payload
+//                                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#addPayload().
     if (payload == null) {
 //      ^^^^^^^ reference local 8
       return;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
index b39399fa7..615fcc85e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
@@ -120,6 +120,7 @@ void add(int indexToInsert) {
 //             ^^^^^^^^^^^^^ definition local 0
 //                           display_name indexToInsert
 //                           signature_documentation java int indexToInsert
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add().
     add(indexToInsert, 1);
 //  ^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
 //      ^^^^^^^^^^^^^ reference local 0
@@ -132,9 +133,11 @@ void add(int startPosition, int itemCount) {
 //             ^^^^^^^^^^^^^ definition local 1
 //                           display_name startPosition
 //                           signature_documentation java int startPosition
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
 //                                ^^^^^^^^^ definition local 2
 //                                          display_name itemCount
 //                                          signature_documentation java int itemCount
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
     numInsertions += itemCount;
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
 //                   ^^^^^^^^^ reference local 2
@@ -145,6 +148,7 @@ void add(int startPosition, int itemCount) {
 //          ^^^^^^^^^^^^^ definition local 3
 //                        display_name batchWithLast
 //                        signature_documentation java boolean batchWithLast
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
 //                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //                                   ^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#ADD.
         && (lastOp.contains(startPosition) || lastOp.positionEnd() == startPosition);
@@ -178,6 +182,7 @@ void update(int indexToChange) {
 //                ^^^^^^^^^^^^^ definition local 4
 //                              display_name indexToChange
 //                              signature_documentation java int indexToChange
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update().
     update(indexToChange, null);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update(+1).
 //         ^^^^^^^^^^^^^ reference local 4
@@ -190,10 +195,12 @@ void update(final int indexToChange, EpoxyModel<?> payload) {
 //                      ^^^^^^^^^^^^^ definition local 5
 //                                    display_name indexToChange
 //                                    signature_documentation java final int indexToChange
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update(+1).
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                   ^^^^^^^ definition local 6
 //                                                           display_name payload
 //                                                           signature_documentation java EpoxyModel<?> payload
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update(+1).
     if (isLastOp(UPDATE)) {
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#UPDATE.
@@ -250,6 +257,7 @@ void remove(int indexToRemove) {
 //                ^^^^^^^^^^^^^ definition local 7
 //                              display_name indexToRemove
 //                              signature_documentation java int indexToRemove
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove().
     remove(indexToRemove, 1);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
 //         ^^^^^^^^^^^^^ reference local 7
@@ -262,9 +270,11 @@ void remove(int startPosition, int itemCount) {
 //                ^^^^^^^^^^^^^ definition local 8
 //                              display_name startPosition
 //                              signature_documentation java int startPosition
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
 //                                   ^^^^^^^^^ definition local 9
 //                                             display_name itemCount
 //                                             signature_documentation java int itemCount
+//                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
     numRemovals += itemCount;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
 //                 ^^^^^^^^^ reference local 9
@@ -273,6 +283,7 @@ void remove(int startPosition, int itemCount) {
 //          ^^^^^^^^^^^^^ definition local 10
 //                        display_name batchWithLast
 //                        signature_documentation java boolean batchWithLast
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
     if (isLastOp(REMOVE)) {
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#REMOVE.
@@ -327,6 +338,7 @@ private boolean isLastOp(@UpdateOp.Type int updateType) {
 //                                            ^^^^^^^^^^ definition local 11
 //                                                       display_name updateType
 //                                                       signature_documentation java @Type\nint updateType
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
     return lastOp != null && lastOp.type == updateType;
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
 //                           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
@@ -342,12 +354,15 @@ private void addNewOperation(@Type int type, int position, int itemCount) {
 //                                       ^^^^ definition local 12
 //                                            display_name type
 //                                            signature_documentation java @Type\nint type
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation().
 //                                                 ^^^^^^^^ definition local 13
 //                                                          display_name position
 //                                                          signature_documentation java int position
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation().
 //                                                               ^^^^^^^^^ definition local 14
 //                                                                         display_name itemCount
 //                                                                         signature_documentation java int itemCount
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation().
     addNewOperation(type, position, itemCount, null);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
 //                  ^^^^ reference local 12
@@ -363,18 +378,22 @@ private void addNewOperation(@Type int type, int position, int itemCount,
 //                                       ^^^^ definition local 15
 //                                            display_name type
 //                                            signature_documentation java @Type\nint type
+//                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
 //                                                 ^^^^^^^^ definition local 16
 //                                                          display_name position
 //                                                          signature_documentation java int position
+//                                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
 //                                                               ^^^^^^^^^ definition local 17
 //                                                                         display_name itemCount
 //                                                                         signature_documentation java int itemCount
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
       @Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^ definition local 18
 //                                    display_name payload
 //                                    signature_documentation java @Nullable\nEpoxyModel<?> payload
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
     lastOp = UpdateOp.instance(type, position, itemCount, payload);
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
@@ -396,10 +415,12 @@ private void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload) {
 //                                         ^^^^^^^^^^^^^ definition local 19
 //                                                       display_name numItemsToAdd
 //                                                       signature_documentation java int numItemsToAdd
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addItemsToLastOperation().
 //                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                      ^^^^^^^ definition local 20
 //                                                                              display_name payload
 //                                                                              signature_documentation java EpoxyModel<?> payload
+//                                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addItemsToLastOperation().
     lastOp.itemCount += numItemsToAdd;
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
@@ -417,9 +438,11 @@ void move(int from, int to) {
 //              ^^^^ definition local 21
 //                   display_name from
 //                   signature_documentation java int from
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#move().
 //                        ^^ definition local 22
 //                           display_name to
 //                           signature_documentation java int to
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#move().
     // We can't batch moves
     lastOp = null;
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
@@ -428,6 +451,7 @@ void move(int from, int to) {
 //           ^^ definition local 23
 //              display_name op
 //              signature_documentation java UpdateOp op
+//              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#move().
 //                ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
 //                                  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#MOVE.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
index 628323108..90b07b486 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
@@ -82,6 +82,7 @@ private ViewHolderState(int size) {
 //                            ^^^^ definition local 0
 //                                 display_name size
 //                                 signature_documentation java int size
+//                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`(+1).
     super(size);
 //  ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#`<init>`(+1).
 //        ^^^^ reference local 0
@@ -106,13 +107,16 @@ public void writeToParcel(Parcel dest, int flags) {
 //                                 ^^^^ definition local 1
 //                                      display_name dest
 //                                      signature_documentation java unresolved_type dest
+//                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
 //                                           ^^^^^ definition local 2
 //                                                 display_name flags
 //                                                 signature_documentation java int flags
+//                                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
     final int size = size();
 //            ^^^^ definition local 3
 //                 display_name size
 //                 signature_documentation java final int size
+//                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
 //                   ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
     dest.writeInt(size);
 //  ^^^^ reference local 1
@@ -122,6 +126,7 @@ public void writeToParcel(Parcel dest, int flags) {
 //           ^ definition local 4
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
 //                  ^ reference local 4
 //                      ^^^^ reference local 3
 //                            ^ reference local 4
@@ -173,6 +178,7 @@ public boolean hasStateForHolder(EpoxyViewHolder holder) {
 //                                                 ^^^^^^ definition local 5
 //                                                        display_name holder
 //                                                        signature_documentation java EpoxyViewHolder holder
+//                                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#hasStateForHolder().
     return get(holder.getItemId()) != null;
 //         ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //             ^^^^^^ reference local 5
@@ -188,11 +194,13 @@ public void save(Collection<EpoxyViewHolder> holders) {
 //                                             ^^^^^^^ definition local 6
 //                                                     display_name holders
 //                                                     signature_documentation java Collection<EpoxyViewHolder> holders
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save().
     for (EpoxyViewHolder holder : holders) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                       ^^^^^^ definition local 7
 //                              display_name holder
 //                              signature_documentation java EpoxyViewHolder holder
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save().
 //                                ^^^^^^^ reference local 6
       save(holder);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
@@ -210,6 +218,7 @@ public void save(EpoxyViewHolder holder) {
 //                                 ^^^^^^ definition local 8
 //                                        display_name holder
 //                                        signature_documentation java EpoxyViewHolder holder
+//                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
     if (!holder.getModel().shouldSaveViewState()) {
 //       ^^^^^^ reference local 8
 //              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -225,6 +234,7 @@ public void save(EpoxyViewHolder holder) {
 //            ^^^^^ definition local 9
 //                  display_name state
 //                  signature_documentation java ViewState state
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
 //                    ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //                        ^^^^^^ reference local 8
 //                               ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getItemId#
@@ -260,6 +270,7 @@ public void restore(EpoxyViewHolder holder) {
 //                                    ^^^^^^ definition local 10
 //                                           display_name holder
 //                                           signature_documentation java EpoxyViewHolder holder
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#restore().
     if (!holder.getModel().shouldSaveViewState()) {
 //       ^^^^^^ reference local 10
 //              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
@@ -272,6 +283,7 @@ public void restore(EpoxyViewHolder holder) {
 //            ^^^^^ definition local 11
 //                  display_name state
 //                  signature_documentation java ViewState state
+//                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#restore().
 //                    ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //                        ^^^^^^ reference local 10
 //                               ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getItemId#
@@ -319,19 +331,23 @@ private ViewState(int size, int[] keys, Parcelable[] values) {
 //                        ^^^^ definition local 12
 //                             display_name size
 //                             signature_documentation java int size
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`(+1).
 //                                    ^^^^ definition local 13
 //                                         display_name keys
 //                                         signature_documentation java int[] keys
+//                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`(+1).
 //                                          ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                                                       ^^^^^^ definition local 14
 //                                                              display_name values
 //                                                              signature_documentation java unresolved_type[] values
+//                                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`(+1).
       super(size);
 //          ^^^^ reference local 12
       for (int i = 0; i < size; ++i) {
 //             ^ definition local 15
 //               display_name i
 //               signature_documentation java int i
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`(+1).
 //                    ^ reference local 15
 //                        ^^^^ reference local 12
 //                                ^ reference local 15
@@ -352,10 +368,12 @@ public void save(View view) {
 //                        ^^^^ definition local 16
 //                             display_name view
 //                             signature_documentation java unresolved_type view
+//                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#save().
       int originalId = view.getId();
 //        ^^^^^^^^^^ definition local 17
 //                   display_name originalId
 //                   signature_documentation java int originalId
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#save().
 //                     ^^^^ reference local 16
 //                          ^^^^^ reference semanticdb maven . . View#getId#
       setIdIfNoneExists(view);
@@ -379,10 +397,12 @@ public void restore(View view) {
 //                           ^^^^ definition local 18
 //                                display_name view
 //                                signature_documentation java unresolved_type view
+//                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#restore().
       int originalId = view.getId();
 //        ^^^^^^^^^^ definition local 19
 //                   display_name originalId
 //                   signature_documentation java int originalId
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#restore().
 //                     ^^^^ reference local 18
 //                          ^^^^^ reference semanticdb maven . . View#getId#
       setIdIfNoneExists(view);
@@ -413,6 +433,7 @@ private void setIdIfNoneExists(View view) {
 //                                      ^^^^ definition local 20
 //                                           display_name view
 //                                           signature_documentation java unresolved_type view
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#setIdIfNoneExists().
       if (view.getId() == View.NO_ID) {
 //        ^^^^ reference local 20
 //             ^^^^^ reference semanticdb maven . . View#getId#
@@ -446,30 +467,36 @@ public void writeToParcel(Parcel parcel, int flags) {
 //                                   ^^^^^^ definition local 21
 //                                          display_name parcel
 //                                          signature_documentation java unresolved_type parcel
+//                                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
 //                                               ^^^^^ definition local 22
 //                                                     display_name flags
 //                                                     signature_documentation java int flags
+//                                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
       int size = size();
 //        ^^^^ definition local 23
 //             display_name size
 //             signature_documentation java int size
+//             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
 //               ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
       int[] keys = new int[size];
 //          ^^^^ definition local 24
 //               display_name keys
 //               signature_documentation java int[] keys
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
 //                         ^^^^ reference local 23
       Parcelable[] values = new Parcelable[size];
 //    ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                 ^^^^^^ definition local 25
 //                        display_name values
 //                        signature_documentation java unresolved_type[] values
+//                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
 //                              ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                                         ^^^^ reference local 23
       for (int i = 0; i < size; ++i) {
 //             ^ definition local 26
 //               display_name i
 //               signature_documentation java int i
+//               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
 //                    ^ reference local 26
 //                        ^^^^ reference local 23
 //                                ^ reference local 26
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
index 2d27b9fc8..8545437a2 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
@@ -72,6 +72,7 @@ int getViewTypeAndRememberModel(EpoxyModel<?> model) {
 //                                              ^^^^^ definition local 0
 //                                                    display_name model
 //                                                    signature_documentation java EpoxyModel<?> model
+//                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewTypeAndRememberModel().
     lastModelForViewTypeLookup = model;
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
 //                               ^^^^^ reference local 0
@@ -88,10 +89,12 @@ static int getViewType(EpoxyModel<?> model) {
 //                                     ^^^^^ definition local 1
 //                                           display_name model
 //                                           signature_documentation java EpoxyModel<?> model
+//                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
     int defaultViewType = model.getViewType();
 //      ^^^^^^^^^^^^^^^ definition local 2
 //                      display_name defaultViewType
 //                      signature_documentation java int defaultViewType
+//                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
 //                        ^^^^^ reference local 1
 //                              ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
     if (defaultViewType != 0) {
@@ -107,6 +110,7 @@ static int getViewType(EpoxyModel<?> model) {
 //        ^^^^^^^^^^ definition local 3
 //                   display_name modelClass
 //                   signature_documentation java Class modelClass
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
 //                     ^^^^^ reference local 1
 //                           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
 
@@ -115,6 +119,7 @@ static int getViewType(EpoxyModel<?> model) {
 //          ^^^^^^^^ definition local 4
 //                   display_name viewType
 //                   signature_documentation java Integer viewType
+//                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
 //                     ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
 //                                   ^^^ reference semanticdb maven jdk 11 java/util/Map#get().
 //                                       ^^^^^^^^^^ reference local 3
@@ -161,9 +166,11 @@ EpoxyModel<?> getModelForViewType(BaseEpoxyAdapter adapter, int viewType) {
 //                                                   ^^^^^^^ definition local 5
 //                                                           display_name adapter
 //                                                           signature_documentation java BaseEpoxyAdapter adapter
+//                                                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
 //                                                                ^^^^^^^^ definition local 6
 //                                                                         display_name viewType
 //                                                                         signature_documentation java int viewType
+//                                                                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
     if (lastModelForViewTypeLookup != null
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
         && getViewType(lastModelForViewTypeLookup) == viewType) {
@@ -187,6 +194,7 @@ && getViewType(lastModelForViewTypeLookup) == viewType) {
 //                     ^^^^^ definition local 7
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
+//                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
 //                             ^^^^^^^ reference local 5
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
       if (getViewType(model) == viewType) {
@@ -204,6 +212,7 @@ && getViewType(lastModelForViewTypeLookup) == viewType) {
 //                   ^^^^^^^^^^^^^^^^ definition local 8
 //                                    display_name hiddenEpoxyModel
 //                                    signature_documentation java HiddenEpoxyModel hiddenEpoxyModel
+//                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
 //                                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
     if (viewType == hiddenEpoxyModel.getViewType()) {
 //      ^^^^^^^^ reference local 6
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
index 917cf3a66..c14e02419 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
@@ -55,6 +55,7 @@ public WrappedEpoxyModelCheckedChangeListener(
 //                                       ^^^^^^^^^^^^^^^ definition local 0
 //                                                       display_name checkedListener
 //                                                       signature_documentation java OnModelCheckedChangeListener<T, V> checkedListener
+//                                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#`<init>`().
   ) {
     if (checkedListener == null) {
 //      ^^^^^^^^^^^^^^^ reference local 0
@@ -77,14 +78,17 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 //                                            ^^^^^^ definition local 1
 //                                                   display_name button
 //                                                   signature_documentation java unresolved_type button
+//                                                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
 //                                                            ^^^^^^^^^ definition local 2
 //                                                                      display_name isChecked
 //                                                                      signature_documentation java boolean isChecked
+//                                                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
     EpoxyViewHolder epoxyHolder = ListenersUtils.getEpoxyHolderForChildView(button);
 //  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                  ^^^^^^^^^^^ definition local 3
 //                              display_name epoxyHolder
 //                              signature_documentation java EpoxyViewHolder epoxyHolder
+//                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
 //                                ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
 //                                                                          ^^^^^^ reference local 1
@@ -103,6 +107,7 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 //            ^^^^^^^^^^^^^^^ definition local 4
 //                            display_name adapterPosition
 //                            signature_documentation java final int adapterPosition
+//                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
 //                              ^^^^^^^^^^^ reference local 3
 //                                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     if (adapterPosition != RecyclerView.NO_POSITION) {
@@ -137,6 +142,7 @@ public boolean equals(Object o) {
 //                             ^ definition local 5
 //                               display_name o
 //                               signature_documentation java Object o
+//                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#equals().
     if (this == o) {
 //              ^ reference local 5
       return true;
@@ -153,6 +159,7 @@ public boolean equals(Object o) {
 //      ^^^^ definition local 6
 //           display_name that
 //           signature_documentation java WrappedEpoxyModelCheckedChangeListener<?, ?> that
+//           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#equals().
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#
 //                                                            ^ reference local 5
 
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
index 7614f489d..fa19800c8 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
@@ -22,6 +22,7 @@ public static int app(int n) {
 //                          ^ definition local 0
 //                            display_name n
 //                            signature_documentation java int n
+//                            enclosing_symbol semanticdb maven . . minimized/AnonymousClasses#app().
     Function<Integer, Integer> fn =
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //           ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
@@ -29,6 +30,7 @@ public static int app(int n) {
 //                             ^^ definition local 1
 //                                display_name fn
 //                                signature_documentation java Function<Integer, Integer> fn
+//                                enclosing_symbol semanticdb maven . . minimized/AnonymousClasses#app().
         new Function<Integer, Integer>() {
 //          ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //                   ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
@@ -40,11 +42,13 @@ public Integer apply(Integer integer) {
 //                       ^^^^^ definition local 3
 //                             display_name apply
 //                             signature_documentation java @Override\npublic Integer apply(Integer integer)
+//                             enclosing_symbol local 2
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/function/Function#apply().
 //                             ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                                     ^^^^^^^ definition local 4
 //                                             display_name integer
 //                                             signature_documentation java Integer integer
+//                                             enclosing_symbol local 3
             return integer + n;
 //                 ^^^^^^^ reference local 4
 //                           ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
index d81342194..4729c71a8 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
@@ -16,20 +16,24 @@ public static String app() {
 //        ^ definition local 0
 //          display_name a
 //          signature_documentation java int[] a
+//          enclosing_symbol semanticdb maven . . minimized/Arrays#app().
     String[] b = {"1", "2", "3"};
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^ definition local 1
 //             display_name b
 //             signature_documentation java String[] b
+//             enclosing_symbol semanticdb maven . . minimized/Arrays#app().
     int[][] c = {{1}, {2}, {3}};
 //          ^ definition local 2
 //            display_name c
 //            signature_documentation java int[][] c
+//            enclosing_symbol semanticdb maven . . minimized/Arrays#app().
     String[][] d = {{"1"}, {"2"}, {"3"}};
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //             ^ definition local 3
 //               display_name d
 //               signature_documentation java String[][] d
+//               enclosing_symbol semanticdb maven . . minimized/Arrays#app().
     return b[0] + a[0] + c[1][0] + d[1][0];
 //         ^ reference local 1
 //                ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
index 18bb951c5..2e55c1800 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
@@ -44,6 +44,7 @@ public static int methodParameter(int n) {
 //                                      ^ definition local 0
 //                                        display_name n
 //                                        signature_documentation java int n
+//                                        enclosing_symbol semanticdb maven . . minimized/Docstrings#methodParameter().
     return n + 42;
 //         ^ reference local 0
   }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
index 21fab3138..a94eca703 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
@@ -46,9 +46,11 @@ enum Enums {
 //             ^^^^^ definition local 0
 //                   display_name value
 //                   signature_documentation java String value
+//                   enclosing_symbol semanticdb maven . . minimized/Enums#`<init>`().
 //                        ^ definition local 1
 //                          display_name a
 //                          signature_documentation java int a
+//                          enclosing_symbol semanticdb maven . . minimized/Enums#`<init>`().
     this.value = value;
 //       ^^^^^ reference semanticdb maven . . minimized/Enums#value.
 //               ^^^^^ reference local 0
@@ -64,6 +66,7 @@ public static String app() {
 //         ^^^ definition local 2
 //             display_name all
 //             signature_documentation java String all
+//             enclosing_symbol semanticdb maven . . minimized/Enums#app().
 //               ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#stream().
 //                             ^^^^^^ reference semanticdb maven . . minimized/Enums#values().
@@ -71,6 +74,7 @@ public static String app() {
 //                                           ^ definition local 3
 //                                             display_name e
 //                                             signature_documentation java Enums e
+//                                             enclosing_symbol semanticdb maven . . minimized/Enums#app().
 //                                                ^ reference local 3
 //                                                  ^^^^^ reference semanticdb maven . . minimized/Enums#value.
 //                                                         ^^^ reference semanticdb maven jdk 11 java/util/stream/Stream#map().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
index 6b41426e0..f8e762a58 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
@@ -73,12 +73,14 @@ public static String app() {
 //         ^^^^^^ definition local 0
 //                display_name fields
 //                signature_documentation java Fields fields
+//                enclosing_symbol semanticdb maven . . minimized/Fields#app().
 //                      ^^^^^^ reference semanticdb maven . . minimized/Fields#`<init>`().
     InnerFields innerFields = fields.new InnerFields();
 //  ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#
 //              ^^^^^^^^^^^ definition local 1
 //                          display_name innerFields
 //                          signature_documentation java InnerFields innerFields
+//                          enclosing_symbol semanticdb maven . . minimized/Fields#app().
 //                            ^^^^^^ reference local 0
 //                                       ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#`<init>`().
     InnerStaticFields innerStaticFields = new InnerStaticFields();
@@ -86,6 +88,7 @@ public static String app() {
 //                    ^^^^^^^^^^^^^^^^^ definition local 2
 //                                      display_name innerStaticFields
 //                                      signature_documentation java InnerStaticFields innerStaticFields
+//                                      enclosing_symbol semanticdb maven . . minimized/Fields#app().
 //                                            ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#`<init>`().
     return String.valueOf(fields.privateField)
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
index 5ec3bda9e..f534ecc4c 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
@@ -23,12 +23,14 @@ public static int app(int n) {
 //                          ^ definition local 0
 //                            display_name n
 //                            signature_documentation java int n
+//                            enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app().
     List<Integer> integers = Collections.singletonList(n);
 //  ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //       ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                ^^^^^^^^ definition local 1
 //                         display_name integers
 //                         signature_documentation java List<Integer> integers
+//                         enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app().
 //                           ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                       ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList().
 //                                                     ^ reference local 0
@@ -36,10 +38,12 @@ public static int app(int n) {
 //      ^^^^^^ definition local 2
 //             display_name result
 //             signature_documentation java int result
+//             enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app().
     for (int i : integers) {
 //           ^ definition local 3
 //             display_name i
 //             signature_documentation java int i
+//             enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app().
 //               ^^^^^^^^ reference local 1
       result += i;
 //    ^^^^^^ reference local 2
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
index e2f82175b..0dc6ca08c 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
@@ -32,6 +32,7 @@ public InnerClasses(int exampleField) {
 //                        ^^^^^^^^^^^^ definition local 0
 //                                     display_name exampleField
 //                                     signature_documentation java int exampleField
+//                                     enclosing_symbol semanticdb maven . . minimized/InnerClasses#`<init>`().
     this.exampleField = exampleField;
 //       ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#exampleField.
 //                      ^^^^^^^^^^^^ reference local 0
@@ -84,6 +85,7 @@ public interface InnerInterface<A, B> {
 //            ^ definition local 1
 //              display_name a
 //              signature_documentation java A a
+//              enclosing_symbol semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
   }
 
   public @interface InnerAnnotation {
@@ -138,6 +140,7 @@ public InnerClass(int field) {
 //                        ^^^^^ definition local 2
 //                              display_name field
 //                              signature_documentation java int field
+//                              enclosing_symbol semanticdb maven . . minimized/InnerClasses#InnerClass#`<init>`().
       this.field = field;
 //         ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field.
 //                 ^^^^^ reference local 2
@@ -167,6 +170,7 @@ public Integer apply(Integer integer) {
 //                               ^^^^^^^ definition local 3
 //                                       display_name integer
 //                                       signature_documentation java Integer integer
+//                                       enclosing_symbol semanticdb maven . . minimized/InnerClasses#InnerClass#apply().
       return field * integer;
 //           ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#field.
 //                   ^^^^^^^ reference local 3
@@ -190,10 +194,12 @@ private static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a) {
 //                                                               ^^ definition local 4
 //                                                                  display_name fn
 //                                                                  signature_documentation java InnerInterface<A, B> fn
+//                                                                  enclosing_symbol semanticdb maven . . minimized/InnerClasses#runInnerInterface().
 //                                                                   ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
 //                                                                     ^ definition local 5
 //                                                                       display_name a
 //                                                                       signature_documentation java A a
+//                                                                       enclosing_symbol semanticdb maven . . minimized/InnerClasses#runInnerInterface().
     return fn.apply(a);
 //         ^^ reference local 4
 //            ^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
@@ -208,6 +214,7 @@ public static void testEnum(InnerEnum magicEnum) {
 //                                      ^^^^^^^^^ definition local 6
 //                                                display_name magicEnum
 //                                                signature_documentation java InnerEnum magicEnum
+//                                                enclosing_symbol semanticdb maven . . minimized/InnerClasses#testEnum().
     if (System.nanoTime() > System.currentTimeMillis()) {
 //      ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#nanoTime().
@@ -268,6 +275,7 @@ public static void testAnon() {
 //                                 ^^ definition local 7
 //                                    display_name fn
 //                                    signature_documentation java InnerInterface<String, String> fn
+//                                    enclosing_symbol semanticdb maven . . minimized/InnerClasses#testAnon().
         new InnerInterface<String, String>() {
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
@@ -279,11 +287,13 @@ public String apply(String s) {
 //                      ^^^^^ definition local 9
 //                            display_name apply
 //                            signature_documentation java @Override\npublic String apply(String s)
+//                            enclosing_symbol local 8
 //                            relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //                            ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                   ^ definition local 10
 //                                     display_name s
 //                                     signature_documentation java String s
+//                                     enclosing_symbol local 9
             return s + "b";
 //                 ^ reference local 10
           }
@@ -305,6 +315,7 @@ public static String app() {
 //      ^ definition local 11
 //        display_name a
 //        signature_documentation java int a
+//        enclosing_symbol semanticdb maven . . minimized/InnerClasses#app().
     InnerStaticClass.innerStaticMethod();
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass#
 //                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod().
@@ -313,6 +324,7 @@ public static String app() {
 //               ^^^^^^^^^^^^ definition local 12
 //                            display_name innerClasses
 //                            signature_documentation java InnerClasses innerClasses
+//                            enclosing_symbol semanticdb maven . . minimized/InnerClasses#app().
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#`<init>`().
 //                                               ^ reference local 11
     InnerClass innerClass = innerClasses.new InnerClass(a);
@@ -320,6 +332,7 @@ public static String app() {
 //             ^^^^^^^^^^ definition local 13
 //                        display_name innerClass
 //                        signature_documentation java InnerClass innerClass
+//                        enclosing_symbol semanticdb maven . . minimized/InnerClasses#app().
 //                          ^^^^^^^^^^^^ reference local 12
 //                                           ^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#`<init>`().
 //                                                      ^ reference local 11
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
index 8ba6a1a94..79e8497c5 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
@@ -79,9 +79,11 @@ class Hello {
 //              ^^^^^^^ definition local 0
 //                      display_name message
 //                      signature_documentation java final String message
+//                      enclosing_symbol semanticdb maven . . minimized/Hello#`<init>`().
 //              ^^^^^^^ definition local 1
 //                      display_name message
 //                      signature_documentation java final String message
+//                      enclosing_symbol semanticdb maven . . minimized/Hello#HelloBuilder#message().
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message().
 //                      display_name message
 //                      signature_documentation java @SuppressWarnings("all")\npublic HelloBuilder message(String message)
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
index b05dd6057..a8a01442a 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
@@ -14,6 +14,7 @@ private int overload(int value) {
 //                         ^^^^^ definition local 0
 //                               display_name value
 //                               signature_documentation java int value
+//                               enclosing_symbol semanticdb maven . . minimized/Methods#overload().
     return value + 1;
 //         ^^^^^ reference local 0
   }
@@ -27,6 +28,7 @@ private String overload(String value) {
 //                               ^^^^^ definition local 1
 //                                     display_name value
 //                                     signature_documentation java String value
+//                                     enclosing_symbol semanticdb maven . . minimized/Methods#overload(+1).
     return value + "1";
 //         ^^^^^ reference local 1
   }
@@ -38,6 +40,7 @@ private static int staticOverload(int value) {
 //                                      ^^^^^ definition local 2
 //                                            display_name value
 //                                            signature_documentation java int value
+//                                            enclosing_symbol semanticdb maven . . minimized/Methods#staticOverload().
     return value + 1;
 //         ^^^^^ reference local 2
   }
@@ -51,6 +54,7 @@ private static String staticOverload(String value) {
 //                                            ^^^^^ definition local 3
 //                                                  display_name value
 //                                                  signature_documentation java String value
+//                                                  enclosing_symbol semanticdb maven . . minimized/Methods#staticOverload(+1).
     return value + "1";
 //         ^^^^^ reference local 3
   }
@@ -63,10 +67,12 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //                             ^ definition local 4
 //                               display_name n
 //                               signature_documentation java int n
+//                               enclosing_symbol semanticdb maven . . minimized/Methods#app().
 //                                ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                       ^ definition local 5
 //                                         display_name m
 //                                         signature_documentation java String m
+//                                         enclosing_symbol semanticdb maven . . minimized/Methods#app().
 //                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
 //                                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/IndexOutOfBoundsException#
     Methods methods = new Methods();
@@ -74,11 +80,13 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //          ^^^^^^^ definition local 6
 //                  display_name methods
 //                  signature_documentation java Methods methods
+//                  enclosing_symbol semanticdb maven . . minimized/Methods#app().
 //                        ^^^^^^^ reference semanticdb maven . . minimized/Methods#`<init>`().
     int a = staticOverload(n);
 //      ^ definition local 7
 //        display_name a
 //        signature_documentation java int a
+//        enclosing_symbol semanticdb maven . . minimized/Methods#app().
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload().
 //                         ^ reference local 4
     String b = staticOverload(m);
@@ -86,12 +94,14 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //         ^ definition local 8
 //           display_name b
 //           signature_documentation java String b
+//           enclosing_symbol semanticdb maven . . minimized/Methods#app().
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload(+1).
 //                            ^ reference local 5
     int c = methods.overload(n);
 //      ^ definition local 9
 //        display_name c
 //        signature_documentation java int c
+//        enclosing_symbol semanticdb maven . . minimized/Methods#app().
 //          ^^^^^^^ reference local 6
 //                  ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload().
 //                           ^ reference local 4
@@ -100,6 +110,7 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //         ^ definition local 10
 //           display_name d
 //           signature_documentation java String d
+//           enclosing_symbol semanticdb maven . . minimized/Methods#app().
 //             ^^^^^^^ reference local 6
 //                     ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload(+1).
 //                              ^ reference local 5
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
index 4536048df..252391420 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
@@ -19,6 +19,7 @@ public static void main(String[] args) {
 //                                 ^^^^ definition local 0
 //                                      display_name args
 //                                      signature_documentation java String[] args
+//                                      enclosing_symbol semanticdb maven . . minimized/MinimizedJavaMain#main().
     TypeVariables.app(new TypeVariables.CT());
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . minimized/TypeVariables#
 //                ^^^ reference semanticdb maven . . minimized/TypeVariables#app().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
index 7fa36d4b8..4df6e8f95 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
@@ -47,6 +47,7 @@ public <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list) {}
 //                                                                       ^^^^ definition local 0
 //                                                                            display_name list
 //                                                                            signature_documentation java List<T> list
+//                                                                            enclosing_symbol semanticdb maven . . minimized/ParameterizedTypes#iteratorable().
 
   public String app(A a, B b) {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
@@ -57,10 +58,12 @@ public String app(A a, B b) {
 //                    ^ definition local 1
 //                      display_name a
 //                      signature_documentation java A a
+//                      enclosing_symbol semanticdb maven . . minimized/ParameterizedTypes#app().
 //                       ^ reference semanticdb maven . . minimized/ParameterizedTypes#[B]
 //                         ^ definition local 2
 //                           display_name b
 //                           signature_documentation java B b
+//                           enclosing_symbol semanticdb maven . . minimized/ParameterizedTypes#app().
     return a.toString() + b;
 //         ^ reference local 1
 //           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#toString().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
index 8242514c7..6b777b032 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
@@ -22,53 +22,62 @@ public static String app() {
 //         ^^^^^^ definition local 0
 //                display_name random
 //                signature_documentation java Random random
+//                enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/Random#`<init>`().
     byte a = (byte) random.nextInt();
 //       ^ definition local 1
 //         display_name a
 //         signature_documentation java byte a
+//         enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //                  ^^^^^^ reference local 0
 //                         ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     short b = (short) random.nextInt();
 //        ^ definition local 2
 //          display_name b
 //          signature_documentation java short b
+//          enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //                    ^^^^^^ reference local 0
 //                           ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     int c = random.nextInt();
 //      ^ definition local 3
 //        display_name c
 //        signature_documentation java int c
+//        enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //          ^^^^^^ reference local 0
 //                 ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     long d = random.nextLong();
 //       ^ definition local 4
 //         display_name d
 //         signature_documentation java long d
+//         enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //           ^^^^^^ reference local 0
 //                  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextLong().
     char e = (char) random.nextInt();
 //       ^ definition local 5
 //         display_name e
 //         signature_documentation java char e
+//         enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //                  ^^^^^^ reference local 0
 //                         ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     float f = (float) random.nextDouble();
 //        ^ definition local 6
 //          display_name f
 //          signature_documentation java float f
+//          enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //                    ^^^^^^ reference local 0
 //                           ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble().
     double g = (double) random.nextDouble();
 //         ^ definition local 7
 //           display_name g
 //           signature_documentation java double g
+//           enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //                      ^^^^^^ reference local 0
 //                             ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble().
     boolean h = random.nextBoolean();
 //          ^ definition local 8
 //            display_name h
 //            signature_documentation java boolean h
+//            enclosing_symbol semanticdb maven . . minimized/Primitives#app().
 //              ^^^^^^ reference local 0
 //                     ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextBoolean().
     return "" + a + b + c + d + e + f + g + h;
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
index aab6c1304..541aff9a2 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
@@ -44,6 +44,7 @@ public static String app() {
 //             ^ definition local 0
 //               display_name s
 //               signature_documentation java SubClasses s
+//               enclosing_symbol semanticdb maven . . minimized/SubClasses#app().
 //                     ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#`<init>`().
     return s.abstractImplementation()
 //         ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
index 28ba5ecea..3b80f4674 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
@@ -16,6 +16,7 @@ public class TabIndented {
 //       ^ definition local 0
 //         display_name o
 //         signature_documentation java Object o
+//         enclosing_symbol semanticdb maven . . minimized/TabIndented#app().
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 →→→@Override
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -23,11 +24,13 @@ public class TabIndented {
 //                ^^^^^^ definition local 2
 //                       display_name equals
 //                       signature_documentation java @Override\npublic boolean equals(Object other)
+//                       enclosing_symbol local 1
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                              ^^^^^ definition local 3
 //                                    display_name other
 //                                    signature_documentation java Object other
+//                                    enclosing_symbol local 2
 →→→→return false;
 →→→}
 
@@ -37,6 +40,7 @@ public class TabIndented {
 //            ^^^^^^^^ definition local 4
 //                     display_name hashCode
 //                     signature_documentation java @Override\npublic int hashCode()
+//                     enclosing_symbol local 1
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
 →→→→return System.identityHashCode(this);
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
@@ -50,6 +54,7 @@ public class TabIndented {
 //               ^^^^^^^^ definition local 5
 //                        display_name toString
 //                        signature_documentation java @Override\npublic String toString()
+//                        enclosing_symbol local 1
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 →→→→return "";
 →→→}
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
index 579559a60..36ceee38a 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
@@ -74,6 +74,7 @@ public static <T extends C & I> void app(T t) {
 //                                           ^ definition local 0
 //                                             display_name t
 //                                             signature_documentation java T t
+//                                             enclosing_symbol semanticdb maven . . minimized/TypeVariables#app().
     t.mI();
 //  ^ reference local 0
 //    ^^ reference semanticdb maven . . minimized/TypeVariables#I#mI().

From 34fb7edffb4f0f021704d03152671ff203aab348 Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Mon, 8 Jan 2024 15:48:31 +0100
Subject: [PATCH 08/11] Build SCIP kind from SematicDB kind and properties

This also updates the ScipPrinters testing utility and the tests
accordingly.
---
 .../sourcegraph/scip_java/ScipPrinters.scala  |   7 +
 .../scip_semanticdb/ScipSemanticdb.java       |  71 ++++++
 .../src/main/generated/BaseByteRenderer.scala |  68 +++++
 .../src/main/generated/BaseCharRenderer.scala |  68 +++++
 .../src/main/generated/ByteParser.scala       | 148 +++++++++++
 .../src/main/generated/CharParser.scala       | 148 +++++++++++
 .../airbnb/epoxy/AsyncEpoxyController.java    |   5 +
 .../com/airbnb/epoxy/AsyncEpoxyDiffer.java    |  37 +++
 .../com/airbnb/epoxy/BaseEpoxyAdapter.java    |  39 +++
 .../airbnb/epoxy/BaseEpoxyTouchCallback.java  |   4 +
 .../com/airbnb/epoxy/BoundViewHolders.java    |  15 ++
 .../generated/com/airbnb/epoxy/Carousel.java  |  49 ++++
 .../com/airbnb/epoxy/ControllerHelper.java    |   6 +
 .../airbnb/epoxy/ControllerHelperLookup.java  |   7 +
 .../com/airbnb/epoxy/ControllerModelList.java |   6 +
 .../com/airbnb/epoxy/DebugTimer.java          |   8 +
 .../com/airbnb/epoxy/DiffHelper.java          |  21 ++
 .../com/airbnb/epoxy/DiffPayload.java         |   7 +
 .../com/airbnb/epoxy/DiffResult.java          |  11 +
 .../com/airbnb/epoxy/EpoxyAdapter.java        |  32 +++
 .../com/airbnb/epoxy/EpoxyAsyncUtil.java      |   8 +
 .../com/airbnb/epoxy/EpoxyController.java     |  94 +++++++
 .../airbnb/epoxy/EpoxyControllerAdapter.java  |  33 +++
 .../com/airbnb/epoxy/EpoxyDiffLogger.java     |   8 +
 .../com/airbnb/epoxy/EpoxyDragCallback.java   |   5 +
 .../com/airbnb/epoxy/EpoxyHolder.java         |   4 +
 .../epoxy/EpoxyItemSpacingDecorator.java      |  24 ++
 .../com/airbnb/epoxy/EpoxyModel.java          |  63 +++++
 .../com/airbnb/epoxy/EpoxyModelGroup.java     |  33 +++
 .../airbnb/epoxy/EpoxyModelTouchCallback.java |  28 ++
 .../airbnb/epoxy/EpoxyModelWithHolder.java    |  14 +
 .../com/airbnb/epoxy/EpoxyModelWithView.java  |   7 +
 .../com/airbnb/epoxy/EpoxySwipeCallback.java  |   6 +
 .../com/airbnb/epoxy/EpoxyTouchHelper.java    |  89 +++++++
 .../epoxy/EpoxyTouchHelperCallback.java       |  26 ++
 .../com/airbnb/epoxy/EpoxyViewHolder.java     |  18 ++
 .../com/airbnb/epoxy/GeneratedModel.java      |   4 +
 .../com/airbnb/epoxy/HandlerExecutor.java     |   4 +
 .../com/airbnb/epoxy/HiddenEpoxyModel.java    |   4 +
 .../generated/com/airbnb/epoxy/IdUtils.java   |   4 +
 .../com/airbnb/epoxy/IllegalEpoxyUsage.java   |   2 +
 .../airbnb/epoxy/ImmutableModelException.java |   5 +
 .../com/airbnb/epoxy/ListenersUtils.java      |   4 +
 .../com/airbnb/epoxy/MainThreadExecutor.java  |   4 +
 .../generated/com/airbnb/epoxy/ModelList.java |  76 ++++++
 .../com/airbnb/epoxy/ModelState.java          |  11 +
 .../airbnb/epoxy/NoOpControllerHelper.java    |   3 +
 .../generated/com/airbnb/epoxy/NoOpTimer.java |   4 +
 .../com/airbnb/epoxy/NotifyBlocker.java       |  11 +
 .../airbnb/epoxy/OnModelBoundListener.java    |   4 +
 .../epoxy/OnModelBuildFinishedListener.java   |   2 +
 .../epoxy/OnModelCheckedChangeListener.java   |   4 +
 .../airbnb/epoxy/OnModelClickListener.java    |   4 +
 .../epoxy/OnModelLongClickListener.java       |   4 +
 .../airbnb/epoxy/OnModelUnboundListener.java  |   4 +
 .../OnModelVisibilityChangedListener.java     |   4 +
 ...OnModelVisibilityStateChangedListener.java |   4 +
 .../epoxy/QuantityStringResAttribute.java     |  12 +
 .../com/airbnb/epoxy/SimpleEpoxyAdapter.java  |  26 ++
 .../airbnb/epoxy/SimpleEpoxyController.java   |   7 +
 .../com/airbnb/epoxy/SimpleEpoxyModel.java    |  13 +
 .../com/airbnb/epoxy/StringAttributeData.java |  20 ++
 .../airbnb/epoxy/StyleBuilderCallback.java    |   3 +
 .../generated/com/airbnb/epoxy/Timer.java     |   3 +
 .../airbnb/epoxy/Typed2EpoxyController.java   |  14 +
 .../airbnb/epoxy/Typed3EpoxyController.java   |  16 ++
 .../airbnb/epoxy/Typed4EpoxyController.java   |  18 ++
 .../airbnb/epoxy/TypedEpoxyController.java    |  13 +
 .../generated/com/airbnb/epoxy/UpdateOp.java  |  18 ++
 .../com/airbnb/epoxy/UpdateOpHelper.java      |  28 ++
 .../com/airbnb/epoxy/ViewHolderState.java     |  19 ++
 .../com/airbnb/epoxy/ViewTypeManager.java     |   8 +
 .../com/airbnb/epoxy/VisibilityState.java     |  10 +
 ...rappedEpoxyModelCheckedChangeListener.java |   8 +
 .../src/main/scala/minimized/Issue396.scala   |  12 +
 .../src/main/scala/minimized/Issue397.scala   |   4 +
 .../src/main/scala/minimized/Issue403.scala   |  14 +
 .../src/main/scala/minimized/Issue412.scala   |   6 +
 .../src/main/scala/minimized/Issue413.scala   |  11 +
 .../src/main/scala/minimized/Issue414.scala   |   7 +
 .../scala/minimized/Issue414Reference.scala   |   1 +
 .../scala/minimized/MinimizedScalaMain.scala  |   3 +
 .../minimized/MinimizedScalaSignatures.scala  |  66 +++++
 .../minimized/MinimizedScalaSynthetic.scala   |  11 +
 .../main/scala/minimized/ReflectiveCall.scala |   5 +
 .../main/java/minimized/AbstractClasses.java  |   4 +
 .../src/main/java/minimized/Annotations.java  |   3 +
 .../main/java/minimized/AnonymousClasses.java |   4 +
 .../src/main/java/minimized/Arrays.java       |   3 +
 .../src/main/java/minimized/ClassOf.java      |   3 +
 .../src/main/java/minimized/Docstrings.java   |   6 +
 .../src/main/java/minimized/Enums.java        |   4 +
 .../src/main/java/minimized/Fields.java       |  16 ++
 .../java/minimized/ForComprehensions.java     |   3 +
 .../src/main/java/minimized/InnerClasses.java |  29 +++
 .../src/main/java/minimized/Interfaces.java   |   4 +
 .../main/java/minimized/LombokBuilder.java    |  10 +
 .../src/main/java/minimized/Methods.java      |   7 +
 .../java/minimized/MinimizedJavaMain.java     |   3 +
 .../java/minimized/ParameterizedTypes.java    |  15 ++
 .../src/main/java/minimized/Primitives.java   |   4 +
 .../src/main/java/minimized/RawTypes.java     |   3 +
 .../src/main/java/minimized/SubClasses.java   |   5 +
 .../src/main/java/minimized/TabIndented.java  |   6 +
 .../main/java/minimized/TypeVariables.java    |  14 +
 .../main/generated/ujson/AstTransformer.scala |  51 ++++
 .../generated/ujson/ByteArrayParser.scala     |  17 ++
 .../generated/ujson/ByteBufferParser.scala    |  18 ++
 .../generated/ujson/CharSequenceParser.scala  |  16 ++
 .../src/main/generated/ujson/Exceptions.scala |  27 ++
 .../main/generated/ujson/IndexedValue.scala   | 186 ++++++++++++++
 .../generated/ujson/InputStreamParser.scala   |  16 ++
 .../src/main/generated/ujson/JsVisitor.scala  |  44 ++++
 .../src/main/generated/ujson/Readable.scala   |  50 ++++
 .../src/main/generated/ujson/Renderer.scala   |  49 ++++
 .../main/generated/ujson/StringParser.scala   |  17 ++
 .../main/generated/ujson/Transformer.scala    |   9 +
 .../src/main/generated/ujson/Value.scala      | 241 ++++++++++++++++++
 .../src/main/generated/ujson/package.scala    |  54 ++++
 119 files changed, 2700 insertions(+)

diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
index 56b633a14..53fafcb18 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
@@ -193,6 +193,13 @@ object ScipPrinters {
             .append(info.getEnclosingSymbol)
             .append("\n")
         }
+        if (info.getKind != Scip.SymbolInformation.Kind.UnspecifiedKind) {
+          out
+            .append(prefix)
+            .append("kind ")
+            .append(info.getKind)
+            .append("\n")
+        }
         0.until(info.getDocumentationCount)
           .foreach { n =>
             val documentation = info.getDocumentation(n)
diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
index 2f3211966..3bd4c67b6 100644
--- a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
+++ b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java
@@ -4,6 +4,8 @@
 import com.sourcegraph.lsif_protocol.MarkupKind;
 import com.sourcegraph.semanticdb_javac.Semanticdb;
 import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation;
+import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Kind;
+import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Property;
 import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence;
 import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role;
 import com.sourcegraph.semanticdb_javac.SemanticdbSymbols;
@@ -79,6 +81,73 @@ private String typedSymbol(String symbol, Package pkg) {
     return "semanticdb maven " + pkg.repoName() + " " + pkg.version() + " " + symbol;
   }
 
+  private static Scip.SymbolInformation.Kind scipKind(SymbolInformation info) {
+    Kind kind = info.getKind();
+    int properties = info.getProperties();
+    boolean isStatic = (properties & Property.STATIC_VALUE) > 0;
+    boolean isAbstract = (properties & Property.ABSTRACT_VALUE) > 0;
+    boolean isEnum = (properties & Property.ENUM_VALUE) > 0;
+
+    switch (kind) {
+      case CLASS:
+        if (isEnum) {
+          return Scip.SymbolInformation.Kind.Enum;
+        } else {
+          return Scip.SymbolInformation.Kind.Class;
+        }
+      case CONSTRUCTOR:
+        return Scip.SymbolInformation.Kind.Constructor;
+      case FIELD:
+        if (isStatic) {
+          return Scip.SymbolInformation.Kind.StaticField;
+        } else {
+          return Scip.SymbolInformation.Kind.Field;
+        }
+      case INTERFACE:
+        return Scip.SymbolInformation.Kind.Interface;
+      case LOCAL:
+        if (isStatic) {
+          return Scip.SymbolInformation.Kind.StaticVariable;
+        } else {
+          return Scip.SymbolInformation.Kind.Variable;
+        }
+      case MACRO:
+        return Scip.SymbolInformation.Kind.Macro;
+      case METHOD:
+        if (isStatic) {
+          return Scip.SymbolInformation.Kind.StaticMethod;
+        } else if (isAbstract) {
+          return Scip.SymbolInformation.Kind.AbstractMethod;
+        } else {
+          return Scip.SymbolInformation.Kind.Method;
+        }
+      case OBJECT:
+        return Scip.SymbolInformation.Kind.Object;
+      case PACKAGE:
+        return Scip.SymbolInformation.Kind.Package;
+      case PACKAGE_OBJECT:
+        return Scip.SymbolInformation.Kind.PackageObject;
+      case PARAMETER:
+        return Scip.SymbolInformation.Kind.Parameter;
+      case SELF_PARAMETER:
+        return Scip.SymbolInformation.Kind.SelfParameter;
+      case TRAIT:
+        return Scip.SymbolInformation.Kind.Trait;
+      case TYPE:
+        if (isEnum) {
+          return Scip.SymbolInformation.Kind.Enum;
+        } else {
+          return Scip.SymbolInformation.Kind.Type;
+        }
+      case TYPE_PARAMETER:
+        return Scip.SymbolInformation.Kind.TypeParameter;
+      case UNKNOWN_KIND:
+        return Scip.SymbolInformation.Kind.UnspecifiedKind;
+    }
+
+    return Scip.SymbolInformation.Kind.UnspecifiedKind;
+  }
+
   public static boolean isDefinitionRole(Role role) {
     return role == Role.DEFINITION || role == Role.SYNTHETIC_DEFINITION;
   }
@@ -137,6 +206,8 @@ private void processTypedDocument(
           scipInfo.setEnclosingSymbol(typedSymbol(info.getEnclosingSymbol(), pkg));
         }
 
+        scipInfo.setKind(scipKind(info));
+
         // TODO: this can be removed once https://github.com/sourcegraph/sourcegraph/issues/50927 is
         // fixed.
         ArrayList<String> inverseReferences = references.map.get(info.getSymbol());
diff --git a/tests/snapshots/src/main/generated/BaseByteRenderer.scala b/tests/snapshots/src/main/generated/BaseByteRenderer.scala
index 4e599d507..349fe73bc 100644
--- a/tests/snapshots/src/main/generated/BaseByteRenderer.scala
+++ b/tests/snapshots/src/main/generated/BaseByteRenderer.scala
@@ -25,14 +25,17 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
 //                     display_name BaseByteRenderer
 //                     signature_documentation scala class BaseByteRenderer[T <: Output]
+//                     kind Class
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer.
 //    ________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer.
 //                     display_name BaseByteRenderer
 //                     signature_documentation scala object BaseByteRenderer
+//                     kind Object
 //                     relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                       display_name T
 //                       signature_documentation scala T <: Output
+//                       kind TypeParameter
 //                          ^^^^^^^ reference semanticdb maven . . upickle/
 //                                  ^^^^ reference semanticdb maven . . upickle/core/
 //                                       ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.
@@ -41,30 +44,36 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
 //                         display_name out
 //                         signature_documentation scala private[this] val out: T
+//                         kind Method
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(out)
 //                     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(out)
 //                         display_name out
 //                         signature_documentation scala out: T 
+//                         kind Parameter
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
 //                            display_name indent
 //                            signature_documentation scala private[this] val indent: Int
+//                            kind Method
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(indent)
 //                     ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(indent)
 //                            display_name indent
 //                            signature_documentation scala default indent: Int 
+//                            kind Parameter
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                        escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
 //                                   display_name escapeUnicode
 //                                   signature_documentation scala private[this] val escapeUnicode: Boolean
+//                                   kind Method
 //                                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(escapeUnicode)
 //                     _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`<init>`().(escapeUnicode)
 //                                   display_name escapeUnicode
 //                                   signature_documentation scala default escapeUnicode: Boolean 
+//                                   kind Parameter
 //                                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
 //                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
@@ -75,6 +84,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                  ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                              display_name elemBuilder
 //                              signature_documentation scala private[this] val elemBuilder: ByteBuilder
+//                              kind Method
 //                                    ^^^^^^^ reference semanticdb maven . . upickle/
 //                                            ^^^^ reference semanticdb maven . . upickle/core/
 //                                                 ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#
@@ -83,6 +93,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#unicodeCharBuilder.
 //                                     display_name unicodeCharBuilder
 //                                     signature_documentation scala private[this] val unicodeCharBuilder: CharBuilder
+//                                     kind Method
 //                                           ^^^^^^^ reference semanticdb maven . . upickle/
 //                                                   ^^^^ reference semanticdb maven . . upickle/core/
 //                                                        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -91,6 +102,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushByteBuilder().
 //                     display_name flushByteBuilder
 //                     signature_documentation scala def flushByteBuilder(): Unit
+//                     kind Method
     elemBuilder.writeOutToIfLongerThan(out, if (depth == 0) 0 else 1000)
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#writeOutToIfLongerThan().
@@ -103,9 +115,11 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
 //                        display_name depth
 //                        signature_documentation scala private[this] var depth: Int
+//                        kind Method
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`depth_=`().
 //                        display_name depth_=
 //                        signature_documentation scala private[this] var depth_=(x$1: Int): Unit
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
@@ -114,15 +128,18 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
 //                                display_name commaBuffered
 //                                signature_documentation scala private[this] var commaBuffered: Boolean
+//                                kind Method
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#`commaBuffered_=`().
 //                                display_name commaBuffered_=
 //                                signature_documentation scala private[this] var commaBuffered_=(x$1: Boolean): Unit
+//                                kind Method
 //                                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
 
   def flushBuffer() = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
 //                display_name flushBuffer
 //                signature_documentation scala def flushBuffer(): Unit
+//                kind Method
     if (commaBuffered) {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
       commaBuffered = false
@@ -138,18 +155,22 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().
 //               display_name visitArray
 //               signature_documentation scala def visitArray(length: Int, index: Int): { def subVisitor: BaseByteRenderer[T] }
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().(length)
 //                      display_name length
 //                      signature_documentation scala length: Int 
+//                      kind Parameter
 //                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().(index)
 //                                  display_name index
 //                                  signature_documentation scala index: Int 
+//                                  kind Parameter
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                              ^ definition local 1
 //                                                display_name $anon
 //                                                signature_documentation scala final class $anon
+//                                                kind Class
 //                                              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -169,20 +190,24 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //      ^^^^^^^^^^ definition local 0
 //                 display_name subVisitor
 //                 signature_documentation scala def subVisitor: BaseByteRenderer[T]
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 2
 //                 display_name visitValue
 //                 signature_documentation scala def visitValue(v: T, index: Int): Unit
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 4
 //                   display_name v
 //                   signature_documentation scala v: T 
+//                   kind Parameter
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                       ^^^^^ definition local 5
 //                             display_name index
 //                             signature_documentation scala index: Int 
+//                             kind Parameter
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       flushBuffer()
@@ -194,10 +219,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //      ^^^^^^^^ definition local 3
 //               display_name visitEnd
 //               signature_documentation scala def visitEnd(index: Int): T
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 6
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
@@ -220,18 +247,22 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().
 //                display_name visitObject
 //                signature_documentation scala def visitObject(length: Int, index: Int): { def subVisitor: BaseByteRenderer[T]; def visitKey(index: Int): BaseByteRenderer[T] }
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().(length)
 //                       display_name length
 //                       signature_documentation scala length: Int 
+//                       kind Parameter
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().(index)
 //                                   display_name index
 //                                   signature_documentation scala index: Int 
+//                                   kind Parameter
 //                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^ definition local 10
 //                                                 display_name $anon
 //                                                 signature_documentation scala final class $anon
+//                                                 kind Class
 //                                               ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -250,26 +281,31 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //      ^^^^^^^^^^ definition local 7
 //                 display_name subVisitor
 //                 signature_documentation scala def subVisitor: BaseByteRenderer[T]
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitKey(index: Int) = BaseByteRenderer.this
 //      ^^^^^^^^ definition local 8
 //               display_name visitKey
 //               signature_documentation scala def visitKey(index: Int): BaseByteRenderer[T]
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition local 9
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitKeyValue(s: Any): Unit = {
 //      ^^^^^^^^^^^^^ definition local 11
 //                    display_name visitKeyValue
 //                    signature_documentation scala def visitKeyValue(s: Any): Unit
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition local 14
 //                      display_name s
 //                      signature_documentation scala s: Any 
+//                      kind Parameter
 //                       ^^^ reference semanticdb maven . . scala/Any#
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       elemBuilder.append(':')
@@ -285,14 +321,17 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //      ^^^^^^^^^^ definition local 12
 //                 display_name visitValue
 //                 signature_documentation scala def visitValue(v: T, index: Int): Unit
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 15
 //                   display_name v
 //                   signature_documentation scala v: T 
+//                   kind Parameter
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                       ^^^^^ definition local 16
 //                             display_name index
 //                             signature_documentation scala index: Int 
+//                             kind Parameter
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       commaBuffered = true
@@ -302,10 +341,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //      ^^^^^^^^ definition local 13
 //               display_name visitEnd
 //               signature_documentation scala def visitEnd(index: Int): T
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 17
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
@@ -328,10 +369,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNull().
 //              display_name visitNull
 //              signature_documentation scala def visitNull(index: Int): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNull().(index)
 //                    display_name index
 //                    signature_documentation scala index: Int 
+//                    kind Parameter
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
@@ -360,10 +403,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFalse().
 //               display_name visitFalse
 //               signature_documentation scala def visitFalse(index: Int): T
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFalse().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
@@ -395,10 +440,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitTrue().
 //              display_name visitTrue
 //              signature_documentation scala def visitTrue(index: Int): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitTrue().(index)
 //                    display_name index
 //                    signature_documentation scala index: Int 
+//                    kind Parameter
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
@@ -427,22 +474,27 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().
 //                            display_name visitFloat64StringParts
 //                            signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): T
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(s)
 //                              display_name s
 //                              signature_documentation scala s: CharSequence 
+//                              kind Parameter
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(decIndex)
 //                                                      display_name decIndex
 //                                                      signature_documentation scala decIndex: Int 
+//                                                      kind Parameter
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
 //                                                                     signature_documentation scala expIndex: Int 
+//                                                                     kind Parameter
 //                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(index)
 //                                                                                 display_name index
 //                                                                                 signature_documentation scala index: Int 
+//                                                                                 kind Parameter
 //                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
@@ -455,10 +507,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //      ^ definition local 18
 //        display_name i
 //        signature_documentation scala i: Int 
+//        kind Variable
     val sLength = s.length
 //      ^^^^^^^ definition local 19
 //              display_name sLength
 //              signature_documentation scala sLength: Int 
+//              kind Variable
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(s)
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     while(i < sLength){
@@ -485,15 +539,18 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().
 //                          display_name visitFloat64
 //                          signature_documentation scala def visitFloat64(d: Double, index: Int): T
+//                          kind Method
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(d)
 //                            display_name d
 //                            signature_documentation scala d: Double 
+//                            kind Parameter
 //                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(index)
 //                                           display_name index
 //                                           signature_documentation scala index: Int 
+//                                           kind Parameter
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     d match{
 //  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(d)
@@ -509,6 +566,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //         ^ definition local 21
 //           display_name d
 //           signature_documentation scala d: Double 
+//           kind Variable
 //              ^^^^ reference semanticdb maven . . java/
 //                   ^^^^ reference semanticdb maven . . java/lang/
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Double#
@@ -519,10 +577,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //         ^ definition local 22
 //           display_name d
 //           signature_documentation scala d: Double 
+//           kind Variable
         val i = d.toInt
 //          ^ definition local 23
 //            display_name i
 //            signature_documentation scala i: Int 
+//            kind Variable
 //              ^ reference local 22
 //                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toInt().
         if (d == i) visitFloat64StringParts(i.toString, -1, -1, index)
@@ -551,14 +611,17 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().
 //                display_name visitString
 //                signature_documentation scala def visitString(s: CharSequence, index: Int): T
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().(s)
 //                  display_name s
 //                  signature_documentation scala s: CharSequence 
+//                  kind Parameter
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().(index)
 //                                       display_name index
 //                                       signature_documentation scala index: Int 
+//                                       kind Parameter
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     if (s eq null) visitNull(index)
@@ -576,13 +639,16 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
 //                       display_name visitNonNullString
 //                       signature_documentation scala def visitNonNullString(s: CharSequence, index: Int): T
+//                       kind Method
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().(s)
 //                         display_name s
 //                         signature_documentation scala s: CharSequence 
+//                         kind Parameter
 //                          ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().(index)
 //                                              display_name index
 //                                              signature_documentation scala index: Int 
+//                                              kind Parameter
 //                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
@@ -605,6 +671,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //          ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
 //                       display_name renderIndent
 //                       signature_documentation scala final def renderIndent(): Unit
+//                       kind Method
     if (indent == -1) ()
 //      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
 //             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
@@ -613,6 +680,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //        ^ definition local 24
 //          display_name i
 //          signature_documentation scala i: Int 
+//          kind Variable
 //            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
 //                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`*`(+3).
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
diff --git a/tests/snapshots/src/main/generated/BaseCharRenderer.scala b/tests/snapshots/src/main/generated/BaseCharRenderer.scala
index bfb581d54..dc0f7cb5e 100644
--- a/tests/snapshots/src/main/generated/BaseCharRenderer.scala
+++ b/tests/snapshots/src/main/generated/BaseCharRenderer.scala
@@ -25,14 +25,17 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
 //                     display_name BaseCharRenderer
 //                     signature_documentation scala class BaseCharRenderer[T <: Output]
+//                     kind Class
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer.
 //    ________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer.
 //                     display_name BaseCharRenderer
 //                     signature_documentation scala object BaseCharRenderer
+//                     kind Object
 //                     relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                       display_name T
 //                       signature_documentation scala T <: Output
+//                       kind TypeParameter
 //                          ^^^^^^^ reference semanticdb maven . . upickle/
 //                                  ^^^^ reference semanticdb maven . . upickle/core/
 //                                       ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.
@@ -41,30 +44,36 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
 //                         display_name out
 //                         signature_documentation scala private[this] val out: T
+//                         kind Method
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(out)
 //                     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(out)
 //                         display_name out
 //                         signature_documentation scala out: T 
+//                         kind Parameter
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
 //                            display_name indent
 //                            signature_documentation scala private[this] val indent: Int
+//                            kind Method
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(indent)
 //                     ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(indent)
 //                            display_name indent
 //                            signature_documentation scala default indent: Int 
+//                            kind Parameter
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                        escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
 //                                   display_name escapeUnicode
 //                                   signature_documentation scala private[this] val escapeUnicode: Boolean
+//                                   kind Method
 //                                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(escapeUnicode)
 //                     _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`<init>`().(escapeUnicode)
 //                                   display_name escapeUnicode
 //                                   signature_documentation scala default escapeUnicode: Boolean 
+//                                   kind Parameter
 //                                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
 //                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
@@ -75,6 +84,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                  ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                              display_name elemBuilder
 //                              signature_documentation scala private[this] val elemBuilder: CharBuilder
+//                              kind Method
 //                                    ^^^^^^^ reference semanticdb maven . . upickle/
 //                                            ^^^^ reference semanticdb maven . . upickle/core/
 //                                                 ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -83,6 +93,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#unicodeCharBuilder.
 //                                     display_name unicodeCharBuilder
 //                                     signature_documentation scala private[this] val unicodeCharBuilder: CharBuilder
+//                                     kind Method
 //                                           ^^^^^^^ reference semanticdb maven . . upickle/
 //                                                   ^^^^ reference semanticdb maven . . upickle/core/
 //                                                        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -91,6 +102,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushCharBuilder().
 //                     display_name flushCharBuilder
 //                     signature_documentation scala def flushCharBuilder(): Unit
+//                     kind Method
     elemBuilder.writeOutToIfLongerThan(out, if (depth == 0) 0 else 1000)
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#writeOutToIfLongerThan().
@@ -103,9 +115,11 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
 //                        display_name depth
 //                        signature_documentation scala private[this] var depth: Int
+//                        kind Method
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`depth_=`().
 //                        display_name depth_=
 //                        signature_documentation scala private[this] var depth_=(x$1: Int): Unit
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
@@ -114,15 +128,18 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
 //                                display_name commaBuffered
 //                                signature_documentation scala private[this] var commaBuffered: Boolean
+//                                kind Method
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#`commaBuffered_=`().
 //                                display_name commaBuffered_=
 //                                signature_documentation scala private[this] var commaBuffered_=(x$1: Boolean): Unit
+//                                kind Method
 //                                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
 
   def flushBuffer() = {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
 //                display_name flushBuffer
 //                signature_documentation scala def flushBuffer(): Unit
+//                kind Method
     if (commaBuffered) {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
       commaBuffered = false
@@ -138,18 +155,22 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().
 //               display_name visitArray
 //               signature_documentation scala def visitArray(length: Int, index: Int): { def subVisitor: BaseCharRenderer[T] }
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().(length)
 //                      display_name length
 //                      signature_documentation scala length: Int 
+//                      kind Parameter
 //                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().(index)
 //                                  display_name index
 //                                  signature_documentation scala index: Int 
+//                                  kind Parameter
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                              ^ definition local 1
 //                                                display_name $anon
 //                                                signature_documentation scala final class $anon
+//                                                kind Class
 //                                              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -169,20 +190,24 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //      ^^^^^^^^^^ definition local 0
 //                 display_name subVisitor
 //                 signature_documentation scala def subVisitor: BaseCharRenderer[T]
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitValue(v: T, index: Int): Unit = {
 //      ^^^^^^^^^^ definition local 2
 //                 display_name visitValue
 //                 signature_documentation scala def visitValue(v: T, index: Int): Unit
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 4
 //                   display_name v
 //                   signature_documentation scala v: T 
+//                   kind Parameter
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                       ^^^^^ definition local 5
 //                             display_name index
 //                             signature_documentation scala index: Int 
+//                             kind Parameter
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       flushBuffer()
@@ -194,10 +219,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //      ^^^^^^^^ definition local 3
 //               display_name visitEnd
 //               signature_documentation scala def visitEnd(index: Int): T
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 6
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
@@ -220,18 +247,22 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().
 //                display_name visitObject
 //                signature_documentation scala def visitObject(length: Int, index: Int): { def subVisitor: BaseCharRenderer[T]; def visitKey(index: Int): BaseCharRenderer[T] }
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().(length)
 //                       display_name length
 //                       signature_documentation scala length: Int 
+//                       kind Parameter
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().(index)
 //                                   display_name index
 //                                   signature_documentation scala index: Int 
+//                                   kind Parameter
 //                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^ definition local 10
 //                                                 display_name $anon
 //                                                 signature_documentation scala final class $anon
+//                                                 kind Class
 //                                               ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -250,26 +281,31 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //      ^^^^^^^^^^ definition local 7
 //                 display_name subVisitor
 //                 signature_documentation scala def subVisitor: BaseCharRenderer[T]
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitKey(index: Int) = BaseCharRenderer.this
 //      ^^^^^^^^ definition local 8
 //               display_name visitKey
 //               signature_documentation scala def visitKey(index: Int): BaseCharRenderer[T]
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition local 9
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitKeyValue(s: Any): Unit = {
 //      ^^^^^^^^^^^^^ definition local 11
 //                    display_name visitKeyValue
 //                    signature_documentation scala def visitKeyValue(s: Any): Unit
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition local 14
 //                      display_name s
 //                      signature_documentation scala s: Any 
+//                      kind Parameter
 //                       ^^^ reference semanticdb maven . . scala/Any#
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       elemBuilder.append(':')
@@ -285,14 +321,17 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //      ^^^^^^^^^^ definition local 12
 //                 display_name visitValue
 //                 signature_documentation scala def visitValue(v: T, index: Int): Unit
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition local 15
 //                   display_name v
 //                   signature_documentation scala v: T 
+//                   kind Parameter
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                       ^^^^^ definition local 16
 //                             display_name index
 //                             signature_documentation scala index: Int 
+//                             kind Parameter
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
       commaBuffered = true
@@ -302,10 +341,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //      ^^^^^^^^ definition local 13
 //               display_name visitEnd
 //               signature_documentation scala def visitEnd(index: Int): T
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition local 17
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
@@ -328,10 +369,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNull().
 //              display_name visitNull
 //              signature_documentation scala def visitNull(index: Int): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNull().(index)
 //                    display_name index
 //                    signature_documentation scala index: Int 
+//                    kind Parameter
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
@@ -360,10 +403,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFalse().
 //               display_name visitFalse
 //               signature_documentation scala def visitFalse(index: Int): T
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFalse().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
@@ -395,10 +440,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitTrue().
 //              display_name visitTrue
 //              signature_documentation scala def visitTrue(index: Int): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitTrue().(index)
 //                    display_name index
 //                    signature_documentation scala index: Int 
+//                    kind Parameter
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
@@ -427,22 +474,27 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().
 //                            display_name visitFloat64StringParts
 //                            signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): T
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(s)
 //                              display_name s
 //                              signature_documentation scala s: CharSequence 
+//                              kind Parameter
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(decIndex)
 //                                                      display_name decIndex
 //                                                      signature_documentation scala decIndex: Int 
+//                                                      kind Parameter
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
 //                                                                     signature_documentation scala expIndex: Int 
+//                                                                     kind Parameter
 //                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(index)
 //                                                                                 display_name index
 //                                                                                 signature_documentation scala index: Int 
+//                                                                                 kind Parameter
 //                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
@@ -455,10 +507,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //      ^ definition local 18
 //        display_name i
 //        signature_documentation scala i: Int 
+//        kind Variable
     val sLength = s.length
 //      ^^^^^^^ definition local 19
 //              display_name sLength
 //              signature_documentation scala sLength: Int 
+//              kind Variable
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(s)
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     while(i < sLength){
@@ -485,15 +539,18 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().
 //                          display_name visitFloat64
 //                          signature_documentation scala def visitFloat64(d: Double, index: Int): T
+//                          kind Method
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(d)
 //                            display_name d
 //                            signature_documentation scala d: Double 
+//                            kind Parameter
 //                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(index)
 //                                           display_name index
 //                                           signature_documentation scala index: Int 
+//                                           kind Parameter
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     d match{
 //  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(d)
@@ -509,6 +566,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //         ^ definition local 21
 //           display_name d
 //           signature_documentation scala d: Double 
+//           kind Variable
 //              ^^^^ reference semanticdb maven . . java/
 //                   ^^^^ reference semanticdb maven . . java/lang/
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Double#
@@ -519,10 +577,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //         ^ definition local 22
 //           display_name d
 //           signature_documentation scala d: Double 
+//           kind Variable
         val i = d.toInt
 //          ^ definition local 23
 //            display_name i
 //            signature_documentation scala i: Int 
+//            kind Variable
 //              ^ reference local 22
 //                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toInt().
         if (d == i) visitFloat64StringParts(i.toString, -1, -1, index)
@@ -551,14 +611,17 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().
 //                display_name visitString
 //                signature_documentation scala def visitString(s: CharSequence, index: Int): T
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().(s)
 //                  display_name s
 //                  signature_documentation scala s: CharSequence 
+//                  kind Parameter
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().(index)
 //                                       display_name index
 //                                       signature_documentation scala index: Int 
+//                                       kind Parameter
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     if (s eq null) visitNull(index)
@@ -576,13 +639,16 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
 //                       display_name visitNonNullString
 //                       signature_documentation scala def visitNonNullString(s: CharSequence, index: Int): T
+//                       kind Method
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().(s)
 //                         display_name s
 //                         signature_documentation scala s: CharSequence 
+//                         kind Parameter
 //                          ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().(index)
 //                                              display_name index
 //                                              signature_documentation scala index: Int 
+//                                              kind Parameter
 //                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
@@ -605,6 +671,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //          ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
 //                       display_name renderIndent
 //                       signature_documentation scala final def renderIndent(): Unit
+//                       kind Method
     if (indent == -1) ()
 //      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
 //             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
@@ -613,6 +680,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //        ^ definition local 24
 //          display_name i
 //          signature_documentation scala i: Int 
+//          kind Variable
 //            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
 //                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`*`(+3).
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
diff --git a/tests/snapshots/src/main/generated/ByteParser.scala b/tests/snapshots/src/main/generated/ByteParser.scala
index 171081dd2..825d20231 100644
--- a/tests/snapshots/src/main/generated/ByteParser.scala
+++ b/tests/snapshots/src/main/generated/ByteParser.scala
@@ -41,12 +41,15 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#
 //                        display_name ByteParser
 //                        signature_documentation scala abstract class ByteParser[J]
+//                        kind Class
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                          display_name J
 //                          signature_documentation scala J
+//                          kind TypeParameter
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#`<init>`().
 //                             display_name <init>
 //                             signature_documentation scala def this()
+//                             kind Constructor
 //                                   ^^^^^^^ reference semanticdb maven . . upickle/
 //                                           ^^^^ reference semanticdb maven . . upickle/core/
 //                                                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#
@@ -54,6 +57,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                          display_name elemOps
 //                          signature_documentation scala private[this] val elemOps: 
+//                          kind Method
 //                            ^^^^^^^ reference semanticdb maven . . upickle/
 //                                    ^^^^ reference semanticdb maven . . upickle/core/
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.
@@ -61,6 +65,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                display_name outputBuilder
 //                                signature_documentation scala private[this] val outputBuilder: ByteBuilder
+//                                kind Method
 //                                      ^^^^^^^ reference semanticdb maven . . upickle/
 //                                              ^^^^ reference semanticdb maven . . upickle/core/
 //                                                   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#
@@ -70,9 +75,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                        display_name requestUntilOrThrow
 //                        signature_documentation scala def requestUntilOrThrow(i: Int): Unit
+//                        kind Method
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().(i)
 //                          display_name i
 //                          signature_documentation scala i: Int 
+//                          kind Parameter
 //                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if (requestUntil(i)) throw new IncompleteParseException("exhausted input")
 //      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#requestUntil().
@@ -84,10 +91,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                         display_name getByteSafe
 //                         signature_documentation scala def getByteSafe(i: Int): Byte
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteSafe().
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().(i)
 //                           display_name i
 //                           signature_documentation scala i: Int 
+//                           kind Parameter
 //                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
     requestUntilOrThrow(i)
@@ -105,9 +114,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                          display_name atEof
 //                          signature_documentation scala def atEof(i: Int): Boolean
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().(i)
 //                            display_name i
 //                            signature_documentation scala i: Int 
+//                            kind Parameter
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#requestUntil().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().(i)
@@ -119,6 +130,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 //                          display_name close
 //                          signature_documentation scala def close(): Unit
+//                          kind AbstractMethod
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#close().
@@ -133,42 +145,49 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
 //                                       display_name ARRBEG
 //                                       signature_documentation scala @inline\nprivate[this] final val ARRBEG: 6
+//                                       kind Method
   @inline private[this] final val OBJBEG = 7
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
 //                                       display_name OBJBEG
 //                                       signature_documentation scala @inline\nprivate[this] final val OBJBEG: 7
+//                                       kind Method
   @inline private[this] final val DATA = 1
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
 //                                     display_name DATA
 //                                     signature_documentation scala @inline\nprivate[this] final val DATA: 1
+//                                     kind Method
   @inline private[this] final val KEY = 2
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#KEY.
 //                                    display_name KEY
 //                                    signature_documentation scala @inline\nprivate[this] final val KEY: 2
+//                                    kind Method
   @inline private[this] final val COLON = 3
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#COLON.
 //                                      display_name COLON
 //                                      signature_documentation scala @inline\nprivate[this] final val COLON: 3
+//                                      kind Method
   @inline private[this] final val ARREND = 4
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARREND.
 //                                       display_name ARREND
 //                                       signature_documentation scala @inline\nprivate[this] final val ARREND: 4
+//                                       kind Method
   @inline private[this] final val OBJEND = 5
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJEND.
 //                                       display_name OBJEND
 //                                       signature_documentation scala @inline\nprivate[this] final val OBJEND: 5
+//                                       kind Method
 
   /**
     * Parse the JSON document into a single JSON value.
@@ -181,9 +200,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().
 //                display_name parse
 //                signature_documentation scala final def parse(facade: Visitor[local0, J[): J
+//                kind Method
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().(facade)
 //                       display_name facade
 //                       signature_documentation scala facade: Visitor[local0, J[ 
+//                       kind Parameter
 //                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -191,15 +212,18 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //       ^^^^^ definition local 2
 //             display_name value
 //             signature_documentation scala value: J 
+//             kind Variable
 //              ^ definition local 3
 //                display_name i
 //                signature_documentation scala i: Int 
+//                kind Variable
 //                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parse().(facade)
     var j = i
 //      ^ definition local 4
 //        display_name j
 //        signature_documentation scala j: Int 
+//        kind Variable
 //          ^ reference local 3
     while (!atEof(j)) {
 //         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
@@ -235,19 +259,23 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                        display_name die
 //                        signature_documentation scala def die(i: Int, msg: String): Nothing
+//                        kind Method
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(i)
 //                          display_name i
 //                          signature_documentation scala i: Int 
+//                          kind Parameter
 //                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(msg)
 //                                    display_name msg
 //                                    signature_documentation scala msg: String 
+//                                    kind Parameter
 //                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                              ^^^^^^^ reference semanticdb maven . . scala/Nothing#
     val out = new upickle.core.ByteBuilder()
 //      ^^^ definition local 6
 //          display_name out
 //          signature_documentation scala out: ByteBuilder 
+//          kind Variable
 //                ^^^^^^^ reference semanticdb maven . . upickle/
 //                        ^^^^ reference semanticdb maven . . upickle/core/
 //                             ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#
@@ -280,6 +308,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^ definition local 7
 //        display_name s
 //        signature_documentation scala s: String 
+//        kind Variable
 //                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/StringOps#format().
 //                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(msg)
 //                                   ^^^ reference local 6
@@ -304,19 +333,23 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().
 //                                   display_name parseNum
 //                                   signature_documentation scala final def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[local8, J[): Int
+//                                   kind Method
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
 //                                     display_name i
 //                                     signature_documentation scala i: Int 
+//                                     kind Parameter
 //                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(ctxt)
 //                                                display_name ctxt
 //                                                signature_documentation scala ctxt: ObjArrVisitor[Any, J] 
+//                                                kind Parameter
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                               ^^^ reference semanticdb maven . . scala/Any#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(facade)
 //                                                                               display_name facade
 //                                                                               signature_documentation scala facade: Visitor[local8, J[ 
+//                                                                               kind Parameter
 //                                                                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
@@ -324,21 +357,25 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^ definition local 9
 //        display_name j
 //        signature_documentation scala j: Int 
+//        kind Variable
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
     var c = getByteSafe(j)
 //      ^ definition local 10
 //        display_name c
 //        signature_documentation scala c: Byte 
+//        kind Variable
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                      ^ reference local 9
     var decIndex = -1
 //      ^^^^^^^^ definition local 11
 //               display_name decIndex
 //               signature_documentation scala decIndex: Int 
+//               kind Variable
     var expIndex = -1
 //      ^^^^^^^^ definition local 12
 //               display_name expIndex
 //               signature_documentation scala expIndex: Int 
+//               kind Variable
 
     if (c == '-') {
 //      ^ reference local 10
@@ -366,6 +403,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 13
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -406,6 +444,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 15
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -463,6 +502,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 17
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -502,30 +542,36 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().
 //                                       display_name visitFloat64StringPartsWithWrapper
 //                                       signature_documentation scala def visitFloat64StringPartsWithWrapper(facade: Visitor[local19, J[, decIndex: Int, expIndex: Int, i: Int, j: Int): J
+//                                       kind Method
 //                                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(facade)
 //                                              display_name facade
 //                                              signature_documentation scala facade: Visitor[local19, J[ 
+//                                              kind Parameter
 //                                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
                                          decIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(decIndex)
 //                                                display_name decIndex
 //                                                signature_documentation scala decIndex: Int 
+//                                                kind Parameter
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          expIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(expIndex)
 //                                                display_name expIndex
 //                                                signature_documentation scala expIndex: Int 
+//                                                kind Parameter
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          i: Int,
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(i)
 //                                         display_name i
 //                                         signature_documentation scala i: Int 
+//                                         kind Parameter
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          j: Int) = {
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(j)
 //                                         display_name j
 //                                         signature_documentation scala j: Int 
+//                                         kind Parameter
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     facade.visitFloat64StringParts(
 //  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(facade)
@@ -563,13 +609,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().
 //                                           display_name parseNumTopLevel
 //                                           signature_documentation scala final def parseNumTopLevel(i: Int, facade: Visitor[local20, J[): (J, Int)
+//                                           kind Method
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
 //                                             display_name i
 //                                             signature_documentation scala i: Int 
+//                                             kind Parameter
 //                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(facade)
 //                                                          display_name facade
 //                                                          signature_documentation scala facade: Visitor[local20, J[ 
+//                                                          kind Parameter
 //                                                           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -578,21 +627,25 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^ definition local 21
 //        display_name j
 //        signature_documentation scala j: Int 
+//        kind Variable
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
     var c = getByteSafe(j)
 //      ^ definition local 22
 //        display_name c
 //        signature_documentation scala c: Byte 
+//        kind Variable
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                      ^ reference local 21
     var decIndex = -1
 //      ^^^^^^^^ definition local 23
 //               display_name decIndex
 //               signature_documentation scala decIndex: Int 
+//               kind Variable
     var expIndex = -1
 //      ^^^^^^^^ definition local 24
 //               display_name expIndex
 //               signature_documentation scala expIndex: Int 
+//               kind Variable
 
     if (c == '-') {
 //      ^ reference local 22
@@ -633,6 +686,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 25
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -686,6 +740,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 27
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -756,6 +811,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 29
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -809,9 +865,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().
 //                                  display_name descape
 //                                  signature_documentation scala final def descape(i: Int): Char
+//                                  kind Method
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
 //                                    display_name i
 //                                    signature_documentation scala i: Int 
+//                                    kind Parameter
 //                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
     import upickle.core.RenderUtils.hex
@@ -823,6 +881,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^ definition local 31
 //        display_name x
 //        signature_documentation scala x: Int 
+//        kind Variable
     x = (x << 4) | hex(getByteSafe(i+2).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
@@ -878,13 +937,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().
 //                                    display_name parseTrue
 //                                    signature_documentation scala final def parseTrue(i: Int, facade: Visitor[local32, J[): J
+//                                    kind Method
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
 //                                      display_name i
 //                                      signature_documentation scala i: Int 
+//                                      kind Parameter
 //                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(facade)
 //                                                   display_name facade
 //                                                   signature_documentation scala facade: Visitor[local32, J[ 
+//                                                   kind Parameter
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -927,13 +989,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().
 //                                     display_name parseFalse
 //                                     signature_documentation scala final def parseFalse(i: Int, facade: Visitor[local33, J[): J
+//                                     kind Method
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
 //                                       display_name i
 //                                       signature_documentation scala i: Int 
+//                                       kind Parameter
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(facade)
 //                                                    display_name facade
 //                                                    signature_documentation scala facade: Visitor[local33, J[ 
+//                                                    kind Parameter
 //                                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -982,13 +1047,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().
 //                                    display_name parseNull
 //                                    signature_documentation scala final def parseNull(i: Int, facade: Visitor[local34, J[): J
+//                                    kind Method
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
 //                                      display_name i
 //                                      signature_documentation scala i: Int 
+//                                      kind Parameter
 //                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(facade)
 //                                                   display_name facade
 //                                                   signature_documentation scala facade: Visitor[local34, J[ 
+//                                                   kind Parameter
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -1026,13 +1094,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().
 //                                        display_name parseTopLevel
 //                                        signature_documentation scala final def parseTopLevel(i: Int, facade: Visitor[local35, J[): (J, Int)
+//                                        kind Method
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(i)
 //                                          display_name i
 //                                          signature_documentation scala i: Int 
+//                                          kind Parameter
 //                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(facade)
 //                                                       display_name facade
 //                                                       signature_documentation scala facade: Visitor[local35, J[ 
+//                                                       kind Parameter
 //                                                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -1055,13 +1126,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                                         display_name parseTopLevel0
 //                                         signature_documentation scala @tailrec\nfinal def parseTopLevel0(i: Int, facade: Visitor[local38, J[): (J, Int)
+//                                         kind Method
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
 //                                           display_name i
 //                                           signature_documentation scala i: Int 
+//                                           kind Parameter
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                                        display_name facade
 //                                                        signature_documentation scala facade: Visitor[local38, J[ 
+//                                                        kind Parameter
 //                                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -1145,9 +1219,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().
 //           display_name reject
 //           signature_documentation scala def reject(j: Int): PartialFunction[Throwable, Nothing]
+//           kind Method
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().(j)
 //             display_name j
 //             signature_documentation scala j: Int 
+//             kind Parameter
 //              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/PartialFunction#
 //                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Throwable#
@@ -1155,10 +1231,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                          ^ definition local 39
 //                                                            display_name $anonfun
 //                                                            signature_documentation scala @SerialVersionUID\nfinal class $anonfun
+//                                                            kind Class
     case e: Abort =>
 //       ^ definition local 46
 //         display_name e
 //         signature_documentation scala e: Abort 
+//         kind Variable
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort#
       throw new AbortException(e.msg, j, -1, -1, e)
 //              ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException#
@@ -1192,25 +1270,30 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                      display_name parseNested
 //                                      signature_documentation scala @tailrec\nfinal def parseNested(state: Int, i: Int, stackHead: ObjArrVisitor[local50, J[, stackTail: List[ObjArrVisitor[local51, J[]): (J, Int)
+//                                      kind Method
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(state)
 //                                            display_name state
 //                                            signature_documentation scala state: Int 
+//                                            kind Parameter
 //                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                         i: Int,
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
 //                                        display_name i
 //                                        signature_documentation scala i: Int 
+//                                        kind Parameter
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                         stackHead: ObjArrVisitor[_, J],
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                display_name stackHead
 //                                                signature_documentation scala stackHead: ObjArrVisitor[local50, J[ 
+//                                                kind Parameter
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
                                         stackTail: List[ObjArrVisitor[_, J]]) : (J, Int) = {
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                                display_name stackTail
 //                                                signature_documentation scala stackTail: List[ObjArrVisitor[local51, J[] 
+//                                                kind Parameter
 //                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -1238,6 +1321,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //              ^^^^^ definition local 52
 //                    display_name nextJ
 //                    signature_documentation scala nextJ: Int 
+//                    kind Variable
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
 //                                            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
@@ -1257,6 +1341,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //              ^^^^^ definition local 55
 //                    display_name nextJ
 //                    signature_documentation scala nextJ: Int 
+//                    kind Variable
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().
 //                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
 //                                              ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
@@ -1303,6 +1388,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //          ^^^ definition local 58
 //              display_name ctx
 //              signature_documentation scala ctx: ArrVisitor[local59, J[ 
+//              kind Variable
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitArray(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1333,6 +1419,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //          ^^^ definition local 63
 //              display_name ctx
 //              signature_documentation scala ctx: ObjVisitor[local64, J[ 
+//              kind Variable
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitObject(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1363,6 +1450,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //          ^^^ definition local 68
 //              display_name ctx
 //              signature_documentation scala ctx: Int 
+//              kind Variable
           try parseNum(i, stackHead.narrow, stackHead.subVisitor.asInstanceOf[Visitor[_, J]])
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
@@ -1524,6 +1612,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                      ^ definition local 77
 //                        display_name t
 //                        signature_documentation scala t: (J, Int) 
+//                        kind Variable
 //                            ^ reference local 77
               case None =>
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
@@ -1531,6 +1620,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^ definition local 78
 //                                display_name stackTailHead
 //                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
+//                                kind Variable
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
@@ -1565,6 +1655,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                      ^ definition local 79
 //                        display_name t
 //                        signature_documentation scala t: (J, Int) 
+//                        kind Variable
 //                            ^ reference local 79
               case None =>
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
@@ -1572,6 +1663,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^ definition local 80
 //                                display_name stackTailHead
 //                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
+//                                kind Variable
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
@@ -1602,18 +1694,22 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().
 //                          display_name dieWithFailureMessage
 //                          signature_documentation scala def dieWithFailureMessage(i: Int, state: Int): Nothing
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(i)
 //                            display_name i
 //                            signature_documentation scala i: Int 
+//                            kind Parameter
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(state)
 //                                        display_name state
 //                                        signature_documentation scala state: Int 
+//                                        kind Parameter
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     val expected = state match{
 //      ^^^^^^^^ definition local 81
 //               display_name expected
 //               signature_documentation scala expected: String 
+//               kind Variable
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(state)
       case ARRBEG => "json value or ]"
 //         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
@@ -1641,13 +1737,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().
 //                  display_name failIfNotData
 //                  signature_documentation scala def failIfNotData(state: Int, i: Int): Unit
+//                  kind Method
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(state)
 //                        display_name state
 //                        signature_documentation scala state: Int 
+//                        kind Parameter
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(i)
 //                                display_name i
 //                                signature_documentation scala i: Int 
+//                                kind Parameter
 //                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(state)
     case DATA | ARRBEG => // do nothing
@@ -1663,20 +1762,24 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().
 //                       display_name tryCloseCollection
 //                       signature_documentation scala def tryCloseCollection(stackHead: ObjArrVisitor[local82, J[, stackTail: List[ObjArrVisitor[local83, J[], i: Int): Option[(J, Int)]
+//                       kind Method
 //                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackHead)
 //                                 display_name stackHead
 //                                 signature_documentation scala stackHead: ObjArrVisitor[local82, J[ 
+//                                 kind Parameter
 //                                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
 //                                                                 display_name stackTail
 //                                                                 signature_documentation scala stackTail: List[ObjArrVisitor[local83, J[] 
+//                                                                 kind Parameter
 //                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
 //                                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
 //                                                                                               display_name i
 //                                                                                               signature_documentation scala i: Int 
+//                                                                                               kind Parameter
 //                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if (stackTail.isEmpty) {
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
@@ -1695,6 +1798,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^^^^ definition local 86
 //              display_name ctxt2
 //              signature_documentation scala ctxt2: ObjArrVisitor[Any, J] 
+//              kind Variable
 //                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
 //                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#narrow().
@@ -1716,9 +1820,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                     display_name collectionEndFor
 //                     signature_documentation scala def collectionEndFor(stackHead: ObjArrVisitor[local89, local90[): Int
+//                     kind Method
 //                     ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().(stackHead)
 //                               display_name stackHead
 //                               signature_documentation scala stackHead: ObjArrVisitor[local89, local90[ 
+//                               kind Parameter
 //                                ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
     if (stackHead.isObj) OBJEND
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().(stackHead)
@@ -1739,20 +1845,24 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                                            display_name parseStringSimple
 //                                            signature_documentation scala final def parseStringSimple(i: Int): Int
+//                                            kind Method
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().(i)
 //                                              display_name i
 //                                              signature_documentation scala i: Int 
+//                                              kind Parameter
 //                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var j = i
 //      ^ definition local 91
 //        display_name j
 //        signature_documentation scala j: Int 
+//        kind Variable
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().(i)
     var c = elemOps.toUnsignedInt(getByteSafe(j))
 //      ^ definition local 92
 //        display_name c
 //        signature_documentation scala c: Int 
+//        kind Variable
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.toUnsignedInt().
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -1797,20 +1907,24 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().
 //                                             display_name parseStringComplex
 //                                             signature_documentation scala final def parseStringComplex(i0: Int): Int
+//                                             kind Method
 //                                             ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().(i0)
 //                                                display_name i0
 //                                                signature_documentation scala i0: Int 
+//                                                kind Parameter
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var i = i0
 //      ^ definition local 94
 //        display_name i
 //        signature_documentation scala i: Int 
+//        kind Variable
 //          ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().(i0)
     var c = elemOps.toUnsignedInt(getByteSafe(i))
 //      ^ definition local 95
 //        display_name c
 //        signature_documentation scala c: Int 
+//        kind Variable
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.toUnsignedInt().
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -1881,6 +1995,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //              ^ definition local 97
 //                display_name d
 //                signature_documentation scala d: Char 
+//                kind Variable
 //                  ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().
 //                          ^ reference local 94
             outputBuilder.appendC(d)
@@ -1896,6 +2011,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //             ^ definition local 98
 //               display_name c
 //               signature_documentation scala c: Byte 
+//               kind Variable
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                      ^ reference local 94
 //                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
@@ -1940,13 +2056,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().
 //                                           display_name parseStringValue
 //                                           signature_documentation scala final def parseStringValue(i: Int, stackHead: ObjArrVisitor[local99, J[): Int
+//                                           kind Method
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
 //                                             display_name i
 //                                             signature_documentation scala i: Int 
+//                                             kind Parameter
 //                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(stackHead)
 //                                                             display_name stackHead
 //                                                             signature_documentation scala stackHead: ObjArrVisitor[local99, J[ 
+//                                                             kind Parameter
 //                                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
@@ -1955,6 +2074,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^ definition local 100
 //        display_name k
 //        signature_documentation scala k: Int 
+//        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
@@ -1979,6 +2099,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 101
 //           display_name k2
 //           signature_documentation scala k2: Int 
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
 //                                           ^ reference local 100
@@ -1997,13 +2118,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().
 //                                         display_name parseStringKey
 //                                         signature_documentation scala final def parseStringKey(i: Int, stackHead: ObjArrVisitor[local102, J[): Int
+//                                         kind Method
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
 //                                           display_name i
 //                                           signature_documentation scala i: Int 
+//                                           kind Parameter
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(stackHead)
 //                                                           display_name stackHead
 //                                                           signature_documentation scala stackHead: ObjArrVisitor[local102, J[ 
+//                                                           kind Parameter
 //                                                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
@@ -2012,6 +2136,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^ definition local 103
 //        display_name k
 //        signature_documentation scala k: Int 
+//        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
@@ -2036,6 +2161,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 104
 //           display_name k2
 //           signature_documentation scala k2: Int 
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
 //                                           ^ reference local 103
@@ -2055,13 +2181,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                               display_name parseStringToOutputBuilder
 //                               signature_documentation scala def parseStringToOutputBuilder(i: Int, k: Int): Int
+//                               kind Method
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(i)
 //                                 display_name i
 //                                 signature_documentation scala i: Int 
+//                                 kind Parameter
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
 //                                         display_name k
 //                                         signature_documentation scala k: Int 
+//                                         kind Parameter
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     outputBuilder.reset()
 //  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
@@ -2080,6 +2209,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^^ definition local 105
 //         display_name k2
 //         signature_documentation scala k2: Int 
+//         kind Variable
 //           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
@@ -2092,23 +2222,28 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().
 //                display_name visitString
 //                signature_documentation scala def visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local106, J[): Unit
+//                kind Method
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(i)
 //                  display_name i
 //                  signature_documentation scala i: Int 
+//                  kind Parameter
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(s)
 //                          display_name s
 //                          signature_documentation scala s: CharSequence 
+//                          kind Parameter
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                         ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(stackHead)
 //                                                   display_name stackHead
 //                                                   signature_documentation scala stackHead: ObjArrVisitor[local106, J[ 
+//                                                   kind Parameter
 //                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     val v = stackHead.subVisitor.visitString(s, i)
 //      ^ definition local 107
 //        display_name v
 //        signature_documentation scala v: Any 
+//        kind Variable
 //          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(stackHead)
 //                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
@@ -2125,23 +2260,28 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().
 //                   display_name visitStringKey
 //                   signature_documentation scala def visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local108, J[): Unit
+//                   kind Method
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(i)
 //                     display_name i
 //                     signature_documentation scala i: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(s)
 //                             display_name s
 //                             signature_documentation scala s: CharSequence 
+//                             kind Parameter
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(stackHead)
 //                                                      display_name stackHead
 //                                                      signature_documentation scala stackHead: ObjArrVisitor[local108, J[ 
+//                                                      kind Parameter
 //                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
     val obj = stackHead.asInstanceOf[ObjVisitor[Any, _]]
 //      ^^^ definition local 109
 //          display_name obj
 //          signature_documentation scala obj: ObjVisitor[Any, Any] 
+//          kind Variable
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(stackHead)
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
 //                                   ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
@@ -2150,6 +2290,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^^^^^^^^^^ definition local 110
 //                 display_name keyVisitor
 //                 signature_documentation scala keyVisitor: Visitor[local111, Any[ 
+//                 kind Variable
 //                   ^^^ reference local 109
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(i)
@@ -2167,13 +2308,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().
 //                                              display_name parseStringTopLevel
 //                                              signature_documentation scala final def parseStringTopLevel(i: Int, facade: Visitor[local112, J[): (J, Int)
+//                                              kind Method
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
 //                                                display_name i
 //                                                signature_documentation scala i: Int 
+//                                                kind Parameter
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                                                             display_name facade
 //                                                             signature_documentation scala facade: Visitor[local112, J[ 
+//                                                             kind Parameter
 //                                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
@@ -2183,6 +2327,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^ definition local 113
 //        display_name k
 //        signature_documentation scala k: Int 
+//        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
@@ -2193,6 +2338,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^^ definition local 114
 //            display_name res
 //            signature_documentation scala res: J 
+//            kind Variable
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
@@ -2211,6 +2357,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^ definition local 115
 //           display_name k2
 //           signature_documentation scala k2: Int 
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
 //                                           ^ reference local 113
@@ -2218,6 +2365,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        ^^^ definition local 116
 //            display_name res
 //            signature_documentation scala res: J 
+//            kind Variable
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
diff --git a/tests/snapshots/src/main/generated/CharParser.scala b/tests/snapshots/src/main/generated/CharParser.scala
index 202d5dd57..793fd5eea 100644
--- a/tests/snapshots/src/main/generated/CharParser.scala
+++ b/tests/snapshots/src/main/generated/CharParser.scala
@@ -41,12 +41,15 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#
 //                        display_name CharParser
 //                        signature_documentation scala abstract class CharParser[J]
+//                        kind Class
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                          display_name J
 //                          signature_documentation scala J
+//                          kind TypeParameter
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#`<init>`().
 //                             display_name <init>
 //                             signature_documentation scala def this()
+//                             kind Constructor
 //                                   ^^^^^^^ reference semanticdb maven . . upickle/
 //                                           ^^^^ reference semanticdb maven . . upickle/core/
 //                                                ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#
@@ -54,6 +57,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                          display_name elemOps
 //                          signature_documentation scala private[this] val elemOps: 
+//                          kind Method
 //                            ^^^^^^^ reference semanticdb maven . . upickle/
 //                                    ^^^^ reference semanticdb maven . . upickle/core/
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.
@@ -61,6 +65,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                display_name outputBuilder
 //                                signature_documentation scala private[this] val outputBuilder: CharBuilder
+//                                kind Method
 //                                      ^^^^^^^ reference semanticdb maven . . upickle/
 //                                              ^^^^ reference semanticdb maven . . upickle/core/
 //                                                   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -70,9 +75,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                        display_name requestUntilOrThrow
 //                        signature_documentation scala def requestUntilOrThrow(i: Int): Unit
+//                        kind Method
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().(i)
 //                          display_name i
 //                          signature_documentation scala i: Int 
+//                          kind Parameter
 //                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if (requestUntil(i)) throw new IncompleteParseException("exhausted input")
 //      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#requestUntil().
@@ -84,10 +91,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                         display_name getCharSafe
 //                         signature_documentation scala def getCharSafe(i: Int): Char
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharSafe().
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().(i)
 //                           display_name i
 //                           signature_documentation scala i: Int 
+//                           kind Parameter
 //                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
     requestUntilOrThrow(i)
@@ -105,9 +114,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                          display_name atEof
 //                          signature_documentation scala def atEof(i: Int): Boolean
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().(i)
 //                            display_name i
 //                            signature_documentation scala i: Int 
+//                            kind Parameter
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#requestUntil().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().(i)
@@ -119,6 +130,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
 //                          display_name close
 //                          signature_documentation scala def close(): Unit
+//                          kind AbstractMethod
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#close().
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
@@ -132,42 +144,49 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
 //                                       display_name ARRBEG
 //                                       signature_documentation scala @inline\nprivate[this] final val ARRBEG: 6
+//                                       kind Method
   @inline private[this] final val OBJBEG = 7
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
 //                                       display_name OBJBEG
 //                                       signature_documentation scala @inline\nprivate[this] final val OBJBEG: 7
+//                                       kind Method
   @inline private[this] final val DATA = 1
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
 //                                     display_name DATA
 //                                     signature_documentation scala @inline\nprivate[this] final val DATA: 1
+//                                     kind Method
   @inline private[this] final val KEY = 2
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#KEY.
 //                                    display_name KEY
 //                                    signature_documentation scala @inline\nprivate[this] final val KEY: 2
+//                                    kind Method
   @inline private[this] final val COLON = 3
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#COLON.
 //                                      display_name COLON
 //                                      signature_documentation scala @inline\nprivate[this] final val COLON: 3
+//                                      kind Method
   @inline private[this] final val ARREND = 4
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARREND.
 //                                       display_name ARREND
 //                                       signature_documentation scala @inline\nprivate[this] final val ARREND: 4
+//                                       kind Method
   @inline private[this] final val OBJEND = 5
 // ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
 //        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJEND.
 //                                       display_name OBJEND
 //                                       signature_documentation scala @inline\nprivate[this] final val OBJEND: 5
+//                                       kind Method
 
   /**
     * Parse the JSON document into a single JSON value.
@@ -180,9 +199,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().
 //                display_name parse
 //                signature_documentation scala final def parse(facade: Visitor[local0, J[): J
+//                kind Method
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().(facade)
 //                       display_name facade
 //                       signature_documentation scala facade: Visitor[local0, J[ 
+//                       kind Parameter
 //                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -190,15 +211,18 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //       ^^^^^ definition local 2
 //             display_name value
 //             signature_documentation scala value: J 
+//             kind Variable
 //              ^ definition local 3
 //                display_name i
 //                signature_documentation scala i: Int 
+//                kind Variable
 //                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parse().(facade)
     var j = i
 //      ^ definition local 4
 //        display_name j
 //        signature_documentation scala j: Int 
+//        kind Variable
 //          ^ reference local 3
     while (!atEof(j)) {
 //         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
@@ -234,19 +258,23 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                        display_name die
 //                        signature_documentation scala def die(i: Int, msg: String): Nothing
+//                        kind Method
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(i)
 //                          display_name i
 //                          signature_documentation scala i: Int 
+//                          kind Parameter
 //                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(msg)
 //                                    display_name msg
 //                                    signature_documentation scala msg: String 
+//                                    kind Parameter
 //                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                              ^^^^^^^ reference semanticdb maven . . scala/Nothing#
     val out = new upickle.core.CharBuilder()
 //      ^^^ definition local 6
 //          display_name out
 //          signature_documentation scala out: CharBuilder 
+//          kind Variable
 //                ^^^^^^^ reference semanticdb maven . . upickle/
 //                        ^^^^ reference semanticdb maven . . upickle/core/
 //                             ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#
@@ -279,6 +307,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^ definition local 7
 //        display_name s
 //        signature_documentation scala s: String 
+//        kind Variable
 //                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/StringOps#format().
 //                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(msg)
 //                                   ^^^ reference local 6
@@ -303,19 +332,23 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().
 //                                   display_name parseNum
 //                                   signature_documentation scala final def parseNum(i: Int, ctxt: ObjArrVisitor[Any, J], facade: Visitor[local8, J[): Int
+//                                   kind Method
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
 //                                     display_name i
 //                                     signature_documentation scala i: Int 
+//                                     kind Parameter
 //                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(ctxt)
 //                                                display_name ctxt
 //                                                signature_documentation scala ctxt: ObjArrVisitor[Any, J] 
+//                                                kind Parameter
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                               ^^^ reference semanticdb maven . . scala/Any#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(facade)
 //                                                                               display_name facade
 //                                                                               signature_documentation scala facade: Visitor[local8, J[ 
+//                                                                               kind Parameter
 //                                                                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
@@ -323,21 +356,25 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^ definition local 9
 //        display_name j
 //        signature_documentation scala j: Int 
+//        kind Variable
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
     var c = getCharSafe(j)
 //      ^ definition local 10
 //        display_name c
 //        signature_documentation scala c: Char 
+//        kind Variable
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                      ^ reference local 9
     var decIndex = -1
 //      ^^^^^^^^ definition local 11
 //               display_name decIndex
 //               signature_documentation scala decIndex: Int 
+//               kind Variable
     var expIndex = -1
 //      ^^^^^^^^ definition local 12
 //               display_name expIndex
 //               signature_documentation scala expIndex: Int 
+//               kind Variable
 
     if (c == '-') {
 //      ^ reference local 10
@@ -365,6 +402,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 13
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -405,6 +443,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 15
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -462,6 +501,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 17
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 9
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -501,30 +541,36 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().
 //                                       display_name visitFloat64StringPartsWithWrapper
 //                                       signature_documentation scala def visitFloat64StringPartsWithWrapper(facade: Visitor[local19, J[, decIndex: Int, expIndex: Int, i: Int, j: Int): J
+//                                       kind Method
 //                                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(facade)
 //                                              display_name facade
 //                                              signature_documentation scala facade: Visitor[local19, J[ 
+//                                              kind Parameter
 //                                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
                                          decIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(decIndex)
 //                                                display_name decIndex
 //                                                signature_documentation scala decIndex: Int 
+//                                                kind Parameter
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          expIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(expIndex)
 //                                                display_name expIndex
 //                                                signature_documentation scala expIndex: Int 
+//                                                kind Parameter
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          i: Int,
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(i)
 //                                         display_name i
 //                                         signature_documentation scala i: Int 
+//                                         kind Parameter
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                          j: Int) = {
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(j)
 //                                         display_name j
 //                                         signature_documentation scala j: Int 
+//                                         kind Parameter
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     facade.visitFloat64StringParts(
 //  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(facade)
@@ -562,13 +608,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().
 //                                           display_name parseNumTopLevel
 //                                           signature_documentation scala final def parseNumTopLevel(i: Int, facade: Visitor[local20, J[): (J, Int)
+//                                           kind Method
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
 //                                             display_name i
 //                                             signature_documentation scala i: Int 
+//                                             kind Parameter
 //                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(facade)
 //                                                          display_name facade
 //                                                          signature_documentation scala facade: Visitor[local20, J[ 
+//                                                          kind Parameter
 //                                                           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -577,21 +626,25 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^ definition local 21
 //        display_name j
 //        signature_documentation scala j: Int 
+//        kind Variable
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
     var c = getCharSafe(j)
 //      ^ definition local 22
 //        display_name c
 //        signature_documentation scala c: Char 
+//        kind Variable
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                      ^ reference local 21
     var decIndex = -1
 //      ^^^^^^^^ definition local 23
 //               display_name decIndex
 //               signature_documentation scala decIndex: Int 
+//               kind Variable
     var expIndex = -1
 //      ^^^^^^^^ definition local 24
 //               display_name expIndex
 //               signature_documentation scala expIndex: Int 
+//               kind Variable
 
     if (c == '-') {
 //      ^ reference local 22
@@ -632,6 +685,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 25
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -685,6 +739,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 27
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -755,6 +810,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 29
 //           display_name j0
 //           signature_documentation scala j0: Int 
+//           kind Variable
 //             ^ reference local 21
       while (elemOps.within('0', c, '9')) {
 //           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -808,9 +864,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().
 //                                  display_name descape
 //                                  signature_documentation scala final def descape(i: Int): Char
+//                                  kind Method
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
 //                                    display_name i
 //                                    signature_documentation scala i: Int 
+//                                    kind Parameter
 //                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
     import upickle.core.RenderUtils.hex
@@ -822,6 +880,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^ definition local 31
 //        display_name x
 //        signature_documentation scala x: Int 
+//        kind Variable
     x = (x << 4) | hex(getCharSafe(i+2).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
@@ -877,13 +936,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().
 //                                    display_name parseTrue
 //                                    signature_documentation scala final def parseTrue(i: Int, facade: Visitor[local32, J[): J
+//                                    kind Method
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
 //                                      display_name i
 //                                      signature_documentation scala i: Int 
+//                                      kind Parameter
 //                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(facade)
 //                                                   display_name facade
 //                                                   signature_documentation scala facade: Visitor[local32, J[ 
+//                                                   kind Parameter
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -926,13 +988,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().
 //                                     display_name parseFalse
 //                                     signature_documentation scala final def parseFalse(i: Int, facade: Visitor[local33, J[): J
+//                                     kind Method
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
 //                                       display_name i
 //                                       signature_documentation scala i: Int 
+//                                       kind Parameter
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(facade)
 //                                                    display_name facade
 //                                                    signature_documentation scala facade: Visitor[local33, J[ 
+//                                                    kind Parameter
 //                                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -981,13 +1046,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().
 //                                    display_name parseNull
 //                                    signature_documentation scala final def parseNull(i: Int, facade: Visitor[local34, J[): J
+//                                    kind Method
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
 //                                      display_name i
 //                                      signature_documentation scala i: Int 
+//                                      kind Parameter
 //                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(facade)
 //                                                   display_name facade
 //                                                   signature_documentation scala facade: Visitor[local34, J[ 
+//                                                   kind Parameter
 //                                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -1025,13 +1093,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().
 //                                        display_name parseTopLevel
 //                                        signature_documentation scala final def parseTopLevel(i: Int, facade: Visitor[local35, J[): (J, Int)
+//                                        kind Method
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(i)
 //                                          display_name i
 //                                          signature_documentation scala i: Int 
+//                                          kind Parameter
 //                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(facade)
 //                                                       display_name facade
 //                                                       signature_documentation scala facade: Visitor[local35, J[ 
+//                                                       kind Parameter
 //                                                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -1054,13 +1125,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                                         display_name parseTopLevel0
 //                                         signature_documentation scala @tailrec\nfinal def parseTopLevel0(i: Int, facade: Visitor[local38, J[): (J, Int)
+//                                         kind Method
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
 //                                           display_name i
 //                                           signature_documentation scala i: Int 
+//                                           kind Parameter
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                                        display_name facade
 //                                                        signature_documentation scala facade: Visitor[local38, J[ 
+//                                                        kind Parameter
 //                                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -1144,9 +1218,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().
 //           display_name reject
 //           signature_documentation scala def reject(j: Int): PartialFunction[Throwable, Nothing]
+//           kind Method
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().(j)
 //             display_name j
 //             signature_documentation scala j: Int 
+//             kind Parameter
 //              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/PartialFunction#
 //                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Throwable#
@@ -1154,10 +1230,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                          ^ definition local 39
 //                                                            display_name $anonfun
 //                                                            signature_documentation scala @SerialVersionUID\nfinal class $anonfun
+//                                                            kind Class
     case e: Abort =>
 //       ^ definition local 46
 //         display_name e
 //         signature_documentation scala e: Abort 
+//         kind Variable
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Abort#
       throw new AbortException(e.msg, j, -1, -1, e)
 //              ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/AbortException#
@@ -1191,25 +1269,30 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                      display_name parseNested
 //                                      signature_documentation scala @tailrec\nfinal def parseNested(state: Int, i: Int, stackHead: ObjArrVisitor[local50, J[, stackTail: List[ObjArrVisitor[local51, J[]): (J, Int)
+//                                      kind Method
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(state)
 //                                            display_name state
 //                                            signature_documentation scala state: Int 
+//                                            kind Parameter
 //                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                         i: Int,
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
 //                                        display_name i
 //                                        signature_documentation scala i: Int 
+//                                        kind Parameter
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                                         stackHead: ObjArrVisitor[_, J],
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                display_name stackHead
 //                                                signature_documentation scala stackHead: ObjArrVisitor[local50, J[ 
+//                                                kind Parameter
 //                                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
                                         stackTail: List[ObjArrVisitor[_, J]]) : (J, Int) = {
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                                display_name stackTail
 //                                                signature_documentation scala stackTail: List[ObjArrVisitor[local51, J[] 
+//                                                kind Parameter
 //                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -1237,6 +1320,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //              ^^^^^ definition local 52
 //                    display_name nextJ
 //                    signature_documentation scala nextJ: Int 
+//                    kind Variable
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
 //                                            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
@@ -1256,6 +1340,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //              ^^^^^ definition local 55
 //                    display_name nextJ
 //                    signature_documentation scala nextJ: Int 
+//                    kind Variable
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().
 //                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
 //                                              ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
@@ -1302,6 +1387,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //          ^^^ definition local 58
 //              display_name ctx
 //              signature_documentation scala ctx: ArrVisitor[local59, J[ 
+//              kind Variable
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitArray(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1332,6 +1418,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //          ^^^ definition local 63
 //              display_name ctx
 //              signature_documentation scala ctx: ObjVisitor[local64, J[ 
+//              kind Variable
           try stackHead.subVisitor.asInstanceOf[Visitor[_, J]].visitObject(-1, i)
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                      ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
@@ -1362,6 +1449,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //          ^^^ definition local 68
 //              display_name ctx
 //              signature_documentation scala ctx: Int 
+//              kind Variable
           try parseNum(i, stackHead.narrow, stackHead.subVisitor.asInstanceOf[Visitor[_, J]])
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
@@ -1523,6 +1611,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                      ^ definition local 77
 //                        display_name t
 //                        signature_documentation scala t: (J, Int) 
+//                        kind Variable
 //                            ^ reference local 77
               case None =>
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
@@ -1530,6 +1619,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^ definition local 78
 //                                display_name stackTailHead
 //                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
+//                                kind Variable
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
@@ -1564,6 +1654,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                      ^ definition local 79
 //                        display_name t
 //                        signature_documentation scala t: (J, Int) 
+//                        kind Variable
 //                            ^ reference local 79
               case None =>
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
@@ -1571,6 +1662,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^ definition local 80
 //                                display_name stackTailHead
 //                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
+//                                kind Variable
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
@@ -1601,18 +1693,22 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().
 //                          display_name dieWithFailureMessage
 //                          signature_documentation scala def dieWithFailureMessage(i: Int, state: Int): Nothing
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(i)
 //                            display_name i
 //                            signature_documentation scala i: Int 
+//                            kind Parameter
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(state)
 //                                        display_name state
 //                                        signature_documentation scala state: Int 
+//                                        kind Parameter
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     val expected = state match{
 //      ^^^^^^^^ definition local 81
 //               display_name expected
 //               signature_documentation scala expected: String 
+//               kind Variable
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(state)
       case ARRBEG => "json value or ]"
 //         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
@@ -1640,13 +1736,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().
 //                  display_name failIfNotData
 //                  signature_documentation scala def failIfNotData(state: Int, i: Int): Unit
+//                  kind Method
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(state)
 //                        display_name state
 //                        signature_documentation scala state: Int 
+//                        kind Parameter
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(i)
 //                                display_name i
 //                                signature_documentation scala i: Int 
+//                                kind Parameter
 //                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(state)
     case DATA | ARRBEG => // do nothing
@@ -1662,20 +1761,24 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().
 //                       display_name tryCloseCollection
 //                       signature_documentation scala def tryCloseCollection(stackHead: ObjArrVisitor[local82, J[, stackTail: List[ObjArrVisitor[local83, J[], i: Int): Option[(J, Int)]
+//                       kind Method
 //                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackHead)
 //                                 display_name stackHead
 //                                 signature_documentation scala stackHead: ObjArrVisitor[local82, J[ 
+//                                 kind Parameter
 //                                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                       ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
 //                                                                 display_name stackTail
 //                                                                 signature_documentation scala stackTail: List[ObjArrVisitor[local83, J[] 
+//                                                                 kind Parameter
 //                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
 //                                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
 //                                                                                               display_name i
 //                                                                                               signature_documentation scala i: Int 
+//                                                                                               kind Parameter
 //                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if (stackTail.isEmpty) {
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
@@ -1694,6 +1797,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^^^^ definition local 86
 //              display_name ctxt2
 //              signature_documentation scala ctxt2: ObjArrVisitor[Any, J] 
+//              kind Variable
 //                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
 //                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#narrow().
@@ -1715,9 +1819,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                     display_name collectionEndFor
 //                     signature_documentation scala def collectionEndFor(stackHead: ObjArrVisitor[local89, local90[): Int
+//                     kind Method
 //                     ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().(stackHead)
 //                               display_name stackHead
 //                               signature_documentation scala stackHead: ObjArrVisitor[local89, local90[ 
+//                               kind Parameter
 //                                ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
     if (stackHead.isObj) OBJEND
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().(stackHead)
@@ -1738,20 +1844,24 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                                            display_name parseStringSimple
 //                                            signature_documentation scala final def parseStringSimple(i: Int): Int
+//                                            kind Method
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().(i)
 //                                              display_name i
 //                                              signature_documentation scala i: Int 
+//                                              kind Parameter
 //                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var j = i
 //      ^ definition local 91
 //        display_name j
 //        signature_documentation scala j: Int 
+//        kind Variable
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().(i)
     var c = elemOps.toUnsignedInt(getCharSafe(j))
 //      ^ definition local 92
 //        display_name c
 //        signature_documentation scala c: Int 
+//        kind Variable
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.toUnsignedInt().
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -1796,20 +1906,24 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().
 //                                             display_name parseStringComplex
 //                                             signature_documentation scala final def parseStringComplex(i0: Int): Int
+//                                             kind Method
 //                                             ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().(i0)
 //                                                display_name i0
 //                                                signature_documentation scala i0: Int 
+//                                                kind Parameter
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     var i = i0
 //      ^ definition local 94
 //        display_name i
 //        signature_documentation scala i: Int 
+//        kind Variable
 //          ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().(i0)
     var c = elemOps.toUnsignedInt(getCharSafe(i))
 //      ^ definition local 95
 //        display_name c
 //        signature_documentation scala c: Int 
+//        kind Variable
 //          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.toUnsignedInt().
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -1880,6 +1994,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //              ^ definition local 97
 //                display_name d
 //                signature_documentation scala d: Char 
+//                kind Variable
 //                  ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().
 //                          ^ reference local 94
             outputBuilder.appendC(d)
@@ -1895,6 +2010,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //             ^ definition local 98
 //               display_name c
 //               signature_documentation scala c: Char 
+//               kind Variable
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                      ^ reference local 94
 //                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
@@ -1939,13 +2055,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().
 //                                           display_name parseStringValue
 //                                           signature_documentation scala final def parseStringValue(i: Int, stackHead: ObjArrVisitor[local99, J[): Int
+//                                           kind Method
 //                                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
 //                                             display_name i
 //                                             signature_documentation scala i: Int 
+//                                             kind Parameter
 //                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(stackHead)
 //                                                             display_name stackHead
 //                                                             signature_documentation scala stackHead: ObjArrVisitor[local99, J[ 
+//                                                             kind Parameter
 //                                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
@@ -1954,6 +2073,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^ definition local 100
 //        display_name k
 //        signature_documentation scala k: Int 
+//        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
@@ -1978,6 +2098,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 101
 //           display_name k2
 //           signature_documentation scala k2: Int 
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
 //                                           ^ reference local 100
@@ -1996,13 +2117,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().
 //                                         display_name parseStringKey
 //                                         signature_documentation scala final def parseStringKey(i: Int, stackHead: ObjArrVisitor[local102, J[): Int
+//                                         kind Method
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
 //                                           display_name i
 //                                           signature_documentation scala i: Int 
+//                                           kind Parameter
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(stackHead)
 //                                                           display_name stackHead
 //                                                           signature_documentation scala stackHead: ObjArrVisitor[local102, J[ 
+//                                                           kind Parameter
 //                                                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
@@ -2011,6 +2135,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^ definition local 103
 //        display_name k
 //        signature_documentation scala k: Int 
+//        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
@@ -2035,6 +2160,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 104
 //           display_name k2
 //           signature_documentation scala k2: Int 
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
 //                                           ^ reference local 103
@@ -2054,13 +2180,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                               display_name parseStringToOutputBuilder
 //                               signature_documentation scala def parseStringToOutputBuilder(i: Int, k: Int): Int
+//                               kind Method
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(i)
 //                                 display_name i
 //                                 signature_documentation scala i: Int 
+//                                 kind Parameter
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
 //                                         display_name k
 //                                         signature_documentation scala k: Int 
+//                                         kind Parameter
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     outputBuilder.reset()
 //  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
@@ -2079,6 +2208,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^^ definition local 105
 //         display_name k2
 //         signature_documentation scala k2: Int 
+//         kind Variable
 //           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
@@ -2091,23 +2221,28 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().
 //                display_name visitString
 //                signature_documentation scala def visitString(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local106, J[): Unit
+//                kind Method
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(i)
 //                  display_name i
 //                  signature_documentation scala i: Int 
+//                  kind Parameter
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(s)
 //                          display_name s
 //                          signature_documentation scala s: CharSequence 
+//                          kind Parameter
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                         ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(stackHead)
 //                                                   display_name stackHead
 //                                                   signature_documentation scala stackHead: ObjArrVisitor[local106, J[ 
+//                                                   kind Parameter
 //                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     val v = stackHead.subVisitor.visitString(s, i)
 //      ^ definition local 107
 //        display_name v
 //        signature_documentation scala v: Any 
+//        kind Variable
 //          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(stackHead)
 //                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
@@ -2124,23 +2259,28 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().
 //                   display_name visitStringKey
 //                   signature_documentation scala def visitStringKey(i: Int, s: CharSequence, stackHead: ObjArrVisitor[local108, J[): Unit
+//                   kind Method
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(i)
 //                     display_name i
 //                     signature_documentation scala i: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(s)
 //                             display_name s
 //                             signature_documentation scala s: CharSequence 
+//                             kind Parameter
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(stackHead)
 //                                                      display_name stackHead
 //                                                      signature_documentation scala stackHead: ObjArrVisitor[local108, J[ 
+//                                                      kind Parameter
 //                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
     val obj = stackHead.asInstanceOf[ObjVisitor[Any, _]]
 //      ^^^ definition local 109
 //          display_name obj
 //          signature_documentation scala obj: ObjVisitor[Any, Any] 
+//          kind Variable
 //            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(stackHead)
 //                      ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
 //                                   ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
@@ -2149,6 +2289,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^^^^^^^^^^ definition local 110
 //                 display_name keyVisitor
 //                 signature_documentation scala keyVisitor: Visitor[local111, Any[ 
+//                 kind Variable
 //                   ^^^ reference local 109
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(i)
@@ -2166,13 +2307,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().
 //                                              display_name parseStringTopLevel
 //                                              signature_documentation scala final def parseStringTopLevel(i: Int, facade: Visitor[local112, J[): (J, Int)
+//                                              kind Method
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
 //                                                display_name i
 //                                                signature_documentation scala i: Int 
+//                                                kind Parameter
 //                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                                                             display_name facade
 //                                                             signature_documentation scala facade: Visitor[local112, J[ 
+//                                                             kind Parameter
 //                                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
@@ -2182,6 +2326,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^ definition local 113
 //        display_name k
 //        signature_documentation scala k: Int 
+//        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
 //                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
@@ -2192,6 +2337,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^^ definition local 114
 //            display_name res
 //            signature_documentation scala res: J 
+//            kind Variable
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
@@ -2210,6 +2356,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^ definition local 115
 //           display_name k2
 //           signature_documentation scala k2: Int 
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
 //                                           ^ reference local 113
@@ -2217,6 +2364,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        ^^^ definition local 116
 //            display_name res
 //            signature_documentation scala res: J 
+//            kind Variable
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
index a741f8ab4..f17d19d11 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java
@@ -26,6 +26,7 @@ public abstract class AsyncEpoxyController extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#
 //                                         display_name AsyncEpoxyController
 //                                         signature_documentation java public abstract class AsyncEpoxyController
+//                                         kind Class
 //                                         documentation  A subclass of {@link EpoxyController} that makes it easy to do model building and diffing in\n the background.\n <p>\n See https://github.com/airbnb/epoxy/wiki/Epoxy-Controller#asynchronous-support\n
 //                                         relationship is_implementation semanticdb maven . . ModelCollector#
 //                                         relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -39,6 +40,7 @@ public AsyncEpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`().
 //                            display_name <init>
 //                            signature_documentation java public AsyncEpoxyController()
+//                            kind Constructor
 //                            documentation  A new instance that does model building and diffing asynchronously.\n
     this(true);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1).
@@ -52,6 +54,7 @@ public AsyncEpoxyController(boolean enableAsync) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1).
 //                            display_name <init>
 //                            signature_documentation java public AsyncEpoxyController(boolean enableAsync)
+//                            kind Constructor
 //                            documentation  @param enableAsync True to do model building and diffing asynchronously, false to do them\n                    both on the main thread.\n
 //                                    ^^^^^^^^^^^ definition local 0
 //                                                display_name enableAsync
@@ -70,6 +73,7 @@ public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyn
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
 //                            display_name <init>
 //                            signature_documentation java public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing)
+//                            kind Constructor
 //                            documentation  Individually control whether model building and diffing are done async or on the main thread.\n
 //                                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition local 1
 //                                                             display_name enableAsyncModelBuilding
@@ -92,6 +96,7 @@ private static Handler getHandler(boolean enableAsync) {
 //                       ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyController#getHandler().
 //                                  display_name getHandler
 //                                  signature_documentation java private static unresolved_type getHandler(boolean enableAsync)
+//                                  kind StaticMethod
 //                                          ^^^^^^^^^^^ definition local 3
 //                                                      display_name enableAsync
 //                                                      signature_documentation java boolean enableAsync
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
index d597b7784..44351705c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
@@ -53,16 +53,19 @@ class AsyncEpoxyDiffer {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#
 //                     display_name AsyncEpoxyDiffer
 //                     signature_documentation java class AsyncEpoxyDiffer
+//                     kind Class
 //                     documentation  An adaptation of Google's {@link androidx.recyclerview.widget.AsyncListDiffer}\n that adds support for payloads in changes.\n <p>\n Also adds support for canceling an in progress diff, and makes everything thread safe.\n
 
   interface ResultCallback {
 //          ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
 //                         display_name ResultCallback
 //                         signature_documentation java interface ResultCallback
+//                         kind Interface
     void onResult(@NonNull DiffResult result);
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult().
 //                display_name onResult
 //                signature_documentation java public abstract void onResult(DiffResult result)
+//                kind AbstractMethod
 //                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
 //                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
@@ -77,28 +80,33 @@ interface ResultCallback {
 //                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
 //                                display_name executor
 //                                signature_documentation java private final Executor executor
+//                                kind Field
   private final ResultCallback resultCallback;
 //              ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#resultCallback.
 //                                            display_name resultCallback
 //                                            signature_documentation java private final ResultCallback resultCallback
+//                                            kind Field
   private final ItemCallback<EpoxyModel<?>> diffCallback;
 //              ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#diffCallback.
 //                                                       display_name diffCallback
 //                                                       signature_documentation java private final unresolved_type diffCallback
+//                                                       kind Field
   private final GenerationTracker generationTracker = new GenerationTracker();
 //              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
 //                                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
 //                                                  display_name generationTracker
 //                                                  signature_documentation java private final GenerationTracker generationTracker
+//                                                  kind Field
 //                                                        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#`<init>`().
 
   AsyncEpoxyDiffer(
 //^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`().
 //                 display_name <init>
 //                 signature_documentation java AsyncEpoxyDiffer(unresolved_type handler, ResultCallback resultCallback, unresolved_type diffCallback)
+//                 kind Constructor
       @NonNull Handler handler,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^^^^ reference semanticdb maven . . Handler#
@@ -142,6 +150,7 @@ interface ResultCallback {
 //                                               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#list.
 //                                                    display_name list
 //                                                    signature_documentation java @Nullable\nprivate List<? extends EpoxyModel<?>> list
+//                                                    kind Field
 
   /**
    * Non-null, unmodifiable version of list.
@@ -156,6 +165,7 @@ interface ResultCallback {
 //                                               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#readOnlyList.
 //                                                            display_name readOnlyList
 //                                                            signature_documentation java @NonNull\nprivate List<? extends EpoxyModel<?>> readOnlyList
+//                                                            kind Field
 //                                                            documentation  Non-null, unmodifiable version of list.\n <p>\n Collections.emptyList when list is null, wrapped by Collections.unmodifiableList otherwise\n
 //                                                              ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#emptyList().
@@ -181,6 +191,7 @@ public List<? extends EpoxyModel<?>> getCurrentList() {
 //                                     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#getCurrentList().
 //                                                    display_name getCurrentList
 //                                                    signature_documentation java @AnyThread\n@NonNull\npublic List<? extends EpoxyModel<?>> getCurrentList()
+//                                                    kind Method
 //                                                    documentation  Get the current List - any diffing to present this list has already been computed and\n dispatched via the ListUpdateCallback.\n <p>\n If a <code>null</code> List, or no List has been submitted, an empty list will be returned.\n <p>\n The returned list may not be mutated - mutations to content must be done through\n {@link #submitList(List)}.\n\n @return current List.\n
     return readOnlyList;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#readOnlyList.
@@ -198,6 +209,7 @@ public boolean cancelDiff() {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff().
 //                          display_name cancelDiff
 //                          signature_documentation java @SuppressWarnings("WeakerAccess")\n@AnyThread\npublic boolean cancelDiff()
+//                          kind Method
 //                          documentation  Prevents any ongoing diff from dispatching results. Returns true if there was an ongoing\n diff to cancel, false otherwise.\n
     return generationTracker.finishMaxGeneration();
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
@@ -215,6 +227,7 @@ public boolean isDiffInProgress() {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#isDiffInProgress().
 //                                display_name isDiffInProgress
 //                                signature_documentation java @SuppressWarnings("WeakerAccess")\n@AnyThread\npublic boolean isDiffInProgress()
+//                                kind Method
 //                                documentation  @return True if a diff operation is in progress.\n
     return generationTracker.hasUnfinishedGeneration();
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
@@ -233,6 +246,7 @@ public synchronized boolean forceListOverride(@Nullable List<EpoxyModel<?>> newL
 //                            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                              display_name forceListOverride
 //                                              signature_documentation java @AnyThread\npublic boolean forceListOverride(List<EpoxyModel<?>> newList)
+//                                              kind Method
 //                                              documentation  Set the current list without performing any diffing. Cancels any diff in progress.\n <p>\n This can be used if you notified a change to the adapter manually and need this list to be\n synced.\n
 //                                               ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                        ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -281,6 +295,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
 //                       display_name submitList
 //                       signature_documentation java @AnyThread\n@SuppressWarnings("WeakerAccess")\npublic void submitList(List<? extends EpoxyModel<?>> newList)
+//                       kind Method
 //                       documentation  Set a new List representing your latest data.\n <p>\n A diff will be computed between this list and the last list set. If this has not previously\n been called then an empty list is used as the previous list.\n <p>\n The diff computation will be done on the thread given by the handler in the constructor.\n When the diff is done it will be applied (dispatched to the result callback),\n and the new List will be swapped in.\n
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                       ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -394,6 +409,7 @@ public void run() {
 //                    display_name run
 //                    signature_documentation java @Override\npublic void run()
 //                    enclosing_symbol local 12
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         DiffUtil.DiffResult result = DiffUtil.calculateDiff(wrappedCallback);
 //      ^^^^^^^^ reference semanticdb maven . . DiffUtil/
@@ -422,6 +438,7 @@ private void onRunCompleted(
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#onRunCompleted().
 //                            display_name onRunCompleted
 //                            signature_documentation java private void onRunCompleted(int runGeneration, List<? extends EpoxyModel<?>> newList, DiffResult result)
+//                            kind Method
       final int runGeneration,
 //              ^^^^^^^^^^^^^ definition local 15
 //                            display_name runGeneration
@@ -458,6 +475,7 @@ public void run() {
 //                    display_name run
 //                    signature_documentation java @Override\npublic void run()
 //                    enclosing_symbol local 18
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         final boolean dispatchResult = tryLatchList(newList, runGeneration);
 //                    ^^^^^^^^^^^^^^ definition local 20
@@ -491,6 +509,7 @@ private synchronized boolean tryLatchList(@Nullable List<? extends EpoxyModel<?>
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
 //                                          display_name tryLatchList
 //                                          signature_documentation java @AnyThread\nprivate boolean tryLatchList(List<? extends EpoxyModel<?>> newList, int runGeneration)
+//                                          kind Method
 //                                          documentation  Marks the generation as done, and updates the list if the generation is the most recent.\n\n @return True if the given generation is the most recent, in which case the given list was\n set. False if the generation is old and the list was ignored.\n
 //                                           ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -547,25 +566,30 @@ private static class GenerationTracker {
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
 //                                       display_name GenerationTracker
 //                                       signature_documentation java private static class GenerationTracker
+//                                       kind Class
 //                                       documentation  The concept of a "generation" is used to associate a diff result with a point in time when\n it was created. This allows us to handle list updates concurrently, and ignore outdated diffs.\n <p>\n We track the highest start generation, and the highest finished generation, and these must\n be kept in sync, so all access to this class is synchronized.\n <p>\n The general synchronization strategy for this class is that when a generation number\n is queried that action must be synchronized with accessing the current list, so that the\n generation number is synced with the list state at the time it was created.\n
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#`<init>`().
 //                                       display_name <init>
 //                                       signature_documentation java private GenerationTracker()
+//                                       kind Constructor
 
     // Max generation of currently scheduled runnable
     private volatile int maxScheduledGeneration;
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
 //                                              display_name maxScheduledGeneration
 //                                              signature_documentation java private int maxScheduledGeneration
+//                                              kind Field
     private volatile int maxFinishedGeneration;
 //                       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxFinishedGeneration.
 //                                             display_name maxFinishedGeneration
 //                                             signature_documentation java private int maxFinishedGeneration
+//                                             kind Field
 
     synchronized int incrementAndGetNextScheduled() {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#incrementAndGetNextScheduled().
 //                                                display_name incrementAndGetNextScheduled
 //                                                signature_documentation java int incrementAndGetNextScheduled()
+//                                                kind Method
       return ++maxScheduledGeneration;
 //             ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
     }
@@ -574,6 +598,7 @@ synchronized boolean finishMaxGeneration() {
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishMaxGeneration().
 //                                           display_name finishMaxGeneration
 //                                           signature_documentation java boolean finishMaxGeneration()
+//                                           kind Method
       boolean isInterrupting = hasUnfinishedGeneration();
 //            ^^^^^^^^^^^^^^ definition local 23
 //                           display_name isInterrupting
@@ -591,6 +616,7 @@ synchronized boolean hasUnfinishedGeneration() {
 //                       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#hasUnfinishedGeneration().
 //                                               display_name hasUnfinishedGeneration
 //                                               signature_documentation java boolean hasUnfinishedGeneration()
+//                                               kind Method
       return maxScheduledGeneration > maxFinishedGeneration;
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
 //                                    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxFinishedGeneration.
@@ -600,6 +626,7 @@ synchronized boolean finishGeneration(int runGeneration) {
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishGeneration().
 //                                        display_name finishGeneration
 //                                        signature_documentation java boolean finishGeneration(int runGeneration)
+//                                        kind Method
 //                                            ^^^^^^^^^^^^^ definition local 24
 //                                                          display_name runGeneration
 //                                                          signature_documentation java int runGeneration
@@ -631,6 +658,7 @@ private static class DiffCallback extends DiffUtil.Callback {
 //                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
 //                                  display_name DiffCallback
 //                                  signature_documentation java private static class DiffCallback
+//                                  kind Class
 //                                  relationship is_implementation semanticdb maven . . DiffUtil/Callback#
 //                                          ^^^^^^^^ reference semanticdb maven . . DiffUtil/
 //                                                   ^^^^^^^^ reference semanticdb maven . . DiffUtil/Callback#
@@ -641,23 +669,27 @@ private static class DiffCallback extends DiffUtil.Callback {
 //                                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
 //                                              display_name oldList
 //                                              signature_documentation java final List<? extends EpoxyModel<?>> oldList
+//                                              kind Field
     final List<? extends EpoxyModel<?>> newList;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList.
 //                                              display_name newList
 //                                              signature_documentation java final List<? extends EpoxyModel<?>> newList
+//                                              kind Field
     private final ItemCallback<EpoxyModel<?>> diffCallback;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
 //                                                         display_name diffCallback
 //                                                         signature_documentation java private final unresolved_type diffCallback
+//                                                         kind Field
 
     DiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList,
 //  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
 //               display_name <init>
 //               signature_documentation java DiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList, unresolved_type diffCallback)
+//               kind Constructor
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^ definition local 26
@@ -694,6 +726,7 @@ public int getOldListSize() {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getOldListSize().
 //                            display_name getOldListSize
 //                            signature_documentation java @Override\npublic int getOldListSize()
+//                            kind Method
       return oldList.size();
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
 //                   ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -705,6 +738,7 @@ public int getNewListSize() {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getNewListSize().
 //                            display_name getNewListSize
 //                            signature_documentation java @Override\npublic int getNewListSize()
+//                            kind Method
       return newList.size();
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList.
 //                   ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -716,6 +750,7 @@ public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areItemsTheSame().
 //                                 display_name areItemsTheSame
 //                                 signature_documentation java @Override\npublic boolean areItemsTheSame(int oldItemPosition, int newItemPosition)
+//                                 kind Method
 //                                     ^^^^^^^^^^^^^^^ definition local 29
 //                                                     display_name oldItemPosition
 //                                                     signature_documentation java int oldItemPosition
@@ -744,6 +779,7 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
 //                 ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areContentsTheSame().
 //                                    display_name areContentsTheSame
 //                                    signature_documentation java @Override\npublic boolean areContentsTheSame(int oldItemPosition, int newItemPosition)
+//                                    kind Method
 //                                        ^^^^^^^^^^^^^^^ definition local 31
 //                                                        display_name oldItemPosition
 //                                                        signature_documentation java int oldItemPosition
@@ -775,6 +811,7 @@ public Object getChangePayload(int oldItemPosition, int newItemPosition) {
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getChangePayload().
 //                                 display_name getChangePayload
 //                                 signature_documentation java @Nullable\n@Override\npublic Object getChangePayload(int oldItemPosition, int newItemPosition)
+//                                 kind Method
 //                                     ^^^^^^^^^^^^^^^ definition local 33
 //                                                     display_name oldItemPosition
 //                                                     signature_documentation java int oldItemPosition
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
index 1d2802f64..b515a2cda 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
@@ -63,6 +63,7 @@ public abstract class BaseEpoxyAdapter
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                                     display_name BaseEpoxyAdapter
 //                                     signature_documentation java public abstract class BaseEpoxyAdapter
+//                                     kind Class
 //                                     relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                     relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
     extends RecyclerView.Adapter<EpoxyViewHolder>
@@ -77,17 +78,20 @@ public abstract class BaseEpoxyAdapter
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#SAVED_STATE_ARG_VIEW_HOLDERS.
 //                                                         display_name SAVED_STATE_ARG_VIEW_HOLDERS
 //                                                         signature_documentation java private static final String SAVED_STATE_ARG_VIEW_HOLDERS
+//                                                         kind StaticField
 
   private int spanCount = 1;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
 //                      display_name spanCount
 //                      signature_documentation java private int spanCount
+//                      kind Field
 
   private final ViewTypeManager viewTypeManager = new ViewTypeManager();
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
 //                                              display_name viewTypeManager
 //                                              signature_documentation java private final ViewTypeManager viewTypeManager
+//                                              kind Field
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#`<init>`().
   /**
    * Keeps track of view holders that are currently bound so we can save their state in {@link
@@ -98,6 +102,7 @@ public abstract class BaseEpoxyAdapter
 //                               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders.
 //                                                display_name boundViewHolders
 //                                                signature_documentation java private final BoundViewHolders boundViewHolders
+//                                                kind Field
 //                                                documentation  Keeps track of view holders that are currently bound so we can save their state in {@link\n #onSaveInstanceState(Bundle)}.\n
 //                                                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#`<init>`().
   private ViewHolderState viewHolderState = new ViewHolderState();
@@ -105,6 +110,7 @@ public abstract class BaseEpoxyAdapter
 //                        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
 //                                        display_name viewHolderState
 //                                        signature_documentation java private ViewHolderState viewHolderState
+//                                        kind Field
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`().
 
   private final SpanSizeLookup spanSizeLookup = new SpanSizeLookup() {
@@ -112,6 +118,7 @@ public abstract class BaseEpoxyAdapter
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanSizeLookup.
 //                                            display_name spanSizeLookup
 //                                            signature_documentation java private final unresolved_type spanSizeLookup
+//                                            kind Field
 //                                                  ^^^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#
 
     @Override
@@ -137,6 +144,7 @@ public BaseEpoxyAdapter() {
 //       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#`<init>`().
 //                        display_name <init>
 //                        signature_documentation java public BaseEpoxyAdapter()
+//                        kind Constructor
     // Defaults to stable ids since view models generate unique ids. Set this to false in the
     // subclass if you don't want to support it
     setHasStableIds(true);
@@ -154,6 +162,7 @@ protected void onExceptionSwallowed(RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onExceptionSwallowed().
 //                                    display_name onExceptionSwallowed
 //                                    signature_documentation java protected void onExceptionSwallowed(RuntimeException exception)
+//                                    kind Method
 //                                    documentation  This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy\n will recover, but you can override this to be aware of when they happen.\n
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed().
 //                                    ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
@@ -170,6 +179,7 @@ public int getItemCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemCount().
 //                        display_name getItemCount
 //                        signature_documentation java @Override\npublic int getItemCount()
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
     return getCurrentModels().size();
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
@@ -183,6 +193,7 @@ public int getItemCount() {
 //                                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                                        display_name getCurrentModels
 //                                                        signature_documentation java abstract List<? extends EpoxyModel<?>> getCurrentModels()
+//                                                        kind AbstractMethod
 //                                                        documentation Return the models currently being used by the adapter to populate the recyclerview. 
 //                                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getCurrentModels().
 //                                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
@@ -191,6 +202,7 @@ public boolean isEmpty() {
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isEmpty().
 //                       display_name isEmpty
 //                       signature_documentation java public boolean isEmpty()
+//                       kind Method
     return getCurrentModels().isEmpty();
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                            ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -202,6 +214,7 @@ public long getItemId(int position) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemId().
 //                      display_name getItemId
 //                      signature_documentation java @Override\npublic long getItemId(int position)
+//                      kind Method
 //                          ^^^^^^^^ definition local 1
 //                                   display_name position
 //                                   signature_documentation java int position
@@ -222,6 +235,7 @@ public int getItemViewType(int position) {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemViewType().
 //                           display_name getItemViewType
 //                           signature_documentation java @Override\npublic int getItemViewType(int position)
+//                           kind Method
 //                               ^^^^^^^^ definition local 2
 //                                        display_name position
 //                                        signature_documentation java int position
@@ -240,6 +254,7 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 //                       ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
 //                                          display_name onCreateViewHolder
 //                                          signature_documentation java @Override\npublic EpoxyViewHolder onCreateViewHolder(unresolved_type parent, int viewType)
+//                                          kind Method
 //                                          ^^^^^^^^^ reference semanticdb maven . . ViewGroup#
 //                                                    ^^^^^^ definition local 3
 //                                                           display_name parent
@@ -281,6 +296,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder().
 //                             display_name onBindViewHolder
 //                             signature_documentation java @Override\npublic void onBindViewHolder(EpoxyViewHolder holder, int position)
+//                             kind Method
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^ definition local 7
 //                                                    display_name holder
@@ -304,6 +320,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
 //                             display_name onBindViewHolder
 //                             signature_documentation java @Override\npublic void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object> payloads)
+//                             kind Method
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^ definition local 9
 //                                                    display_name holder
@@ -392,6 +409,7 @@ boolean diffPayloadsEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
 //                            display_name diffPayloadsEnabled
 //                            signature_documentation java boolean diffPayloadsEnabled()
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#diffPayloadsEnabled().
     return false;
   }
@@ -404,6 +422,7 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int pos
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound().
 //                            display_name onModelBound
 //                            signature_documentation java protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, List<Object> payloads)
+//                            kind Method
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound.\n
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                            ^^^^^^ definition local 14
@@ -438,6 +457,7 @@ void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position,
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
 //                  display_name onModelBound
 //                  signature_documentation java void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, EpoxyModel<?> previouslyBoundModel)
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
 //                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                  ^^^^^^ definition local 18
@@ -475,6 +495,7 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int pos
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2).
 //                            display_name onModelBound
 //                            signature_documentation java protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position)
+//                            kind Method
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound.\n
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                            ^^^^^^ definition local 22
@@ -503,6 +524,7 @@ protected BoundViewHolders getBoundViewHolders() {
 //                           ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
 //                                               display_name getBoundViewHolders
 //                                               signature_documentation java protected BoundViewHolders getBoundViewHolders()
+//                                               kind Method
 //                                               documentation  Returns an object that manages the view holders currently bound to the RecyclerView. This\n object is mainly used by the base Epoxy adapter to save view states, but you may find it useful\n to help access views or models currently shown in the RecyclerView.\n
 //                                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getBoundViewHolders().
 //                                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getBoundViewHolders().
@@ -515,6 +537,7 @@ EpoxyModel<?> getModelForPosition(int position) {
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                  display_name getModelForPosition
 //                                  signature_documentation java EpoxyModel<?> getModelForPosition(int position)
+//                                  kind Method
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
 //                                      ^^^^^^^^ definition local 25
 //                                               display_name position
@@ -532,6 +555,7 @@ public void onViewRecycled(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewRecycled().
 //                           display_name onViewRecycled
 //                           signature_documentation java @Override\npublic void onViewRecycled(EpoxyViewHolder holder)
+//                           kind Method
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                           ^^^^^^ definition local 26
 //                                                  display_name holder
@@ -571,6 +595,7 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
 //                                       display_name onDetachedFromRecyclerView
 //                                       signature_documentation java @CallSuper\n@Override\npublic void onDetachedFromRecyclerView(unresolved_type recyclerView)
+//                                       kind Method
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView().
 //                                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -594,6 +619,7 @@ protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelUnbound().
 //                              display_name onModelUnbound
 //                              signature_documentation java protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)
+//                              kind Method
 //                              documentation  Called immediately after a model is unbound from a view holder. Subclasses can override this if\n they want alerts on when a model is unbound.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound().
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -617,6 +643,7 @@ public boolean onFailedToRecycleView(EpoxyViewHolder holder) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onFailedToRecycleView().
 //                                     display_name onFailedToRecycleView
 //                                     signature_documentation java @CallSuper\n@Override\npublic boolean onFailedToRecycleView(EpoxyViewHolder holder)
+//                                     kind Method
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 31
 //                                                            display_name holder
@@ -640,6 +667,7 @@ public void onViewAttachedToWindow(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
 //                                   signature_documentation java @CallSuper\n@Override\npublic void onViewAttachedToWindow(EpoxyViewHolder holder)
+//                                   kind Method
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow().
 //                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                   ^^^^^^ definition local 32
@@ -664,6 +692,7 @@ public void onViewDetachedFromWindow(EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
 //                                     signature_documentation java @CallSuper\n@Override\npublic void onViewDetachedFromWindow(EpoxyViewHolder holder)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow().
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                     ^^^^^^ definition local 33
@@ -684,6 +713,7 @@ public void onSaveInstanceState(Bundle outState) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState().
 //                                display_name onSaveInstanceState
 //                                signature_documentation java public void onSaveInstanceState(unresolved_type outState)
+//                                kind Method
 //                                ^^^^^^ reference semanticdb maven . . Bundle#
 //                                       ^^^^^^^^ definition local 34
 //                                                display_name outState
@@ -724,6 +754,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onRestoreInstanceState().
 //                                   display_name onRestoreInstanceState
 //                                   signature_documentation java public void onRestoreInstanceState(unresolved_type inState)
+//                                   kind Method
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                    ^^^^^^^ definition local 36
@@ -768,6 +799,7 @@ protected int getModelPosition(EpoxyModel<?> model) {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               display_name getModelPosition
 //                               signature_documentation java protected int getModelPosition(EpoxyModel<?> model)
+//                               kind Method
 //                               documentation  Finds the position of the given model in the list. Doesn't use indexOf to avoid unnecessary\n equals() calls since we're looking for the same object instance.\n\n @return The position of the given model in the current models list, or -1 if the model can't be\n found.\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition().
@@ -815,6 +847,7 @@ public SpanSizeLookup getSpanSizeLookup() {
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getSpanSizeLookup().
 //                                        display_name getSpanSizeLookup
 //                                        signature_documentation java public unresolved_type getSpanSizeLookup()
+//                                        kind Method
 //                                        documentation  For use with a grid layout manager - use this to get the {@link SpanSizeLookup} for models in\n this adapter. This will delegate span look up calls to each model's {@link\n EpoxyModel#getSpanSize(int, int, int)}. Make sure to also call {@link #setSpanCount(int)} so\n the span count is correct.\n
     return spanSizeLookup;
 //         ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanSizeLookup.
@@ -831,6 +864,7 @@ public void setSpanCount(int spanCount) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount().
 //                         display_name setSpanCount
 //                         signature_documentation java public void setSpanCount(int spanCount)
+//                         kind Method
 //                         documentation  If you are using a grid layout manager you must call this to set the span count of the grid.\n This span count will be passed on to the models so models can choose what span count to be.\n\n @see #getSpanSizeLookup()\n @see EpoxyModel#getSpanSize(int, int, int)\n
 //                             ^^^^^^^^^ definition local 40
 //                                       display_name spanCount
@@ -845,6 +879,7 @@ public int getSpanCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getSpanCount().
 //                        display_name getSpanCount
 //                        signature_documentation java public int getSpanCount()
+//                        kind Method
     return spanCount;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
   }
@@ -853,6 +888,7 @@ public boolean isMultiSpan() {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isMultiSpan().
 //                           display_name isMultiSpan
 //                           signature_documentation java public boolean isMultiSpan()
+//                           kind Method
     return spanCount > 1;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
   }
@@ -872,6 +908,7 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView().
 //                                  display_name setupStickyHeaderView
 //                                  signature_documentation java @Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)
+//                                  kind Method
 //                                  documentation  Optional callback to setup the sticky view,\n by default it doesn't do anything.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView().
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
@@ -896,6 +933,7 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView().
 //                                     display_name teardownStickyHeaderView
 //                                     signature_documentation java @Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)
+//                                     kind Method
 //                                     documentation  Optional callback to perform tear down operation on the\n sticky view, by default it doesn't do anything.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView().
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
@@ -920,6 +958,7 @@ public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader().
 //                              display_name isStickyHeader
 //                              signature_documentation java @Override\npublic boolean isStickyHeader(int position)
+//                              kind Method
 //                              documentation  Called to check if the item at the position is a sticky item,\n by default returns false.\n <p>\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader().
 //                                  ^^^^^^^^ definition local 43
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
index 63d920aeb..1e0557745 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
@@ -9,11 +9,13 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                               display_name BaseEpoxyTouchCallback
 //                               signature_documentation java interface BaseEpoxyTouchCallback<T extends EpoxyModel>
+//                               kind Interface
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                               ^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#[T]
 //                                 display_name T
 //                                 signature_documentation java T extends EpoxyModel
+//                                 kind TypeParameter
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
   /**
@@ -30,6 +32,7 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                             display_name getMovementFlagsForModel
 //                             signature_documentation java public abstract int getMovementFlagsForModel(T model, int adapterPosition)
+//                             kind AbstractMethod
 //                             documentation  Should return a composite flag which defines the enabled move directions in each state\n (idle, swiping, dragging) for the given model.\n <p>\n Return 0 to disable movement for the model.\n\n @param model           The model being targeted for movement.\n @param adapterPosition The current adapter position of the targeted model\n @see androidx.recyclerview.widget.ItemTouchHelper.Callback#getMovementFlags\n
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel().
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel().
@@ -57,6 +60,7 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //               display_name clearView
 //               signature_documentation java public abstract void clearView(T model, unresolved_type itemView)
+//               kind AbstractMethod
 //               documentation  Called when the user interaction with a view is over and the view has\n completed its animation. This is a good place to clear all changes on the view that were done\n in other previous touch callbacks (such as on touch start, change, release, etc).\n <p>\n This is the last callback in the lifecycle of a touch event.\n\n @param model    The model whose view is being cleared.\n @param itemView The view being cleared.\n
 //               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
index ffafa810c..effa69bce 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
@@ -26,11 +26,13 @@ public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#
 //                            display_name BoundViewHolders
 //                            signature_documentation java @SuppressWarnings("WeakerAccess")\npublic class BoundViewHolders
+//                            kind Class
 //                            documentation Helper class for keeping track of {@link EpoxyViewHolder}s that are currently bound. 
 //                            relationship is_implementation semanticdb maven jdk 11 java/lang/Iterable#
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#`<init>`().
 //                            display_name <init>
 //                            signature_documentation java public BoundViewHolders()
+//                            kind Constructor
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
   private final LongSparseArray<EpoxyViewHolder> holders = new LongSparseArray<>();
@@ -39,6 +41,7 @@ public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
 //                                               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //                                                       display_name holders
 //                                                       signature_documentation java private final LongSparseArray<EpoxyViewHolder> holders
+//                                                       kind Field
 //                                                             ^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#`<init>`().
 
   @Nullable
@@ -48,6 +51,7 @@ public EpoxyViewHolder get(EpoxyViewHolder holder) {
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#get().
 //                           display_name get
 //                           signature_documentation java @Nullable\npublic EpoxyViewHolder get(EpoxyViewHolder holder)
+//                           kind Method
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                           ^^^^^^ definition local 0
 //                                                  display_name holder
@@ -64,6 +68,7 @@ public void put(EpoxyViewHolder holder) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#put().
 //                display_name put
 //                signature_documentation java public void put(EpoxyViewHolder holder)
+//                kind Method
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                ^^^^^^ definition local 1
 //                                       display_name holder
@@ -81,6 +86,7 @@ public void remove(EpoxyViewHolder holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#remove().
 //                   display_name remove
 //                   signature_documentation java public void remove(EpoxyViewHolder holder)
+//                   kind Method
 //                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                   ^^^^^^ definition local 2
 //                                          display_name holder
@@ -97,6 +103,7 @@ public int size() {
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#size().
 //                display_name size
 //                signature_documentation java public int size()
+//                kind Method
     return holders.size();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#holders.
 //                 ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
@@ -110,6 +117,7 @@ public Iterator<EpoxyViewHolder> iterator() {
 //                                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#iterator().
 //                                          display_name iterator
 //                                          signature_documentation java @Override\npublic Iterator<EpoxyViewHolder> iterator()
+//                                          kind Method
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
     return new HolderIterator();
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#`<init>`().
@@ -122,6 +130,7 @@ public EpoxyViewHolder getHolderForModel(EpoxyModel<?> model) {
 //                       ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#getHolderForModel().
 //                                         display_name getHolderForModel
 //                                         signature_documentation java @Nullable\npublic EpoxyViewHolder getHolderForModel(EpoxyModel<?> model)
+//                                         kind Method
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                       ^^^^^ definition local 3
 //                                                             display_name model
@@ -138,16 +147,19 @@ private class HolderIterator implements Iterator<EpoxyViewHolder> {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#
 //                             display_name HolderIterator
 //                             signature_documentation java private class HolderIterator
+//                             kind Class
 //                             relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#`<init>`().
 //                             display_name <init>
 //                             signature_documentation java private HolderIterator()
+//                             kind Constructor
 //                                        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
     private int position = 0;
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#position.
 //                       display_name position
 //                       signature_documentation java private int position
+//                       kind Field
 
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -155,6 +167,7 @@ public boolean hasNext() {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext().
 //                         display_name hasNext
 //                         signature_documentation java @Override\npublic boolean hasNext()
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
       return position < holders.size();
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#position.
@@ -169,6 +182,7 @@ public EpoxyViewHolder next() {
 //                         ^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#next().
 //                              display_name next
 //                              signature_documentation java @Override\npublic EpoxyViewHolder next()
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
       if (!hasNext()) {
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext().
@@ -187,6 +201,7 @@ public void remove() {
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/BoundViewHolders#HolderIterator#remove().
 //                     display_name remove
 //                     signature_documentation java @Override\npublic void remove()
+//                     kind Method
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
       throw new UnsupportedOperationException();
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
index 4dcbbb07a..5cec7e996 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
@@ -113,6 +113,7 @@ public class Carousel extends EpoxyRecyclerView {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#
 //                    display_name Carousel
 //                    signature_documentation java @ModelView(saveViewState = true, autoLayout = Size.MATCH_WIDTH_WRAP_HEIGHT)\npublic class Carousel
+//                    kind Class
 //                    documentation  <i>This feature is in Beta - please report bugs, feature requests, or other feedback at\n https://github.com/airbnb/epoxy by creating a new issue. Thanks!</i>\n\n <p>This is intended as a plug and play "Carousel" view - a Recyclerview with horizontal\n scrolling. It comes with common defaults and performance optimizations and can be either used as\n a top level RecyclerView, or nested within a vertical recyclerview.\n\n <p>This class provides:\n\n <p>1. Automatic integration with Epoxy. A {@link CarouselModel_} is generated from this class,\n which you can use in your EpoxyController. Just call {@link #setModels(List)} to provide the list\n of models to show in the carousel.\n\n <p>2. Default padding for carousel peeking, and an easy way to change this padding - {@link\n #setPaddingDp(int)}\n\n <p>3. Easily control how many items are shown on screen in the carousel at a time - {@link\n #setNumViewsToShowOnScreen(float)}\n\n <p>4. Easy snap support. By default a {@link LinearSnapHelper} is used, but you can set a global\n default for all Carousels with {@link #setDefaultGlobalSnapHelperFactory(SnapHelperFactory)}\n\n <p>5. All of the benefits of {@link EpoxyRecyclerView}\n\n <p>If you need further flexibility you can subclass this view to change its width, height,\n scrolling direction, etc. You can annotate a subclass with {@link ModelView} to generate a new\n EpoxyModel.\n
 //                    relationship is_implementation semanticdb maven . . EpoxyRecyclerView#
 //                            ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . EpoxyRecyclerView#
@@ -120,12 +121,14 @@ public class Carousel extends EpoxyRecyclerView {
 //                        ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#NO_VALUE_SET.
 //                                     display_name NO_VALUE_SET
 //                                     signature_documentation java public static final int NO_VALUE_SET
+//                                     kind StaticField
 
   private static SnapHelperFactory defaultGlobalSnapHelperFactory =
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory.
 //                                                                display_name defaultGlobalSnapHelperFactory
 //                                                                signature_documentation java private static SnapHelperFactory defaultGlobalSnapHelperFactory
+//                                                                kind StaticField
       new SnapHelperFactory() {
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 
@@ -139,6 +142,7 @@ public SnapHelper buildSnapHelper(Context context) {
 //                                        display_name buildSnapHelper
 //                                        signature_documentation java @Override\n@NonNull\npublic unresolved_type buildSnapHelper(unresolved_type context)
 //                                        enclosing_symbol local 0
+//                                        kind Method
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
 //                                        ^^^^^^^ reference semanticdb maven . . Context#
 //                                                ^^^^^^^ definition local 2
@@ -158,16 +162,19 @@ public SnapHelper buildSnapHelper(Context context) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp.
 //                                                display_name defaultSpacingBetweenItemsDp
 //                                                signature_documentation java @Dimension(unit = Dimension.DP)\nprivate static int defaultSpacingBetweenItemsDp
+//                                                kind StaticField
 
   private float numViewsToShowOnScreen;
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
 //                                     display_name numViewsToShowOnScreen
 //                                     signature_documentation java private float numViewsToShowOnScreen
+//                                     kind Field
 
   public Carousel(Context context) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`().
 //                display_name <init>
 //                signature_documentation java public Carousel(unresolved_type context)
+//                kind Constructor
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 3
 //                                display_name context
@@ -181,6 +188,7 @@ public Carousel(Context context, @Nullable AttributeSet attrs) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+1).
 //                display_name <init>
 //                signature_documentation java public Carousel(unresolved_type context, unresolved_type attrs)
+//                kind Constructor
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 4
 //                                display_name context
@@ -201,6 +209,7 @@ public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) {
 //       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#`<init>`(+2).
 //                display_name <init>
 //                signature_documentation java public Carousel(unresolved_type context, unresolved_type attrs, int defStyle)
+//                kind Constructor
 //                ^^^^^^^ reference semanticdb maven . . Context#
 //                        ^^^^^^^ definition local 6
 //                                display_name context
@@ -228,6 +237,7 @@ protected void init() {
 //               ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#init().
 //                    display_name init
 //                    signature_documentation java @Override\nprotected void init()
+//                    kind Method
     super.init();
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^ reference semanticdb maven . . super#init#
@@ -293,6 +303,7 @@ protected SnapHelperFactory getSnapHelperFactory() {
 //                            ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getSnapHelperFactory().
 //                                                 display_name getSnapHelperFactory
 //                                                 signature_documentation java @Nullable\nprotected SnapHelperFactory getSnapHelperFactory()
+//                                                 kind Method
 //                                                 documentation  Return a {@link SnapHelperFactory} instance to use with this Carousel. The {@link SnapHelper}\n created by the factory will be attached to this Carousel on view creation. Return null for no\n snap helper to be attached automatically.\n
     return defaultGlobalSnapHelperFactory;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory.
@@ -310,6 +321,7 @@ public static void setDefaultGlobalSnapHelperFactory(@Nullable SnapHelperFactory
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setDefaultGlobalSnapHelperFactory().
 //                                                     display_name setDefaultGlobalSnapHelperFactory
 //                                                     signature_documentation java public static void setDefaultGlobalSnapHelperFactory(SnapHelperFactory factory)
+//                                                     kind StaticMethod
 //                                                     documentation  Set a {@link SnapHelperFactory} instance to use with all Carousels by default. The {@link\n SnapHelper} created by the factory will be attached to each Carousel on view creation. Set null\n for no snap helper to be attached automatically.\n\n <p>A Carousel subclass can implement {@link #getSnapHelperFactory()} to override the global\n default.\n
 //                                                      ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
@@ -330,6 +342,7 @@ public void setHasFixedSize(boolean hasFixedSize) {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setHasFixedSize().
 //                            display_name setHasFixedSize
 //                            signature_documentation java @ModelProp\n@Override\npublic void setHasFixedSize(boolean hasFixedSize)
+//                            kind Method
 //                                    ^^^^^^^^^^^^ definition local 12
 //                                                 display_name hasFixedSize
 //                                                 signature_documentation java boolean hasFixedSize
@@ -365,6 +378,7 @@ public void setNumViewsToShowOnScreen(float viewCount) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setNumViewsToShowOnScreen().
 //                                      display_name setNumViewsToShowOnScreen
 //                                      signature_documentation java @ModelProp(group = "prefetch")\npublic void setNumViewsToShowOnScreen(float viewCount)
+//                                      kind Method
 //                                      documentation  Set the number of views to show on screen in this carousel at a time, partial numbers are\n allowed.\n\n <p>This is useful where you want to easily control for the number of items on screen,\n regardless of screen size. For example, you could set this to 1.2f so that one view is shown in\n full and 20% of the next view "peeks" from the edge to indicate that there is more content to\n scroll to.\n\n <p>Another pattern is setting a different view count depending on whether the device is phone\n or tablet.\n\n <p>Additionally, if a LinearLayoutManager is used this value will be forwarded to {@link\n LinearLayoutManager#setInitialPrefetchItemCount(int)} as a performance optimization.\n\n <p>If you want to only change the prefetch count without changing the view size you can simply\n use {@link #setInitialPrefetchItemCount(int)}\n
 //                                            ^^^^^^^^^ definition local 13
 //                                                      display_name viewCount
@@ -387,6 +401,7 @@ public float getNumViewsToShowOnScreen() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getNumViewsToShowOnScreen().
 //                                       display_name getNumViewsToShowOnScreen
 //                                       signature_documentation java public float getNumViewsToShowOnScreen()
+//                                       kind Method
 //                                       documentation  @return The number of views to show on screen in this carousel at a time.\n
       return numViewsToShowOnScreen;
 //           ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#numViewsToShowOnScreen.
@@ -406,6 +421,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount().
 //                                        display_name setInitialPrefetchItemCount
 //                                        signature_documentation java @ModelProp(group = "prefetch")\npublic void setInitialPrefetchItemCount(int numItemsToPrefetch)
+//                                        kind Method
 //                                        documentation  If you are using a Linear or Grid layout manager you can use this to set the item prefetch\n count. Only use this if you are not using {@link #setNumViewsToShowOnScreen(float)}\n\n @see #setNumViewsToShowOnScreen(float)\n @see LinearLayoutManager#setInitialPrefetchItemCount(int)\n
 //                                            ^^^^^^^^^^^^^^^^^^ definition local 14
 //                                                               display_name numItemsToPrefetch
@@ -450,6 +466,7 @@ public void onChildAttachedToWindow(View child) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
 //                                    display_name onChildAttachedToWindow
 //                                    signature_documentation java @Override\npublic void onChildAttachedToWindow(unresolved_type child)
+//                                    kind Method
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^^ definition local 17
 //                                               display_name child
@@ -537,6 +554,7 @@ private int getSpaceForChildren(boolean horizontal) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getSpaceForChildren().
 //                                display_name getSpaceForChildren
 //                                signature_documentation java private int getSpaceForChildren(boolean horizontal)
+//                                kind Method
 //                                        ^^^^^^^^^^ definition local 23
 //                                                   display_name horizontal
 //                                                   signature_documentation java boolean horizontal
@@ -570,6 +588,7 @@ private static int getTotalWidthPx(View view) {
 //                   ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalWidthPx().
 //                                   display_name getTotalWidthPx
 //                                   signature_documentation java @Px\nprivate static int getTotalWidthPx(unresolved_type view)
+//                                   kind StaticMethod
 //                                   ^^^^ reference semanticdb maven . . View#
 //                                        ^^^^ definition local 24
 //                                             display_name view
@@ -614,6 +633,7 @@ private static int getTotalHeightPx(View view) {
 //                   ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalHeightPx().
 //                                    display_name getTotalHeightPx
 //                                    signature_documentation java @Px\nprivate static int getTotalHeightPx(unresolved_type view)
+//                                    kind StaticMethod
 //                                    ^^^^ reference semanticdb maven . . View#
 //                                         ^^^^ definition local 26
 //                                              display_name view
@@ -657,6 +677,7 @@ public void onChildDetachedFromWindow(View child) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#onChildDetachedFromWindow().
 //                                      display_name onChildDetachedFromWindow
 //                                      signature_documentation java @Override\npublic void onChildDetachedFromWindow(unresolved_type child)
+//                                      kind Method
 //                                      ^^^^ reference semanticdb maven . . View#
 //                                           ^^^^^ definition local 28
 //                                                 display_name child
@@ -709,6 +730,7 @@ public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int d
 //                   ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setDefaultItemSpacingDp().
 //                                           display_name setDefaultItemSpacingDp
 //                                           signature_documentation java public static void setDefaultItemSpacingDp(int dp)
+//                                           kind StaticMethod
 //                                           documentation  Set a global default to use as the item spacing for all Carousels. Set to 0 for no item\n spacing.\n
 //                                            ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                                      ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -738,6 +760,7 @@ protected int getDefaultSpacingBetweenItemsDp() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp().
 //                                              display_name getDefaultSpacingBetweenItemsDp
 //                                              signature_documentation java @Dimension(unit = Dimension.DP)\nprotected int getDefaultSpacingBetweenItemsDp()
+//                                              kind Method
 //                                              documentation  Return the item spacing to use in this carousel, or 0 for no spacing.\n\n <p>By default this uses the global default set in {@link #setDefaultItemSpacingDp(int)}, but\n subclasses can override this to specify their own value.\n
     return defaultSpacingBetweenItemsDp;
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp.
@@ -754,6 +777,7 @@ public void setPaddingRes(@DimenRes int paddingRes) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingRes().
 //                          display_name setPaddingRes
 //                          signature_documentation java @ModelProp(group = "padding")\npublic void setPaddingRes(int paddingRes)
+//                          kind Method
 //                          documentation  Set a dimension resource to specify the padding value to use on each side of the carousel and\n in between carousel items.\n
 //                           ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                        ^^^^^^^^^^ definition local 32
@@ -792,6 +816,7 @@ public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingDp().
 //                         display_name setPaddingDp
 //                         signature_documentation java @ModelProp(defaultValue = "NO_VALUE_SET", group = "padding")\npublic void setPaddingDp(int paddingDp)
+//                         kind Method
 //                         documentation  Set a DP value to use as the padding on each side of the carousel and in between carousel\n items.\n\n <p>The default as the value returned by {@link #getDefaultSpacingBetweenItemsDp()}\n
 //                          ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
 //                                    ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#unit().
@@ -835,6 +860,7 @@ public void setPadding(@Nullable Padding padding) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setPadding().
 //                       display_name setPadding
 //                       signature_documentation java @ModelProp(group = "padding")\npublic void setPadding(Padding padding)
+//                       kind Method
 //                       documentation  Use the {@link Padding} class to specify individual padding values for each side of the\n carousel, as well as item spacing.\n\n <p>A value of null will set all padding and item spacing to 0.\n
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                 ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
@@ -933,43 +959,52 @@ public static class Padding {
 //                    ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                            display_name Padding
 //                            signature_documentation java public static class Padding
+//                            kind Class
 //                            documentation  Used to specify individual padding values programmatically.\n\n @see #setPadding(Padding)\n
     public final int left;
 //                   ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
 //                        display_name left
 //                        signature_documentation java public final int left
+//                        kind Field
     public final int top;
 //                   ^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#top.
 //                       display_name top
 //                       signature_documentation java public final int top
+//                       kind Field
     public final int right;
 //                   ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#right.
 //                         display_name right
 //                         signature_documentation java public final int right
+//                         kind Field
     public final int bottom;
 //                   ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#bottom.
 //                          display_name bottom
 //                          signature_documentation java public final int bottom
+//                          kind Field
     public final int itemSpacing;
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#itemSpacing.
 //                               display_name itemSpacing
 //                               signature_documentation java public final int itemSpacing
+//                               kind Field
     public final PaddingType paddingType;
 //               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#paddingType.
 //                                       display_name paddingType
 //                                       signature_documentation java public final PaddingType paddingType
+//                                       kind Field
 
     enum PaddingType {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#
 //                   display_name PaddingType
 //                   signature_documentation java enum PaddingType
+//                   kind Enum
 //                   relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                   relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //                   relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
 //                   display_name <init>
 //                   signature_documentation java private PaddingType()
+//                   kind Constructor
       PX,
 //    ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#PaddingType#PX.
 //       display_name PX
@@ -997,6 +1032,7 @@ public static Padding resource(@DimenRes int paddingRes, @DimenRes int itemSpaci
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource().
 //                                 display_name resource
 //                                 signature_documentation java public static Padding resource(int paddingRes, int itemSpacingRes)
+//                                 kind StaticMethod
 //                                 documentation  @param paddingRes Padding as dimension resource.\n @param itemSpacingRes Space as dimension resource to add between each carousel item. Will be\n     implemented via an item decoration.\n
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
 //                                               ^^^^^^^^^^ definition local 37
@@ -1033,6 +1069,7 @@ public static Padding resource(
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#resource(+1).
 //                                 display_name resource
 //                                 signature_documentation java public static Padding resource(int leftRes, int topRes, int rightRes, int bottomRes, int itemSpacingRes)
+//                                 kind StaticMethod
 //                                 documentation  @param leftRes Left padding as dimension resource.\n @param topRes Top padding as dimension resource.\n @param rightRes Right padding as dimension resource.\n @param bottomRes Bottom padding as dimension resource.\n @param itemSpacingRes Space as dimension resource to add between each carousel item. Will be\n     implemented via an item decoration.\n
         @DimenRes int leftRes,
 //       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/DimenRes#
@@ -1086,6 +1123,7 @@ public static Padding dp(
 //                        ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp().
 //                           display_name dp
 //                           signature_documentation java public static Padding dp(int paddingDp, int itemSpacingDp)
+//                           kind StaticMethod
 //                           documentation  @param paddingDp Padding in dp.\n @param itemSpacingDp Space in dp to add between each carousel item. Will be implemented via\n     an item decoration.\n
         @Dimension(unit = Dimension.DP) int paddingDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -1129,6 +1167,7 @@ public static Padding dp(
 //                        ^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#dp(+1).
 //                           display_name dp
 //                           signature_documentation java public static Padding dp(int leftDp, int topDp, int rightDp, int bottomDp, int itemSpacingDp)
+//                           kind StaticMethod
 //                           documentation  @param leftDp Left padding in dp.\n @param topDp Top padding in dp.\n @param rightDp Right padding in dp.\n @param bottomDp Bottom padding in dp.\n @param itemSpacingDp Space in dp to add between each carousel item. Will be implemented via\n     an item decoration.\n
         @Dimension(unit = Dimension.DP) int leftDp,
 //       ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Dimension#
@@ -1195,6 +1234,7 @@ public Padding(@Px int paddingPx, @Px int itemSpacingPx) {
 //         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`().
 //                 display_name <init>
 //                 signature_documentation java public Padding(int paddingPx, int itemSpacingPx)
+//                 kind Constructor
 //                 documentation  @param paddingPx Padding in pixels to add on all sides of the carousel\n @param itemSpacingPx Space in pixels to add between each carousel item. Will be implemented\n     via an item decoration.\n
 //                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                         ^^^^^^^^^ definition local 51
@@ -1229,6 +1269,7 @@ public Padding(
 //         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+1).
 //                 display_name <init>
 //                 signature_documentation java public Padding(int leftPx, int topPx, int rightPx, int bottomPx, int itemSpacingPx)
+//                 kind Constructor
 //                 documentation  @param leftPx Left padding in pixels.\n @param topPx Top padding in pixels.\n @param rightPx Right padding in pixels.\n @param bottomPx Bottom padding in pixels.\n @param itemSpacingPx Space in pixels to add between each carousel item. Will be implemented\n     via an item decoration.\n
         @Px int leftPx, @Px int topPx, @Px int rightPx, @Px int bottomPx, @Px int itemSpacingPx) {
 //       ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
@@ -1280,6 +1321,7 @@ private Padding(
 //          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
 //                  display_name <init>
 //                  signature_documentation java private Padding(int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType)
+//                  kind Constructor
 //                  documentation  @param left Left padding.\n @param top Top padding.\n @param right Right padding.\n @param bottom Bottom padding.\n @param itemSpacing Space to add between each carousel item. Will be implemented via an item\n     decoration.\n @param paddingType Unit / Type of the given paddings/ itemspacing.\n
         int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType) {
 //          ^^^^ definition local 58
@@ -1334,6 +1376,7 @@ public boolean equals(Object o) {
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#equals().
 //                        display_name equals
 //                        signature_documentation java @Override\npublic boolean equals(Object o)
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                               ^ definition local 64
@@ -1397,6 +1440,7 @@ public int hashCode() {
 //             ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#hashCode().
 //                      display_name hashCode
 //                      signature_documentation java @Override\npublic int hashCode()
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
       int result = left;
 //        ^^^^^^ definition local 66
@@ -1431,6 +1475,7 @@ public void setModels(@NonNull List<? extends EpoxyModel<?>> models) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#setModels().
 //                      display_name setModels
 //                      signature_documentation java @ModelProp\npublic void setModels(List<? extends EpoxyModel<?>> models)
+//                      kind Method
 //                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -1450,6 +1495,7 @@ public void clear() {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#clear().
 //                  display_name clear
 //                  signature_documentation java @OnViewRecycled\npublic void clear()
+//                  kind Method
     super.clear();
 //  ^^^^^ reference semanticdb maven . . super#
 //        ^^^^^ reference semanticdb maven . . super#clear#
@@ -1460,10 +1506,12 @@ public abstract static class SnapHelperFactory {
 //                             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#
 //                                               display_name SnapHelperFactory
 //                                               signature_documentation java public abstract static class SnapHelperFactory
+//                                               kind Class
 //                                               documentation Provide a SnapHelper implementation you want to use with a Carousel. 
 //                             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#`<init>`().
 //                                               display_name <init>
 //                                               signature_documentation java public SnapHelperFactory()
+//                                               kind Constructor
     /**
      * Create and return a new instance of a {@link androidx.recyclerview.widget.SnapHelper} for use
      * with a Carousel.
@@ -1475,6 +1523,7 @@ public abstract static class SnapHelperFactory {
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
 //                                             display_name buildSnapHelper
 //                                             signature_documentation java @NonNull\npublic abstract unresolved_type buildSnapHelper(unresolved_type context)
+//                                             kind AbstractMethod
 //                                             documentation  Create and return a new instance of a {@link androidx.recyclerview.widget.SnapHelper} for use\n with a Carousel.\n
 //                                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                                     ^^^^^^^ definition local 68
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
index ceac86f6b..eda8ba180 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
@@ -14,24 +14,29 @@ public abstract class ControllerHelper<T extends EpoxyController> {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                                     display_name ControllerHelper
 //                                     signature_documentation java public abstract class ControllerHelper<T extends EpoxyController>
+//                                     kind Class
 //                                     documentation  A helper class for {@link EpoxyController} to handle {@link\n com.airbnb.epoxy.AutoModel} models. This is only implemented by the generated classes created the\n annotation processor.\n
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#`<init>`().
 //                                     display_name <init>
 //                                     signature_documentation java public ControllerHelper()
+//                                     kind Constructor
 //                                     ^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
 //                                       display_name T
 //                                       signature_documentation java T extends EpoxyController
+//                                       kind TypeParameter
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   public abstract void resetAutoModels();
 //                     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#resetAutoModels().
 //                                     display_name resetAutoModels
 //                                     signature_documentation java public abstract void resetAutoModels()
+//                                     kind AbstractMethod
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#resetAutoModels().
 
   protected void validateModelHashCodesHaveNotChanged(T controller) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
 //                                                    display_name validateModelHashCodesHaveNotChanged
 //                                                    signature_documentation java protected void validateModelHashCodesHaveNotChanged(T controller)
+//                                                    kind Method
 //                                                    ^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#[T]
 //                                                      ^^^^^^^^^^ definition local 0
 //                                                                 display_name controller
@@ -78,6 +83,7 @@ protected void setControllerToStageTo(EpoxyModel<?> model, T controller) {
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelper#setControllerToStageTo().
 //                                      display_name setControllerToStageTo
 //                                      signature_documentation java protected void setControllerToStageTo(EpoxyModel<?> model, T controller)
+//                                      kind Method
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                    ^^^^^ definition local 4
 //                                                          display_name model
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
index 63d644231..85e4cb397 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
@@ -33,15 +33,18 @@ class ControllerHelperLookup {
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#
 //                           display_name ControllerHelperLookup
 //                           signature_documentation java class ControllerHelperLookup
+//                           kind Class
 //                           documentation  Looks up a generated {@link ControllerHelper} implementation for a given adapter.\n If the adapter has no {@link com.airbnb.epoxy.AutoModel} models then a No-Op implementation will\n be returned.\n
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#`<init>`().
 //                           display_name <init>
 //                           signature_documentation java ControllerHelperLookup()
+//                           kind Constructor
   private static final String GENERATED_HELPER_CLASS_SUFFIX = "_EpoxyHelper";
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#GENERATED_HELPER_CLASS_SUFFIX.
 //                                                          display_name GENERATED_HELPER_CLASS_SUFFIX
 //                                                          signature_documentation java private static final String GENERATED_HELPER_CLASS_SUFFIX
+//                                                          kind StaticField
   private static final Map<Class<?>, Constructor<?>> BINDINGS = new LinkedHashMap<>();
 //                     ^^^ reference semanticdb maven jdk 11 java/util/Map#
 //                         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
@@ -49,12 +52,14 @@ class ControllerHelperLookup {
 //                                                   ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#BINDINGS.
 //                                                            display_name BINDINGS
 //                                                            signature_documentation java private static final Map<Class<?>, Constructor<?>> BINDINGS
+//                                                            kind StaticField
 //                                                                  ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/LinkedHashMap#`<init>`(+2).
   private static final NoOpControllerHelper NO_OP_CONTROLLER_HELPER = new NoOpControllerHelper();
 //                     ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#
 //                                          ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#NO_OP_CONTROLLER_HELPER.
 //                                                                  display_name NO_OP_CONTROLLER_HELPER
 //                                                                  signature_documentation java private static final NoOpControllerHelper NO_OP_CONTROLLER_HELPER
+//                                                                  kind StaticField
 //                                                                        ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#`<init>`().
 
   static ControllerHelper getHelperForController(EpoxyController controller) {
@@ -62,6 +67,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //                        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
 //                                               display_name getHelperForController
 //                                               signature_documentation java static ControllerHelper getHelperForController(EpoxyController controller)
+//                                               kind StaticMethod
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                               ^^^^^^^^^^ definition local 0
 //                                                                          display_name controller
@@ -149,6 +155,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //                              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                                                      display_name findConstructorForClass
 //                                                      signature_documentation java @Nullable\nprivate static Constructor<?> findConstructorForClass(Class<?> controllerClass)
+//                                                      kind StaticMethod
 //                                                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                               ^^^^^^^^^^^^^^^ definition local 6
 //                                                                               display_name controllerClass
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
index 48f897253..484de1852 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
@@ -11,6 +11,7 @@ class ControllerModelList extends ModelList {
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
 //                        display_name ControllerModelList
 //                        signature_documentation java class ControllerModelList
+//                        kind Class
 //                        documentation  This ArrayList subclass enforces that no changes are made to the list after {@link #freeze()} is\n called. This prevents model interceptors from storing the list and trying to change it later. We\n could copy the list before diffing, but that would waste memory to make the copy for every\n buildModels cycle, plus the interceptors could still try to modify the list and be confused about\n why it doesn't do anything.\n
 //                        relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#
 //                        relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
@@ -29,6 +30,7 @@ class ControllerModelList extends ModelList {
 //                                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#OBSERVER.
 //                                                display_name OBSERVER
 //                                                signature_documentation java private static final ModelListObserver OBSERVER
+//                                                kind StaticField
 //                                                      ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -37,6 +39,7 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 //                                  display_name onItemRangeInserted
 //                                  signature_documentation java @Override\npublic void onItemRangeInserted(int positionStart, int itemCount)
 //                                  enclosing_symbol local 0
+//                                  kind Method
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
 //                                      ^^^^^^^^^^^^^ definition local 2
 //                                                    display_name positionStart
@@ -58,6 +61,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 //                                 display_name onItemRangeRemoved
 //                                 signature_documentation java @Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)
 //                                 enclosing_symbol local 0
+//                                 kind Method
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
 //                                     ^^^^^^^^^^^^^ definition local 5
 //                                                   display_name positionStart
@@ -77,6 +81,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 //^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#`<init>`().
 //                    display_name <init>
 //                    signature_documentation java ControllerModelList(int expectedModelCount)
+//                    kind Constructor
 //                        ^^^^^^^^^^^^^^^^^^ definition local 7
 //                                           display_name expectedModelCount
 //                                           signature_documentation java int expectedModelCount
@@ -92,6 +97,7 @@ void freeze() {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ControllerModelList#freeze().
 //            display_name freeze
 //            signature_documentation java void freeze()
+//            kind Method
     setObserver(OBSERVER);
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#setObserver().
 //              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerModelList#OBSERVER.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
index a57a94fc0..44e71d407 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
@@ -9,6 +9,7 @@ class DebugTimer implements Timer {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#
 //               display_name DebugTimer
 //               signature_documentation java class DebugTimer
+//               kind Class
 //               relationship is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#
 //                          ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
 
@@ -17,20 +18,24 @@ class DebugTimer implements Timer {
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#tag.
 //                         display_name tag
 //                         signature_documentation java private final String tag
+//                         kind Field
   private long startTime;
 //             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
 //                       display_name startTime
 //                       signature_documentation java private long startTime
+//                       kind Field
   private String sectionName;
 //        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#sectionName.
 //                           display_name sectionName
 //                           signature_documentation java private String sectionName
+//                           kind Field
 
   DebugTimer(String tag) {
 //^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#`<init>`().
 //           display_name <init>
 //           signature_documentation java DebugTimer(String tag)
+//           kind Constructor
 //           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                  ^^^ definition local 0
 //                      display_name tag
@@ -47,6 +52,7 @@ private void reset() {
 //             ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#reset().
 //                   display_name reset
 //                   signature_documentation java private void reset()
+//                   kind Method
     startTime = -1;
 //  ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
     sectionName = null;
@@ -59,6 +65,7 @@ public void start(String sectionName) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#start().
 //                  display_name start
 //                  signature_documentation java @Override\npublic void start(String sectionName)
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#start().
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                         ^^^^^^^^^^^ definition local 1
@@ -86,6 +93,7 @@ public void stop() {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DebugTimer#stop().
 //                 display_name stop
 //                 signature_documentation java @Override\npublic void stop()
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#stop().
     if (startTime == -1) {
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
index a226c8b73..ec922cddb 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
@@ -39,6 +39,7 @@ class DiffHelper {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#
 //               display_name DiffHelper
 //               signature_documentation java class DiffHelper
+//               kind Class
 //               documentation  Helper to track changes in the models list.\n
   private ArrayList<ModelState> oldStateList = new ArrayList<>();
 //        ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
@@ -46,6 +47,7 @@ class DiffHelper {
 //                              ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                           display_name oldStateList
 //                                           signature_documentation java private ArrayList<ModelState> oldStateList
+//                                           kind Field
 //                                                 ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   // Using a HashMap instead of a LongSparseArray to
   // have faster look up times at the expense of memory
@@ -56,6 +58,7 @@ class DiffHelper {
 //                              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
 //                                          display_name oldStateMap
 //                                          signature_documentation java private Map<Long, ModelState> oldStateMap
+//                                          kind Field
 //                                                ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   private ArrayList<ModelState> currentStateList = new ArrayList<>();
 //        ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
@@ -63,6 +66,7 @@ class DiffHelper {
 //                              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
 //                                               display_name currentStateList
 //                                               signature_documentation java private ArrayList<ModelState> currentStateList
+//                                               kind Field
 //                                                     ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   private Map<Long, ModelState> currentStateMap = new HashMap<>();
 //        ^^^ reference semanticdb maven jdk 11 java/util/Map#
@@ -71,22 +75,26 @@ class DiffHelper {
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateMap.
 //                                              display_name currentStateMap
 //                                              signature_documentation java private Map<Long, ModelState> currentStateMap
+//                                              kind Field
 //                                                    ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   private final BaseEpoxyAdapter adapter;
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                       display_name adapter
 //                                       signature_documentation java private final BaseEpoxyAdapter adapter
+//                                       kind Field
   private final boolean immutableModels;
 //                      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#immutableModels.
 //                                      display_name immutableModels
 //                                      signature_documentation java private final boolean immutableModels
+//                                      kind Field
 
 
   DiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels) {
 //^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#`<init>`().
 //           display_name <init>
 //           signature_documentation java DiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels)
+//           kind Constructor
 //           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                            ^^^^^^^ definition local 0
 //                                    display_name adapter
@@ -114,6 +122,7 @@ class DiffHelper {
 //                                               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#observer.
 //                                                        display_name observer
 //                                                        signature_documentation java private final unresolved_type observer
+//                                                        kind Field
 //                                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
 //                                                                           ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/AdapterDataObserver#
     @Override
@@ -216,6 +225,7 @@ void notifyModelChanges() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyModelChanges().
 //                        display_name notifyModelChanges
 //                        signature_documentation java void notifyModelChanges()
+//                        kind Method
 //                        documentation  Set the current list of models. The diff callbacks will be notified of the changes between the\n current list and the last list that was set.\n
     UpdateOpHelper updateOpHelper = new UpdateOpHelper();
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
@@ -248,6 +258,7 @@ private void notifyChanges(UpdateOpHelper opHelper) {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyChanges().
 //                           display_name notifyChanges
 //                           signature_documentation java private void notifyChanges(UpdateOpHelper opHelper)
+//                           kind Method
 //                           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                          ^^^^^^^^ definition local 3
 //                                                   display_name opHelper
@@ -343,6 +354,7 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
 //                       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#buildDiff().
 //                                 display_name buildDiff
 //                                 signature_documentation java private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper)
+//                                 kind Method
 //                                 documentation  Create a list of operations that define the difference between {@link #oldStateList} and {@link\n #currentStateList}.\n
 //                                 ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                                ^^^^^^^^^^^^^^ definition local 5
@@ -399,6 +411,7 @@ private void resetOldState() {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#resetOldState().
 //                           display_name resetOldState
 //                           signature_documentation java private void resetOldState()
+//                           kind Method
     oldStateList.clear();
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //               ^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#clear().
@@ -411,6 +424,7 @@ private void prepareStateForDiff() {
 //             ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
 //                                 display_name prepareStateForDiff
 //                                 signature_documentation java private void prepareStateForDiff()
+//                                 kind Method
     // We use a list of the models as well as a map by their id,
     // so we can easily find them by both position and id
 
@@ -501,6 +515,7 @@ private ModelState createStateForPosition(int position) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
 //                                          display_name createStateForPosition
 //                                          signature_documentation java private ModelState createStateForPosition(int position)
+//                                          kind Method
 //                                              ^^^^^^^^ definition local 12
 //                                                       display_name position
 //                                                       signature_documentation java int position
@@ -583,6 +598,7 @@ private void collectRemovals(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectRemovals().
 //                             display_name collectRemovals
 //                             signature_documentation java private void collectRemovals(UpdateOpHelper helper)
+//                             kind Method
 //                             documentation  Find all removal operations and add them to the result list. The general strategy here is to\n walk through the {@link #oldStateList} and check for items that don't exist in the new list.\n Walking through it in order makes it easy to batch adjacent removals.\n
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                            ^^^^^^ definition local 18
@@ -642,6 +658,7 @@ private void collectInsertions(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
 //                               display_name collectInsertions
 //                               signature_documentation java private void collectInsertions(UpdateOpHelper helper)
+//                               kind Method
 //                               documentation  Find all insertion operations and add them to the result list. The general strategy here is to\n walk through the {@link #currentStateList} and check for items that don't exist in the old\n list. Walking through it in order makes it easy to batch adjacent insertions.\n
 //                               ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                              ^^^^^^ definition local 20
@@ -703,6 +720,7 @@ private void collectChanges(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
 //                            display_name collectChanges
 //                            signature_documentation java private void collectChanges(UpdateOpHelper helper)
+//                            kind Method
 //                            documentation  Check if any items have had their values changed, batching if possible.\n
 //                            ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                           ^^^^^^ definition local 24
@@ -790,6 +808,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
 //                          display_name collectMoves
 //                          signature_documentation java private void collectMoves(UpdateOpHelper helper)
+//                          kind Method
 //                          documentation  Check which items have had a position changed. Recyclerview does not support batching these.\n
 //                          ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                                         ^^^^^^ definition local 28
@@ -1000,6 +1019,7 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //             ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
 //                                display_name updateItemPosition
 //                                signature_documentation java private void updateItemPosition(ModelState item, List<UpdateOp> moveOps)
+//                                kind Method
 //                                documentation  Apply the movement operations to the given item to update its position. Only applies the\n operations that have not been applied yet, and stores how many operations have been applied so\n we know which ones to apply next time.\n
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                           ^^^^ definition local 34
@@ -1093,6 +1113,7 @@ private ModelState getNextItemWithPair(Iterator<ModelState> iterator) {
 //                   ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
 //                                       display_name getNextItemWithPair
 //                                       signature_documentation java @Nullable\nprivate ModelState getNextItemWithPair(Iterator<ModelState> iterator)
+//                                       kind Method
 //                                       documentation  Gets the next item in the list that has a pair, meaning it wasn't inserted or removed.\n
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
index f76e6a503..e1f3b96da 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
@@ -32,23 +32,27 @@ public class DiffPayload {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                       display_name DiffPayload
 //                       signature_documentation java public class DiffPayload
+//                       kind Class
 //                       documentation  A helper class for tracking changed models found by the {@link com.airbnb.epoxy.DiffHelper} to\n be included as a payload in the\n {@link androidx.recyclerview.widget.RecyclerView.Adapter#notifyItemChanged(int, Object)}\n call.\n
   private final EpoxyModel<?> singleModel;
 //              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#singleModel.
 //                                        display_name singleModel
 //                                        signature_documentation java private final EpoxyModel<?> singleModel
+//                                        kind Field
   private final LongSparseArray<EpoxyModel<?>> modelsById;
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                                        display_name modelsById
 //                                                        signature_documentation java private final LongSparseArray<EpoxyModel<?>> modelsById
+//                                                        kind Field
 
   DiffPayload(List<? extends EpoxyModel<?>> models) {
 //^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
 //            display_name <init>
 //            signature_documentation java DiffPayload(List<? extends EpoxyModel<?>> models)
+//            kind Constructor
 //            ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^^ definition local 0
@@ -107,6 +111,7 @@ public DiffPayload(EpoxyModel<?> changedItem) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`(+1).
 //                   display_name <init>
 //                   signature_documentation java public DiffPayload(EpoxyModel<?> changedItem)
+//                   kind Constructor
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                 ^^^^^^^^^^^ definition local 3
 //                                             display_name changedItem
@@ -131,6 +136,7 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //                            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
 //                                                display_name getModelFromPayload
 //                                                signature_documentation java @Nullable\npublic static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long modelId)
+//                                                kind StaticMethod
 //                                                documentation  Looks through the payloads list and returns the first model found with the given model id. This\n assumes that the payloads list will only contain objects of type {@link DiffPayload}, and will\n throw if an unexpected type is found.\n
 //                                                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
@@ -204,6 +210,7 @@ boolean equalsForTesting(DiffPayload that) {
 //        ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
 //                         display_name equalsForTesting
 //                         signature_documentation java @VisibleForTesting\nboolean equalsForTesting(DiffPayload that)
+//                         kind Method
 //                         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                                     ^^^^ definition local 9
 //                                          display_name that
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
index 34e7449b5..b938de647 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
@@ -46,6 +46,7 @@ public class DiffResult {
 //           ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#
 //                      display_name DiffResult
 //                      signature_documentation java public class DiffResult
+//                      kind Class
 //                      documentation  Wraps the result of {@link AsyncEpoxyDiffer#submitList(List)}.\n
   @NonNull final List<? extends EpoxyModel<?>> previousModels;
 // ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -54,6 +55,7 @@ public class DiffResult {
 //                                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#previousModels.
 //                                                            display_name previousModels
 //                                                            signature_documentation java @NonNull\nfinal List<? extends EpoxyModel<?>> previousModels
+//                                                            kind Field
   @NonNull final List<? extends EpoxyModel<?>> newModels;
 // ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -61,6 +63,7 @@ public class DiffResult {
 //                                             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#newModels.
 //                                                       display_name newModels
 //                                                       signature_documentation java @NonNull\nfinal List<? extends EpoxyModel<?>> newModels
+//                                                       kind Field
 
   /**
    * If this is non null it means the full differ ran and the result is contained
@@ -74,6 +77,7 @@ public class DiffResult {
 //                                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#differResult.
 //                                                 display_name differResult
 //                                                 signature_documentation java @Nullable\nfinal unresolved_type differResult
+//                                                 kind Field
 //                                                 documentation  If this is non null it means the full differ ran and the result is contained\n in this object. If it is null, it means that either the old list or the new list was empty, so\n we can simply add all or clear all items and skipped running the full diffing.\n
 
   /** No changes were made to the models. */
@@ -82,6 +86,7 @@ static DiffResult noOp(@Nullable List<? extends EpoxyModel<?>> models) {
 //                  ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#noOp().
 //                       display_name noOp
 //                       signature_documentation java static DiffResult noOp(List<? extends EpoxyModel<?>> models)
+//                       kind StaticMethod
 //                       documentation No changes were made to the models. 
 //                        ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -109,6 +114,7 @@ static DiffResult inserted(@NonNull List<? extends EpoxyModel<?>> newModels) {
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#inserted().
 //                           display_name inserted
 //                           signature_documentation java static DiffResult inserted(List<? extends EpoxyModel<?>> newModels)
+//                           kind StaticMethod
 //                           documentation The previous list was empty and the given non empty list was inserted. 
 //                            ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -131,6 +137,7 @@ static DiffResult clear(@NonNull List<? extends EpoxyModel<?>> previousModels) {
 //                  ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#clear().
 //                        display_name clear
 //                        signature_documentation java static DiffResult clear(List<? extends EpoxyModel<?>> previousModels)
+//                        kind StaticMethod
 //                        documentation The previous list was non empty and the new list is empty. 
 //                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -156,6 +163,7 @@ static DiffResult diff(
 //                  ^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#diff().
 //                       display_name diff
 //                       signature_documentation java static DiffResult diff(List<? extends EpoxyModel<?>> previousModels, List<? extends EpoxyModel<?>> newModels, unresolved_type differResult)
+//                       kind StaticMethod
 //                       documentation  The previous and new models are both non empty and a full differ pass was run on them.\n There may be no changes, however.\n
       @NonNull List<? extends EpoxyModel<?>> previousModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -193,6 +201,7 @@ private DiffResult(
 //        ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#`<init>`().
 //                   display_name <init>
 //                   signature_documentation java private DiffResult(List<? extends EpoxyModel<?>> previousModels, List<? extends EpoxyModel<?>> newModels, unresolved_type differResult)
+//                   kind Constructor
       @NonNull List<? extends EpoxyModel<?>> previousModels,
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //             ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -233,6 +242,7 @@ public void dispatchTo(Adapter adapter) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo().
 //                       display_name dispatchTo
 //                       signature_documentation java public void dispatchTo(unresolved_type adapter)
+//                       kind Method
 //                       ^^^^^^^ reference semanticdb maven . . Adapter#
 //                               ^^^^^^^ definition local 9
 //                                       display_name adapter
@@ -247,6 +257,7 @@ public void dispatchTo(ListUpdateCallback callback) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/DiffResult#dispatchTo(+1).
 //                       display_name dispatchTo
 //                       signature_documentation java public void dispatchTo(unresolved_type callback)
+//                       kind Method
 //                       ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . ListUpdateCallback#
 //                                          ^^^^^^^^ definition local 10
 //                                                   display_name callback
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
index 40cdd8a0b..ef10b2763 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
@@ -38,6 +38,7 @@ public abstract class EpoxyAdapter extends BaseEpoxyAdapter {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#
 //                                 display_name EpoxyAdapter
 //                                 signature_documentation java @SuppressWarnings("WeakerAccess")\npublic abstract class EpoxyAdapter
+//                                 kind Class
 //                                 documentation  Allows you to easily combine different view types in the same adapter, and handles view holder\n creation, binding, and ids for you. Subclasses just need to add their desired {@link EpoxyModel}\n objects and the rest is done automatically.\n <p/>\n {@link androidx.recyclerview.widget.RecyclerView.Adapter#setHasStableIds(boolean)} is set to true\n by default, since {@link EpoxyModel} makes it easy to support unique ids. If you don't want to\n support this then disable it in your base class (not recommended).\n
 //                                 relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                 relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -45,12 +46,14 @@ public abstract class EpoxyAdapter extends BaseEpoxyAdapter {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#`<init>`().
 //                                 display_name <init>
 //                                 signature_documentation java public EpoxyAdapter()
+//                                 kind Constructor
 //                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
   private final HiddenEpoxyModel hiddenModel = new HiddenEpoxyModel();
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#
 //                               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hiddenModel.
 //                                           display_name hiddenModel
 //                                           signature_documentation java private final HiddenEpoxyModel hiddenModel
+//                                           kind Field
 //                                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
 
   /**
@@ -63,6 +66,7 @@ public abstract class EpoxyAdapter extends BaseEpoxyAdapter {
 //                                    ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                           display_name models
 //                                           signature_documentation java protected final List<EpoxyModel<?>> models
+//                                           kind Field
 //                                           documentation  Subclasses should modify this list as necessary with the models they want to show. Subclasses\n are responsible for notifying data changes whenever this list is changed.\n
 //                                                 ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`(+1).
   private DiffHelper diffHelper;
@@ -70,6 +74,7 @@ public abstract class EpoxyAdapter extends BaseEpoxyAdapter {
 //                   ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#diffHelper.
 //                              display_name diffHelper
 //                              signature_documentation java private DiffHelper diffHelper
+//                              kind Field
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -79,6 +84,7 @@ List<EpoxyModel<?>> getCurrentModels() {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getCurrentModels().
 //                                     display_name getCurrentModels
 //                                     signature_documentation java @Override\nList<EpoxyModel<?>> getCurrentModels()
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
     return models;
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
@@ -94,6 +100,7 @@ protected void enableDiffing() {
 //               ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#enableDiffing().
 //                             display_name enableDiffing
 //                             signature_documentation java protected void enableDiffing()
+//                             kind Method
 //                             documentation  Enables support for automatically notifying model changes via {@link #notifyModelsChanged()}.\n If used, this should be called in the constructor, before any models are changed.\n\n @see #notifyModelsChanged()\n
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#enableDiffing().
     if (diffHelper != null) {
@@ -127,6 +134,7 @@ EpoxyModel<?> getModelForPosition(int position) {
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
 //                                  display_name getModelForPosition
 //                                  signature_documentation java @Override\nEpoxyModel<?> getModelForPosition(int position)
+//                                  kind Method
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                      ^^^^^^^^ definition local 0
 //                                               display_name position
@@ -165,6 +173,7 @@ protected void notifyModelsChanged() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelsChanged().
 //                                   display_name notifyModelsChanged
 //                                   signature_documentation java protected void notifyModelsChanged()
+//                                   kind Method
 //                                   documentation  Intelligently notify item changes by comparing the current {@link #models} list against the\n previous so you don't have to micromanage notification calls yourself. This may be\n prohibitively slow for large model lists (in the hundreds), in which case consider doing\n notification calls yourself. If you use this, all your view models must implement {@link\n EpoxyModel#hashCode()} and {@link EpoxyModel#equals(Object)} to completely identify their\n state, so that changes to a model's content can be detected. Before using this you must enable\n it with {@link #enableDiffing()}, since keeping track of the model state adds extra computation\n time to all other data change notifications.\n\n @see #enableDiffing()\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelsChanged().
     if (diffHelper == null) {
@@ -186,6 +195,7 @@ protected void notifyModelChanged(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
 //                                  display_name notifyModelChanged
 //                                  signature_documentation java protected void notifyModelChanged(EpoxyModel<?> model)
+//                                  kind Method
 //                                  documentation  Notify that the given model has had its data changed. It should only be called if the model\n retained the same position.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged().
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -206,6 +216,7 @@ protected void notifyModelChanged(EpoxyModel<?> model, @Nullable Object payload)
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
 //                                  display_name notifyModelChanged
 //                                  signature_documentation java protected void notifyModelChanged(EpoxyModel<?> model, Object payload)
+//                                  kind Method
 //                                  documentation  Notify that the given model has had its data changed. It should only be called if the model\n retained the same position.\n
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^ definition local 3
@@ -241,6 +252,7 @@ protected void addModel(EpoxyModel<?> modelToAdd) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModel().
 //                        display_name addModel
 //                        signature_documentation java protected void addModel(EpoxyModel<?> modelToAdd)
+//                        kind Method
 //                        documentation  Adds the model to the end of the {@link #models} list and notifies that the item was inserted.\n
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^^^^^^ definition local 6
@@ -277,6 +289,7 @@ protected void addModels(EpoxyModel<?>... modelsToAdd) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
 //                         display_name addModels
 //                         signature_documentation java protected void addModels(EpoxyModel<?>[] modelsToAdd)
+//                         kind Method
 //                         documentation  Adds the models to the end of the {@link #models} list and notifies that the items were\n inserted.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -330,6 +343,7 @@ protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
 //                         display_name addModels
 //                         signature_documentation java protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd)
+//                         kind Method
 //                         documentation  Adds the models to the end of the {@link #models} list and notifies that the items were\n inserted.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1).
 //                         ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
@@ -370,6 +384,7 @@ protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> mode
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
 //                                 display_name insertModelBefore
 //                                 signature_documentation java protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore)
+//                                 kind Method
 //                                 documentation  Inserts the given model before the other in the {@link #models} list, and notifies that the\n item was inserted.\n
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore().
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -419,6 +434,7 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
 //                                display_name insertModelAfter
 //                                signature_documentation java protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter)
+//                                kind Method
 //                                documentation  Inserts the given model after the other in the {@link #models} list, and notifies that the item\n was inserted.\n
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter().
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -474,6 +490,7 @@ protected void removeModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
 //                           display_name removeModel
 //                           signature_documentation java protected void removeModel(EpoxyModel<?> model)
+//                           kind Method
 //                           documentation  If the given model exists it is removed and an item removal is notified. Otherwise this does\n nothing.\n
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel().
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -512,6 +529,7 @@ protected void removeAllModels() {
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllModels().
 //                               display_name removeAllModels
 //                               signature_documentation java protected void removeAllModels()
+//                               kind Method
 //                               documentation  Removes all models\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllModels().
     int numModelsRemoved = models.size();
@@ -544,6 +562,7 @@ protected void removeAllAfterModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
 //                                   display_name removeAllAfterModel
 //                                   signature_documentation java protected void removeAllAfterModel(EpoxyModel<?> model)
+//                                   kind Method
 //                                   documentation  Removes all models after the given model, which must have already been added. An example use\n case is you want to keep a header but clear everything else, like in the case of refreshing\n data.\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel().
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -602,6 +621,7 @@ protected void showModel(EpoxyModel<?> model, boolean show) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //                         display_name showModel
 //                         signature_documentation java protected void showModel(EpoxyModel<?> model, boolean show)
+//                         kind Method
 //                         documentation  Sets the visibility of the given model, and notifies that the item changed if the new\n visibility is different from the previous.\n\n @param model The model to show. It should already be added to the {@link #models} list.\n @param show  True to show the model, false to hide it.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -638,6 +658,7 @@ protected void showModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
 //                         display_name showModel
 //                         signature_documentation java protected void showModel(EpoxyModel<?> model)
+//                         kind Method
 //                         documentation  Shows the given model, and notifies that the item changed if the item wasn't already shown.\n\n @param model The model to show. It should already be added to the {@link #models} list.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1).
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -659,6 +680,7 @@ protected void showModels(EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
 //                          display_name showModels
 //                          signature_documentation java protected void showModels(EpoxyModel<?>[] models)
+//                          kind Method
 //                          documentation  Shows the given models, and notifies that each item changed if the item wasn't already shown.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels().
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -684,6 +706,7 @@ protected void showModels(boolean show, EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
 //                          display_name showModels
 //                          signature_documentation java protected void showModels(boolean show, EpoxyModel<?>[] models)
+//                          kind Method
 //                          documentation  Sets the visibility of the given models, and notifies that the items changed if the new\n visibility is different from the previous.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n @param show   True to show the models, false to hide them.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1).
 //                                  ^^^^ definition local 31
@@ -712,6 +735,7 @@ protected void showModels(Iterable<EpoxyModel<?>> models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
 //                          display_name showModels
 //                          signature_documentation java protected void showModels(Iterable<EpoxyModel<?>> models)
+//                          kind Method
 //                          documentation  Shows the given models, and notifies that each item changed if the item wasn't already shown.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2).
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
@@ -736,6 +760,7 @@ protected void showModels(Iterable<EpoxyModel<?>> models, boolean show) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //                          display_name showModels
 //                          signature_documentation java protected void showModels(Iterable<EpoxyModel<?>> models, boolean show)
+//                          kind Method
 //                          documentation  Sets the visibility of the given models, and notifies that the items changed if the new\n visibility is different from the previous.\n\n @param models The models to show. They should already be added to the {@link #models} list.\n @param show   True to show the models, false to hide them.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3).
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
@@ -771,6 +796,7 @@ protected void hideModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
 //                         display_name hideModel
 //                         signature_documentation java protected void hideModel(EpoxyModel<?> model)
+//                         kind Method
 //                         documentation  Hides the given model, and notifies that the item changed if the item wasn't already hidden.\n\n @param model The model to hide. This should already be added to the {@link #models} list.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel().
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -792,6 +818,7 @@ protected void hideModels(Iterable<EpoxyModel<?>> models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //                          display_name hideModels
 //                          signature_documentation java protected void hideModels(Iterable<EpoxyModel<?>> models)
+//                          kind Method
 //                          documentation  Hides the given models, and notifies that each item changed if the item wasn't already hidden.\n\n @param models The models to hide. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels().
 //                          ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
@@ -814,6 +841,7 @@ protected void hideModels(EpoxyModel<?>... models) {
 //               ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
 //                          display_name hideModels
 //                          signature_documentation java protected void hideModels(EpoxyModel<?>[] models)
+//                          kind Method
 //                          documentation  Hides the given models, and notifies that each item changed if the item wasn't already hidden.\n\n @param models The models to hide. They should already be added to the {@link #models} list.\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1).
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -837,6 +865,7 @@ protected void hideAllAfterModel(EpoxyModel<?> model) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
 //                                 display_name hideAllAfterModel
 //                                 signature_documentation java protected void hideAllAfterModel(EpoxyModel<?> model)
+//                                 kind Method
 //                                 documentation  Hides all models currently located after the given model in the {@link #models} list.\n\n @param model The model after which to hide. It must exist in the {@link #models} list.\n
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel().
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -863,6 +892,7 @@ protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //                              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                                display_name getAllModelsAfter
 //                                                signature_documentation java protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model)
+//                                                kind Method
 //                                                documentation  Returns a sub list of all items in {@link #models} that occur after the given model. This list\n is backed by the original models list, any changes to the returned list will be reflected in\n the original {@link #models} list.\n\n @param model Must exist in {@link #models}.\n
 //                                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter().
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -900,6 +930,7 @@ private void pauseModelListNotifications() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#pauseModelListNotifications().
 //                                         display_name pauseModelListNotifications
 //                                         signature_documentation java private void pauseModelListNotifications()
+//                                         kind Method
 //                                         documentation  We pause the list's notifications when we modify models internally, since we already do the\n proper adapter notifications for those modifications. By pausing these list notifications we\n prevent the differ having to do work to track them.\n
     ((ModelList) models).pauseNotifications();
 //    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
@@ -911,6 +942,7 @@ private void resumeModelListNotifications() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#resumeModelListNotifications().
 //                                          display_name resumeModelListNotifications
 //                                          signature_documentation java private void resumeModelListNotifications()
+//                                          kind Method
     ((ModelList) models).resumeNotifications();
 //    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
index f776dac82..996c80779 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
@@ -38,11 +38,13 @@ public final class EpoxyAsyncUtil {
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#
 //                                display_name EpoxyAsyncUtil
 //                                signature_documentation java public final class EpoxyAsyncUtil
+//                                kind Class
 //                                documentation  Various helpers for running Epoxy operations off the main thread.\n
   private EpoxyAsyncUtil() {
 //        ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java private EpoxyAsyncUtil()
+//                       kind Constructor
   }
 
   /**
@@ -53,6 +55,7 @@ private EpoxyAsyncUtil() {
 //                            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#MAIN_THREAD_HANDLER.
 //                                                display_name MAIN_THREAD_HANDLER
 //                                                signature_documentation java public static final unresolved_type MAIN_THREAD_HANDLER
+//                                                kind StaticField
 //                                                documentation  A Handler class that uses the main thread's Looper.\n
       createHandler(Looper.getMainLooper(), false);
 //    ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
@@ -69,6 +72,7 @@ private EpoxyAsyncUtil() {
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#AYSNC_MAIN_THREAD_HANDLER.
 //                                                      display_name AYSNC_MAIN_THREAD_HANDLER
 //                                                      signature_documentation java public static final unresolved_type AYSNC_MAIN_THREAD_HANDLER
+//                                                      kind StaticField
 //                                                      documentation  A Handler class that uses the main thread's Looper. Additionally, this handler calls\n {@link Message#setAsynchronous(boolean)} for\n each {@link Message} that is sent to it or {@link Runnable} that is posted to it\n
       createHandler(Looper.getMainLooper(), true);
 //    ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
@@ -80,6 +84,7 @@ private EpoxyAsyncUtil() {
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#asyncBackgroundHandler.
 //                                              display_name asyncBackgroundHandler
 //                                              signature_documentation java private static unresolved_type asyncBackgroundHandler
+//                                              kind StaticField
 
   /**
    * A Handler class that uses a separate background thread dedicated to Epoxy. Additionally,
@@ -93,6 +98,7 @@ public static Handler getAsyncBackgroundHandler() {
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#getAsyncBackgroundHandler().
 //                                                display_name getAsyncBackgroundHandler
 //                                                signature_documentation java @MainThread\npublic static unresolved_type getAsyncBackgroundHandler()
+//                                                kind StaticMethod
 //                                                documentation  A Handler class that uses a separate background thread dedicated to Epoxy. Additionally,\n this handler calls {@link Message#setAsynchronous(boolean)} for\n each {@link Message} that is sent to it or {@link Runnable} that is posted to it\n
     // This is initialized lazily so we don't create the thread unless it will be used.
     // It isn't synchronized so it should only be accessed on the main thread.
@@ -119,6 +125,7 @@ public static Handler createHandler(Looper looper, boolean async) {
 //                      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#createHandler().
 //                                    display_name createHandler
 //                                    signature_documentation java public static unresolved_type createHandler(unresolved_type looper, boolean async)
+//                                    kind StaticMethod
 //                                    documentation  Create a Handler with the given Looper\n\n @param async If true the Handler will calls {@link Message#setAsynchronous(boolean)} for\n              each {@link Message} that is sent to it or {@link Runnable} that is posted to it.\n
 //                                    ^^^^^^ reference semanticdb maven . . Looper#
 //                                           ^^^^^^ definition local 0
@@ -186,6 +193,7 @@ public static Looper buildBackgroundLooper(String threadName) {
 //                     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#buildBackgroundLooper().
 //                                           display_name buildBackgroundLooper
 //                                           signature_documentation java public static unresolved_type buildBackgroundLooper(String threadName)
+//                                           kind StaticMethod
 //                                           documentation  Create a new looper that runs on a new background thread.\n
 //                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                                  ^^^^^^^^^^ definition local 3
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
index a5e1095bc..6918e374e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
@@ -115,6 +115,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                    display_name EpoxyController
 //                                    signature_documentation java public abstract class EpoxyController
+//                                    kind Class
 //                                    documentation  A controller for easily combining {@link EpoxyModel} instances in a {@link RecyclerView.Adapter}.\n Simply implement {@link #buildModels()} to declare which models should be used, and in which\n order. Call {@link #requestModelBuild()} whenever your data changes, and the controller will call\n {@link #buildModels()}, update the adapter with the new models, and notify any changes between\n the new and old models.\n <p>\n The controller maintains a {@link androidx.recyclerview.widget.RecyclerView.Adapter} with the\n latest models, which you can get via {@link #getAdapter()} to set on your RecyclerView.\n <p>\n All data change notifications are applied automatically via Epoxy's diffing algorithm. All of\n your models must have a unique id set on them for diffing to work. You may choose to use {@link\n AutoModel} annotations to have the controller create models with unique ids for you\n automatically.\n <p>\n Once a model is created and added to the controller in {@link #buildModels()} it should be\n treated as immutable and never modified again. This is necessary for adapter updates to be\n accurate.\n
 //                                    relationship is_implementation semanticdb maven . . ModelCollector#
 //                                    relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -132,12 +133,14 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#DELAY_TO_CHECK_ADAPTER_COUNT_MS.
 //                                                         display_name DELAY_TO_CHECK_ADAPTER_COUNT_MS
 //                                                         signature_documentation java private static final int DELAY_TO_CHECK_ADAPTER_COUNT_MS
+//                                                         kind StaticField
 //                                                         documentation  We check that the adapter is not connected to multiple recyclerviews, but when a fragment has\n its view quickly destroyed and recreated it may temporarily attach the same adapter to the\n previous view and the new view (eg because of fragment transitions) if the controller is reused\n across views. We want to allow this case since it is a brief transient state. This should be\n enough time for screen transitions to happen.\n
   private static final Timer NO_OP_TIMER = new NoOpTimer();
 //                     ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#NO_OP_TIMER.
 //                                       display_name NO_OP_TIMER
 //                                       signature_documentation java private static final Timer NO_OP_TIMER
+//                                       kind StaticField
 //                                             ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NoOpTimer#`<init>`().
 
   public static Handler defaultModelBuildingHandler = MainThreadExecutor.INSTANCE.handler;
@@ -145,6 +148,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#defaultModelBuildingHandler.
 //                                                  display_name defaultModelBuildingHandler
 //                                                  signature_documentation java public static unresolved_type defaultModelBuildingHandler
+//                                                  kind StaticField
 //                                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                                                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
 //                                                                                ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
@@ -153,6 +157,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                      ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#defaultDiffingHandler.
 //                                            display_name defaultDiffingHandler
 //                                            signature_documentation java public static unresolved_type defaultDiffingHandler
+//                                            kind StaticField
 //                                              ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                                                 ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
 //                                                                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
@@ -160,30 +165,36 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesDefault.
 //                                               display_name filterDuplicatesDefault
 //                                               signature_documentation java private static boolean filterDuplicatesDefault
+//                                               kind StaticField
   private static boolean globalDebugLoggingEnabled = false;
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalDebugLoggingEnabled.
 //                                                 display_name globalDebugLoggingEnabled
 //                                                 signature_documentation java private static boolean globalDebugLoggingEnabled
+//                                                 kind StaticField
 
   private final EpoxyControllerAdapter adapter;
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#
 //                                     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                                             display_name adapter
 //                                             signature_documentation java private final EpoxyControllerAdapter adapter
+//                                             kind Field
   private EpoxyDiffLogger debugObserver;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#
 //                        ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#debugObserver.
 //                                      display_name debugObserver
 //                                      signature_documentation java private EpoxyDiffLogger debugObserver
+//                                      kind Field
   private int recyclerViewAttachCount = 0;
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#recyclerViewAttachCount.
 //                                    display_name recyclerViewAttachCount
 //                                    signature_documentation java private int recyclerViewAttachCount
+//                                    kind Field
   private final Handler modelBuildHandler;
 //              ^^^^^^^ reference semanticdb maven . . Handler#
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelBuildHandler.
 //                                        display_name modelBuildHandler
 //                                        signature_documentation java private final unresolved_type modelBuildHandler
+//                                        kind Field
 
   /**
    * This is iterated over in the build models thread, but items can be inserted or removed from
@@ -195,6 +206,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
 //                                             display_name interceptors
 //                                             signature_documentation java private final List<Interceptor> interceptors
+//                                             kind Field
 //                                             documentation  This is iterated over in the build models thread, but items can be inserted or removed from\n other threads at any time.\n
 //                                                   ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/CopyOnWriteArrayList#`<init>`().
 
@@ -203,6 +215,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
 //                                          display_name filterDuplicates
 //                                          signature_documentation java private boolean filterDuplicates
+//                                          kind Field
 //                                            ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesDefault.
   /**
    * This is used to track whether we are currently building models. If it is non null it means
@@ -216,6 +229,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                        ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#threadBuildingModels.
 //                                             display_name threadBuildingModels
 //                                             signature_documentation java private Thread threadBuildingModels
+//                                             kind Field
 //                                             documentation  This is used to track whether we are currently building models. If it is non null it means\n a thread is in the building models method. We store the thread so we can know which one\n is building models.\n <p>\n Volatile because -> write only on handler, read from any thread\n
   /**
    * Used to know that we should build models synchronously the first time.
@@ -226,6 +240,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#hasBuiltModelsEver.
 //                                            display_name hasBuiltModelsEver
 //                                            signature_documentation java private boolean hasBuiltModelsEver
+//                                            kind Field
 //                                            documentation  Used to know that we should build models synchronously the first time.\n <p>\n Volatile because -> written from the build models thread, read from the main thread.\n
 
   //////////////////////////////////////////////////////////////////////////////////////////
@@ -241,6 +256,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
 //                    display_name timer
 //                    signature_documentation java private Timer timer
+//                    kind Field
 //                    documentation Used to time operations and log their duration when in debug mode. 
 //                      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#NO_OP_TIMER.
   private final ControllerHelper helper = getHelperForController(this);
@@ -248,23 +264,27 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#helper.
 //                                      display_name helper
 //                                      signature_documentation java private final ControllerHelper helper
+//                                      kind Field
 //                                        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
   private ControllerModelList modelsBeingBuilt;
 //        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
 //                            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                                             display_name modelsBeingBuilt
 //                                             signature_documentation java private ControllerModelList modelsBeingBuilt
+//                                             kind Field
   private List<ModelInterceptorCallback> modelInterceptorCallbacks;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
 //                                                                 display_name modelInterceptorCallbacks
 //                                                                 signature_documentation java private List<ModelInterceptorCallback> modelInterceptorCallbacks
+//                                                                 kind Field
   private EpoxyModel<?> stagedModel;
 //        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
 //                                  display_name stagedModel
 //                                  signature_documentation java private EpoxyModel<?> stagedModel
+//                                  kind Field
 
   //////////////////////////////////////////////////////////////////////////////////////////
 
@@ -272,6 +292,7 @@ public EpoxyController() {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java public EpoxyController()
+//                       kind Constructor
     this(defaultModelBuildingHandler, defaultDiffingHandler);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#defaultModelBuildingHandler.
@@ -282,6 +303,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#`<init>`(+1).
 //                       display_name <init>
 //                       signature_documentation java public EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
+//                       kind Constructor
 //                       ^^^^^^^ reference semanticdb maven . . Handler#
 //                               ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                    display_name modelBuildingHandler
@@ -316,6 +338,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //                                              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestedModelBuildType.
 //                                                                      display_name requestedModelBuildType
 //                                                                      signature_documentation java @RequestedModelBuildType\nprivate int requestedModelBuildType
+//                                                                      kind Field
 //                                                                      documentation  Posting and canceling runnables is a bit expensive - it is synchronizes and iterates the\n list of runnables. We want clients to be able to request model builds as often as they want and\n have it act as a no-op if one is already requested, without being a performance hit. To do that\n we track whether we have a call to build models posted already so we can avoid canceling a\n current call and posting it again.\n
       RequestedModelBuildType.NONE;
 //    ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
@@ -330,6 +353,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //         ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
 //                                 display_name RequestedModelBuildType
 //                                 signature_documentation java @Retention(RetentionPolicy.SOURCE)\n@IntDef({RequestedModelBuildType.NONE, RequestedModelBuildType.NEXT_FRAME, RequestedModelBuildType.DELAYED})\nprivate @interface RequestedModelBuildType
+//                                 kind Interface
 //                                 relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
 //                                 ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE.
@@ -344,17 +368,20 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //      ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE.
 //           display_name NONE
 //           signature_documentation java public static final int NONE
+//           kind StaticField
     /** A request has been made to build models immediately. It is posted. */
     int NEXT_FRAME = 1;
 //      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NEXT_FRAME.
 //                 display_name NEXT_FRAME
 //                 signature_documentation java public static final int NEXT_FRAME
+//                 kind StaticField
 //                 documentation A request has been made to build models immediately. It is posted. 
     /** A request has been made to build models after a delay. It is post delayed. */
     int DELAYED = 2;
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#DELAYED.
 //              display_name DELAYED
 //              signature_documentation java public static final int DELAYED
+//              kind StaticField
 //              documentation A request has been made to build models after a delay. It is post delayed. 
   }
 
@@ -375,6 +402,7 @@ public void requestModelBuild() {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
 //                              display_name requestModelBuild
 //                              signature_documentation java public void requestModelBuild()
+//                              kind Method
 //                              documentation  Call this to request a model update. The controller will schedule a call to {@link\n #buildModels()} so that models can be rebuilt for the current data. Once a build is requested\n all subsequent requests are ignored until the model build runs. Therefore, the calling code\n need not worry about calling this multiple times in a row.\n <p>\n The exception is that the first time this is called on a new instance of {@link\n EpoxyController} it is run synchronously. This allows state to be restored and the initial view\n to be draw quicker.\n <p>\n If you would like to be alerted when models have finished building use\n {@link #addModelBuildListener(OnModelBuildFinishedListener)}\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#requestModelBuild().
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestModelBuild().
@@ -412,6 +440,7 @@ public boolean hasPendingModelBuild() {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#hasPendingModelBuild().
 //                                    display_name hasPendingModelBuild
 //                                    signature_documentation java public boolean hasPendingModelBuild()
+//                                    kind Method
 //                                    documentation  Whether an update to models is currently pending. This can either be because\n {@link #requestModelBuild()} was called, or because models are currently being built or diff\n on a background thread.\n
     return requestedModelBuildType != RequestedModelBuildType.NONE // model build is posted
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestedModelBuildType.
@@ -438,6 +467,7 @@ public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addModelBuildListener().
 //                                  display_name addModelBuildListener
 //                                  signature_documentation java public void addModelBuildListener(OnModelBuildFinishedListener listener)
+//                                  kind Method
 //                                  documentation  Add a listener that will be called every time {@link #buildModels()} has finished running\n and changes have been dispatched to the RecyclerView.\n <p>\n Since buildModels can be called once for many calls to {@link #requestModelBuild()}, this is\n called just once for each buildModels execution, not for every request.\n <p>\n Use this to react to changes in your models that need to happen after the RecyclerView has\n been notified, such as scrolling.\n
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                               ^^^^^^^^ definition local 2
@@ -459,6 +489,7 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#removeModelBuildListener().
 //                                     display_name removeModelBuildListener
 //                                     signature_documentation java public void removeModelBuildListener(OnModelBuildFinishedListener listener)
+//                                     kind Method
 //                                     documentation  Remove a listener added with {@link #addModelBuildListener(OnModelBuildFinishedListener)}.\n This is safe to call from inside the callback\n {@link OnModelBuildFinishedListener#onModelBuildFinished(DiffResult)}\n
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                                  ^^^^^^^^ definition local 3
@@ -494,6 +525,7 @@ public synchronized void requestDelayedModelBuild(int delayMs) {
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                                  display_name requestDelayedModelBuild
 //                                                  signature_documentation java public void requestDelayedModelBuild(int delayMs)
+//                                                  kind Method
 //                                                  documentation  Call this to request a delayed model update. The controller will schedule a call to {@link\n #buildModels()} so that models can be rebuilt for the current data.\n <p>\n Using this to delay a model update may be helpful in cases where user input is causing many\n rapid changes in the models, such as typing. In that case, the view is already updated on\n screen and constantly rebuilding models is potentially slow and unnecessary. The downside to\n delaying the model build too long is that models will not be in sync with the data or view, and\n scrolling the view offscreen and back onscreen will cause the model to bind old data.\n <p>\n If a previous request is still pending it will be removed in favor of this new delay\n <p>\n Any call to {@link #requestModelBuild()} will override a delayed request.\n <p>\n In most cases you should use {@link #requestModelBuild()} instead of this.\n\n @param delayMs The time in milliseconds to delay the model build by. Should be greater than or\n                equal to 0. A value of 0 is equivalent to calling {@link #requestModelBuild()}\n
 //                                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild().
 //                                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestDelayedModelBuild().
@@ -547,6 +579,7 @@ public synchronized void cancelPendingModelBuild() {
 //                         ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#cancelPendingModelBuild().
 //                                                 display_name cancelPendingModelBuild
 //                                                 signature_documentation java public void cancelPendingModelBuild()
+//                                                 kind Method
 //                                                 documentation  Cancels a pending call to {@link #buildModels()} if one has been queued by {@link\n #requestModelBuild()}.\n
     // Access to requestedModelBuildType is synchronized because the model building thread clears
     // it when model building starts, and the main thread needs to set it to indicate a build
@@ -574,6 +607,7 @@ public synchronized void cancelPendingModelBuild() {
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModelsRunnable.
 //                                           display_name buildModelsRunnable
 //                                           signature_documentation java private final Runnable buildModelsRunnable
+//                                           kind Field
 //                                                 ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
     @Override
 //   ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -582,6 +616,7 @@ public void run() {
 //                  display_name run
 //                  signature_documentation java @Override\npublic void run()
 //                  enclosing_symbol local 5
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
       // Do this first to mark the controller as being in the model building process.
       threadBuildingModels = Thread.currentThread();
@@ -678,6 +713,7 @@ private int getExpectedModelCount() {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getExpectedModelCount().
 //                                  display_name getExpectedModelCount
 //                                  signature_documentation java private int getExpectedModelCount()
+//                                  kind Method
 //                                  documentation An estimate for how many models will be built in the next {@link #buildModels()} phase. 
     int currentModelCount = adapter.getItemCount();
 //      ^^^^^^^^^^^^^^^^^ definition local 8
@@ -708,6 +744,7 @@ private int getExpectedModelCount() {
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
 //                                    display_name buildModels
 //                                    signature_documentation java protected abstract void buildModels()
+//                                    kind AbstractMethod
 //                                    documentation  Subclasses should implement this to describe what models should be shown for the current state.\n Implementations should call either {@link #add(EpoxyModel)}, {@link\n EpoxyModel#addTo(EpoxyController)}, or {@link EpoxyModel#addIf(boolean, EpoxyController)} with\n the models that should be shown, in the order that is desired.\n <p>\n Once a model is added to the controller it should be treated as immutable and never modified\n again. This is necessary for adapter updates to be accurate. If "validateEpoxyModelUsage" is\n enabled then runtime validations will be done to make sure models are not changed.\n <p>\n You CANNOT call this method directly. Instead, call {@link #requestModelBuild()} to have the\n controller schedule an update.\n
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#buildModels().
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels().
@@ -719,6 +756,7 @@ int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList().
 //                                       display_name getFirstIndexOfModelInBuildingList
 //                                       signature_documentation java int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model)
+//                                       kind Method
 //                                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                     ^^^^^ definition local 9
 //                                                           display_name model
@@ -759,6 +797,7 @@ boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
 //                                  display_name isModelAddedMultipleTimes
 //                                  signature_documentation java boolean isModelAddedMultipleTimes(EpoxyModel<?> model)
+//                                  kind Method
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^^^^ definition local 12
 //                                                      display_name model
@@ -805,6 +844,7 @@ void addAfterInterceptorCallback(ModelInterceptorCallback callback) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addAfterInterceptorCallback().
 //                                 display_name addAfterInterceptorCallback
 //                                 signature_documentation java void addAfterInterceptorCallback(ModelInterceptorCallback callback)
+//                                 kind Method
 //                                 ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                                          ^^^^^^^^ definition local 16
 //                                                                   display_name callback
@@ -834,11 +874,13 @@ interface ModelInterceptorCallback {
 //          ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
 //                                   display_name ModelInterceptorCallback
 //                                   signature_documentation java interface ModelInterceptorCallback
+//                                   kind Interface
 //                                   documentation  Callbacks to each model for when interceptors are started and stopped, so the models know when\n to allow changes.\n
     void onInterceptorsStarted(EpoxyController controller);
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
 //                             display_name onInterceptorsStarted
 //                             signature_documentation java public abstract void onInterceptorsStarted(EpoxyController controller)
+//                             kind AbstractMethod
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                             ^^^^^^^^^^ definition local 17
 //                                                        display_name controller
@@ -848,6 +890,7 @@ interface ModelInterceptorCallback {
 //       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
 //                              display_name onInterceptorsFinished
 //                              signature_documentation java public abstract void onInterceptorsFinished(EpoxyController controller)
+//                              kind AbstractMethod
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                              ^^^^^^^^^^ definition local 18
 //                                                         display_name controller
@@ -859,6 +902,7 @@ private void runInterceptors() {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
 //                             display_name runInterceptors
 //                             signature_documentation java private void runInterceptors()
+//                             kind Method
     if (!interceptors.isEmpty()) {
 //       ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
 //                    ^^^^^^^ reference semanticdb maven jdk 11 java/util/List#isEmpty().
@@ -926,6 +970,7 @@ public interface Interceptor {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
 //                             display_name Interceptor
 //                             signature_documentation java public interface Interceptor
+//                             kind Interface
 //                             documentation A callback that is run after {@link #buildModels()} completes and before diffing is run. 
     /**
      * This is called immediately after {@link #buildModels()} and before diffing is run and the
@@ -941,6 +986,7 @@ public interface Interceptor {
 //       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#intercept().
 //                 display_name intercept
 //                 signature_documentation java public abstract void intercept(List<EpoxyModel<?>> models)
+//                 kind AbstractMethod
 //                 documentation  This is called immediately after {@link #buildModels()} and before diffing is run and the\n models are set on the adapter. This is a final chance to make any changes to the the models\n added in {@link #buildModels()}. This may be useful for actions that act on all models in\n aggregate, such as toggling divider settings, or for cases such as rearranging models for an\n experiment.\n <p>\n The models list must not be changed after this method returns. Doing so will throw an\n exception.\n
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -963,6 +1009,7 @@ public void addInterceptor(@NonNull Interceptor interceptor) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInterceptor().
 //                           display_name addInterceptor
 //                           signature_documentation java public void addInterceptor(Interceptor interceptor)
+//                           kind Method
 //                           documentation  Add an interceptor callback to be run after models are built, to make any last changes before\n they are set on the adapter. Interceptors are run in the order they are added.\n <p>\n Interceptors are run on the same thread that models are built on.\n\n @see Interceptor#intercept(List)\n
 //                            ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                    ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
@@ -981,6 +1028,7 @@ public void removeInterceptor(@NonNull Interceptor interceptor) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#removeInterceptor().
 //                              display_name removeInterceptor
 //                              signature_documentation java public void removeInterceptor(Interceptor interceptor)
+//                              kind Method
 //                              documentation Remove an interceptor that was added with {@link #addInterceptor(Interceptor)}. 
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#Interceptor#
@@ -1006,6 +1054,7 @@ protected int getModelCountBuiltSoFar() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getModelCountBuiltSoFar().
 //                                      display_name getModelCountBuiltSoFar
 //                                      signature_documentation java protected int getModelCountBuiltSoFar()
+//                                      kind Method
 //                                      documentation  Get the number of models added so far during the {@link #buildModels()} phase. It is only valid\n to call this from within that method.\n <p>\n This is different from the number of models currently on the adapter, since models on the\n adapter are not updated until after models are finished being built. To access current adapter\n count call {@link #getAdapter()} and {@link EpoxyControllerAdapter#getItemCount()}\n
     assertIsBuildingModels();
 //  ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
@@ -1018,6 +1067,7 @@ private void assertIsBuildingModels() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertIsBuildingModels().
 //                                    display_name assertIsBuildingModels
 //                                    signature_documentation java private void assertIsBuildingModels()
+//                                    kind Method
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
       throw new IllegalEpoxyUsage("Can only call this when inside the `buildModels` method");
@@ -1029,6 +1079,7 @@ private void assertNotBuildingModels() {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#assertNotBuildingModels().
 //                                     display_name assertNotBuildingModels
 //                                     signature_documentation java private void assertNotBuildingModels()
+//                                     kind Method
     if (isBuildingModels()) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
       throw new IllegalEpoxyUsage("Cannot call this from inside `buildModels`");
@@ -1044,6 +1095,7 @@ public void add(@NonNull EpoxyModel<?> model) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
 //                display_name add
 //                signature_documentation java public void add(EpoxyModel<?> model)
+//                kind Method
 //                documentation  Add the model to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -1064,6 +1116,7 @@ protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+1).
 //                   display_name add
 //                   signature_documentation java protected void add(EpoxyModel<?>[] modelsToAdd)
+//                   kind Method
 //                   documentation  Add the models to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -1100,6 +1153,7 @@ protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+2).
 //                   display_name add
 //                   signature_documentation java protected void add(List<? extends EpoxyModel<?>> modelsToAdd)
+//                   kind Method
 //                   documentation  Add the models to this controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -1137,6 +1191,7 @@ void addInternal(EpoxyModel<?> modelToAdd) {
 //     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addInternal().
 //                 display_name addInternal
 //                 signature_documentation java void addInternal(EpoxyModel<?> modelToAdd)
+//                 kind Method
 //                 documentation  Method to actually add the model to the list being built. Should be called after all\n validations are done.\n
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                               ^^^^^^^^^^ definition local 30
@@ -1192,6 +1247,7 @@ void setStagedModel(EpoxyModel<?> model) {
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setStagedModel().
 //                    display_name setStagedModel
 //                    signature_documentation java void setStagedModel(EpoxyModel<?> model)
+//                    kind Method
 //                    documentation  Staging models allows them to be implicitly added after the user finishes modifying them. This\n means that if a user has modified a model, and then moves on to modifying a different model,\n the first model is automatically added as soon as the second model is modified.\n <p>\n There are some edge cases for handling models that are added without modification, or models\n that are modified but then fail an `addIf` check.\n <p>\n This only works for AutoModels, and only if implicitly adding is enabled in configuration.\n
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^ definition local 31
@@ -1214,6 +1270,7 @@ void addCurrentlyStagedModelIfExists() {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#addCurrentlyStagedModelIfExists().
 //                                     display_name addCurrentlyStagedModelIfExists
 //                                     signature_documentation java void addCurrentlyStagedModelIfExists()
+//                                     kind Method
     if (stagedModel != null) {
 //      ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#stagedModel.
       stagedModel.addTo(this);
@@ -1228,6 +1285,7 @@ void clearModelFromStaging(EpoxyModel<?> model) {
 //     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#clearModelFromStaging().
 //                           display_name clearModelFromStaging
 //                           signature_documentation java void clearModelFromStaging(EpoxyModel<?> model)
+//                           kind Method
 //                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^^^^^ definition local 32
 //                                               display_name model
@@ -1248,6 +1306,7 @@ protected boolean isBuildingModels() {
 //                  ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
 //                                   display_name isBuildingModels
 //                                   signature_documentation java protected boolean isBuildingModels()
+//                                   kind Method
 //                                   documentation True if the current callstack originated from the buildModels call, on the same thread. 
     return threadBuildingModels == Thread.currentThread();
 //         ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#threadBuildingModels.
@@ -1259,6 +1318,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
 //                                      display_name filterDuplicatesIfNeeded
 //                                      signature_documentation java private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models)
+//                                      kind Method
 //                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^^ definition local 33
@@ -1368,6 +1428,7 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
 //            ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                                    display_name findPositionOfDuplicate
 //                                    signature_documentation java private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> duplicateModel)
+//                                    kind Method
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^^ definition local 40
@@ -1431,6 +1492,7 @@ public void setFilterDuplicates(boolean filterDuplicates) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setFilterDuplicates().
 //                                display_name setFilterDuplicates
 //                                signature_documentation java public void setFilterDuplicates(boolean filterDuplicates)
+//                                kind Method
 //                                documentation  If set to true, Epoxy will search for models with duplicate ids added during {@link\n #buildModels()} and remove any duplicates found. If models with the same id are found, the\n first one is left in the adapter and any subsequent models are removed. {@link\n #onExceptionSwallowed(RuntimeException)} will be called for each duplicate removed.\n <p>\n This may be useful if your models are created via server supplied data, in which case the\n server may erroneously send duplicate items. Duplicate items are otherwise left in and can\n result in undefined behavior.\n
 //                                        ^^^^^^^^^^^^^^^^ definition local 45
 //                                                         display_name filterDuplicates
@@ -1445,6 +1507,7 @@ public boolean isDuplicateFilteringEnabled() {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isDuplicateFilteringEnabled().
 //                                           display_name isDuplicateFilteringEnabled
 //                                           signature_documentation java public boolean isDuplicateFilteringEnabled()
+//                                           kind Method
     return filterDuplicates;
 //         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicates.
   }
@@ -1458,6 +1521,7 @@ public static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesBy
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalDuplicateFilteringDefault().
 //                                                      display_name setGlobalDuplicateFilteringDefault
 //                                                      signature_documentation java public static void setGlobalDuplicateFilteringDefault(boolean filterDuplicatesByDefault)
+//                                                      kind StaticMethod
 //                                                      documentation  {@link #setFilterDuplicates(boolean)} is disabled in each EpoxyController by default. It can be\n toggled individually in each controller, or alternatively you can use this to change the\n default value for all EpoxyControllers.\n
 //                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 46
 //                                                                                        display_name filterDuplicatesByDefault
@@ -1484,6 +1548,7 @@ public void setDebugLoggingEnabled(boolean enabled) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setDebugLoggingEnabled().
 //                                   display_name setDebugLoggingEnabled
 //                                   signature_documentation java public void setDebugLoggingEnabled(boolean enabled)
+//                                   kind Method
 //                                   documentation  If enabled, DEBUG logcat messages will be printed to show when models are rebuilt, the time\n taken to build them, the time taken to diff them, and the item change outcomes from the\n differ. The tag of the logcat message is the class name of your EpoxyController.\n <p>\n This is useful to verify that models are being diffed as expected, as well as to watch for\n slowdowns in model building or diffing to indicate when you should optimize model building or\n model hashCode/equals implementations (which can often slow down diffing).\n <p>\n This should only be used in debug builds to avoid a performance hit in prod.\n
 //                                           ^^^^^^^ definition local 47
 //                                                   display_name enabled
@@ -1529,6 +1594,7 @@ public boolean isDebugLoggingEnabled() {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isDebugLoggingEnabled().
 //                                     display_name isDebugLoggingEnabled
 //                                     signature_documentation java public boolean isDebugLoggingEnabled()
+//                                     kind Method
     return timer != NO_OP_TIMER;
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#timer.
 //                  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#NO_OP_TIMER.
@@ -1544,6 +1610,7 @@ public static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnable
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalDebugLoggingEnabled().
 //                                                display_name setGlobalDebugLoggingEnabled
 //                                                signature_documentation java public static void setGlobalDebugLoggingEnabled(boolean globalDebugLoggingEnabled)
+//                                                kind StaticMethod
 //                                                documentation  Similar to {@link #setDebugLoggingEnabled(boolean)}, but this changes the global default for\n all EpoxyControllers.\n <p>\n The default is false.\n
 //                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 48
 //                                                                                  display_name globalDebugLoggingEnabled
@@ -1573,6 +1640,7 @@ public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                      display_name moveModel
 //                      signature_documentation java public void moveModel(int fromPosition, int toPosition)
+//                      kind Method
 //                      documentation  An optimized way to move a model from one position to another without rebuilding all models.\n This is intended to be used with {@link androidx.recyclerview.widget.ItemTouchHelper} to\n allow for efficient item dragging and rearranging. It cannot be\n <p>\n If you call this you MUST also update the data backing your models as necessary.\n <p>\n This will immediately change the model's position and notify the change to the RecyclerView.\n However, a delayed request to rebuild models will be scheduled for the future to guarantee that\n models are in sync with data.\n\n @param fromPosition Previous position of the item.\n @param toPosition   New position of the item.\n
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#moveModel().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#moveModel().
@@ -1612,6 +1680,7 @@ public void notifyModelChanged(int position) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#notifyModelChanged().
 //                               display_name notifyModelChanged
 //                               signature_documentation java public void notifyModelChanged(int position)
+//                               kind Method
 //                               documentation  An way to notify the adapter that a model has changed. This is intended to be used with\n {@link androidx.recyclerview.widget.ItemTouchHelper} to allow revert swiping a model.\n <p>\n This will immediately notify the change to the RecyclerView.\n\n @param position Position of the item.\n
 //                                   ^^^^^^^^ definition local 51
 //                                            display_name position
@@ -1638,6 +1707,7 @@ public EpoxyControllerAdapter getAdapter() {
 //                              ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getAdapter().
 //                                         display_name getAdapter
 //                                         signature_documentation java @NonNull\npublic EpoxyControllerAdapter getAdapter()
+//                                         kind Method
 //                                         documentation  Get the underlying adapter built by this controller. Use this to get the adapter to set on a\n RecyclerView, or to get information about models currently in use.\n
     return adapter;
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1647,6 +1717,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onSaveInstanceState().
 //                                display_name onSaveInstanceState
 //                                signature_documentation java public void onSaveInstanceState(unresolved_type outState)
+//                                kind Method
 //                                 ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                         ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                ^^^^^^^^ definition local 52
@@ -1663,6 +1734,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onRestoreInstanceState().
 //                                   display_name onRestoreInstanceState
 //                                   signature_documentation java public void onRestoreInstanceState(unresolved_type inState)
+//                                   kind Method
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^ reference semanticdb maven . . Bundle#
 //                                                    ^^^^^^^ definition local 53
@@ -1688,6 +1760,7 @@ public SpanSizeLookup getSpanSizeLookup() {
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getSpanSizeLookup().
 //                                        display_name getSpanSizeLookup
 //                                        signature_documentation java @NonNull\npublic unresolved_type getSpanSizeLookup()
+//                                        kind Method
 //                                        documentation  For use with a grid layout manager - use this to get the {@link SpanSizeLookup} for models in\n this controller. This will delegate span look up calls to each model's {@link\n EpoxyModel#getSpanSize(int, int, int)}. Make sure to also call {@link #setSpanCount(int)} so\n the span count is correct.\n
     return adapter.getSpanSizeLookup();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
@@ -1705,6 +1778,7 @@ public void setSpanCount(int spanCount) {
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setSpanCount().
 //                         display_name setSpanCount
 //                         signature_documentation java public void setSpanCount(int spanCount)
+//                         kind Method
 //                         documentation  If you are using a grid layout manager you must call this to set the span count of the grid.\n This span count will be passed on to the models so models can choose which span count to be.\n\n @see #getSpanSizeLookup()\n @see EpoxyModel#getSpanSize(int, int, int)\n
 //                             ^^^^^^^^^ definition local 54
 //                                       display_name spanCount
@@ -1720,6 +1794,7 @@ public int getSpanCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#getSpanCount().
 //                        display_name getSpanCount
 //                        signature_documentation java public int getSpanCount()
+//                        kind Method
     return adapter.getSpanCount();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                 ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getSpanCount().
@@ -1729,6 +1804,7 @@ public boolean isMultiSpan() {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isMultiSpan().
 //                           display_name isMultiSpan
 //                           signature_documentation java public boolean isMultiSpan()
+//                           kind Method
     return adapter.isMultiSpan();
 //         ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                 ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isMultiSpan().
@@ -1750,6 +1826,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onExceptionSwallowed().
 //                                    display_name onExceptionSwallowed
 //                                    signature_documentation java protected void onExceptionSwallowed(RuntimeException exception)
+//                                    kind Method
 //                                    documentation  This is called when recoverable exceptions occur at runtime. By default they are ignored and\n Epoxy will recover, but you can override this to be aware of when they happen.\n <p>\n A common use for this is being aware of duplicates when {@link #setFilterDuplicates(boolean)}\n is enabled.\n <p>\n By default the global exception handler provided by\n {@link #setGlobalExceptionHandler(ExceptionHandler)}\n is called with the exception. Overriding this allows you to provide your own handling for a\n controller.\n
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
@@ -1772,6 +1849,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
 //                                                       display_name globalExceptionHandler
 //                                                       signature_documentation java private static ExceptionHandler globalExceptionHandler
+//                                                       kind StaticField
 //                                                       documentation  Default handler for exceptions in all EpoxyControllers. Set with {@link\n #setGlobalExceptionHandler(ExceptionHandler)}\n
       new ExceptionHandler() {
 //        ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
@@ -1783,6 +1861,7 @@ public void onException(@NonNull EpoxyController controller,
 //                              display_name onException
 //                              signature_documentation java @Override\npublic void onException(EpoxyController controller, RuntimeException exception)
 //                              enclosing_symbol local 56
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
@@ -1819,6 +1898,7 @@ public static void setGlobalExceptionHandler(
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setGlobalExceptionHandler().
 //                                             display_name setGlobalExceptionHandler
 //                                             signature_documentation java public static void setGlobalExceptionHandler(ExceptionHandler globalExceptionHandler)
+//                                             kind StaticMethod
 //                                             documentation  Set a callback to be notified when a recoverable exception occurs at runtime.  By default these\n are ignored and Epoxy will recover, but you can override this to be aware of when they happen.\n <p>\n For example, you could choose to rethrow the exception in development builds, or log them in\n production.\n <p>\n A common use for this is being aware of duplicates when {@link #setFilterDuplicates(boolean)}\n is enabled.\n <p>\n This callback will be used in all EpoxyController classes. If you would like specific handling\n in a certain controller you can override {@link #onExceptionSwallowed(RuntimeException)} in\n that controller.\n
       @NonNull ExceptionHandler globalExceptionHandler) {
 //     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -1837,6 +1917,7 @@ public interface ExceptionHandler {
 //                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#
 //                                  display_name ExceptionHandler
 //                                  signature_documentation java public interface ExceptionHandler
+//                                  kind Interface
     /**
      * This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy
      * will recover, but you can override this to be aware of when they happen.
@@ -1850,6 +1931,7 @@ public interface ExceptionHandler {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
 //                   display_name onException
 //                   signature_documentation java public abstract void onException(EpoxyController controller, RuntimeException exception)
+//                   kind AbstractMethod
 //                   documentation  This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy\n will recover, but you can override this to be aware of when they happen.\n <p>\n For example, you could choose to rethrow the exception in development builds, or log them in\n production.\n\n @param controller The EpoxyController that the error occurred in.\n
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
@@ -1869,6 +1951,7 @@ void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerViewInternal().
 //                                      display_name onAttachedToRecyclerViewInternal
 //                                      signature_documentation java void onAttachedToRecyclerViewInternal(unresolved_type recyclerView)
+//                                      kind Method
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                   ^^^^^^^^^^^^ definition local 63
 //                                                                display_name recyclerView
@@ -1892,6 +1975,7 @@ public void run() {
 //                      display_name run
 //                      signature_documentation java @Override\npublic void run()
 //                      enclosing_symbol local 64
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
           // Only warn if there are still multiple adapters attached after a delay, to allow for
           // a grace period
@@ -1925,6 +2009,7 @@ void onDetachedFromRecyclerViewInternal(RecyclerView recyclerView) {
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerViewInternal().
 //                                        display_name onDetachedFromRecyclerViewInternal
 //                                        signature_documentation java void onDetachedFromRecyclerViewInternal(unresolved_type recyclerView)
+//                                        kind Method
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                     ^^^^^^^^^^^^ definition local 66
 //                                                                  display_name recyclerView
@@ -1942,6 +2027,7 @@ protected void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerView().
 //                                        display_name onAttachedToRecyclerView
 //                                        signature_documentation java protected void onAttachedToRecyclerView(unresolved_type recyclerView)
+//                                        kind Method
 //                                        documentation Called when the controller's adapter is attach to a recyclerview. 
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -1957,6 +2043,7 @@ protected void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerView().
 //                                          display_name onDetachedFromRecyclerView
 //                                          signature_documentation java protected void onDetachedFromRecyclerView(unresolved_type recyclerView)
+//                                          kind Method
 //                                          documentation Called when the controller's adapter is detached from a recyclerview. 
 //                                           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -2004,6 +2091,7 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelBound().
 //                            display_name onModelBound
 //                            signature_documentation java protected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> boundModel, int position, EpoxyModel<?> previouslyBoundModel)
+//                            kind Method
 //                            documentation  Called immediately after a model is bound to a view holder. Subclasses can override this if\n they want alerts on when a model is bound. Alternatively you may attach a listener directly to\n a generated model with model.onBind(...)\n\n @param previouslyBoundModel If non null, this is a model with the same id as the newly bound\n                             model, and was previously bound to a view. This means that {@link\n                             #buildModels()} returned a model that is different from the\n                             previouslyBoundModel and the view is being rebound to incorporate\n                             the change. You can compare this previous model with the new one to\n                             see exactly what changed.\n                             <p>\n                             The newly bound model and the previously bound model are guaranteed\n                             to have the same id, but will not necessarily be of the same type\n                             depending on your implementation of {@link #buildModels()}. With\n                             common usage patterns of Epoxy they should be the same type, and\n                             will only differ if you are using different model classes with the\n                             same id.\n                             <p>\n                             Comparing the newly bound model with the previous model allows you\n                             to be more intelligent when updating your view. This may help you\n                             optimize, or make it easier to work with animations.\n                             <p>\n                             If the new model and the previous model have the same view type\n                             (given by {@link EpoxyModel#getViewType()}), and if you are using\n                             the default ReyclerView item animator, the same view will be kept.\n                             If you are using a custom item animator then the view will be the\n                             same if the animator returns true in canReuseUpdatedViewHolder.\n                             <p>\n                             This previously bound model is taken as a payload from the diffing\n                             process, and follows the same general conditions for all\n                             recyclerview change payloads.\n
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -2040,6 +2128,7 @@ protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyMod
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onModelUnbound().
 //                              display_name onModelUnbound
 //                              signature_documentation java protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)
+//                              kind Method
 //                              documentation  Called immediately after a model is unbound from a view holder. Subclasses can override this if\n they want alerts on when a model is unbound. Alternatively you may attach a listener directly\n to a generated model with model.onUnbind(...)\n
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -2066,6 +2155,7 @@ protected void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder,
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewAttachedToWindow().
 //                                      display_name onViewAttachedToWindow
 //                                      signature_documentation java protected void onViewAttachedToWindow(EpoxyViewHolder holder, EpoxyModel<?> model)
+//                                      kind Method
 //                                      documentation  Called when the given viewholder is attached to the window, along with the model it is bound\n to.\n\n @see BaseEpoxyAdapter#onViewAttachedToWindow(EpoxyViewHolder)\n
 //                                       ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -2093,6 +2183,7 @@ protected void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder,
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#onViewDetachedFromWindow().
 //                                        display_name onViewDetachedFromWindow
 //                                        signature_documentation java protected void onViewDetachedFromWindow(EpoxyViewHolder holder, EpoxyModel<?> model)
+//                                        kind Method
 //                                        documentation  Called when the given viewholder is detechaed from the window, along with the model it is bound\n to.\n\n @see BaseEpoxyAdapter#onViewDetachedFromWindow(EpoxyViewHolder)\n
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -2125,6 +2216,7 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#setupStickyHeaderView().
 //                                  display_name setupStickyHeaderView
 //                                  signature_documentation java @Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)
+//                                  kind Method
 //                                  documentation  Optional callback to setup the sticky view,\n by default it doesn't do anything.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                           ^^^^ reference semanticdb maven . . View#
@@ -2148,6 +2240,7 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView().
 //                                     display_name teardownStickyHeaderView
 //                                     signature_documentation java @Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)
+//                                     kind Method
 //                                     documentation  Optional callback to perform tear down operation on the\n sticky view, by default it doesn't do anything.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
 //                                              ^^^^ reference semanticdb maven . . View#
@@ -2171,6 +2264,7 @@ public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyController#isStickyHeader().
 //                              display_name isStickyHeader
 //                              signature_documentation java @Override\npublic boolean isStickyHeader(int position)
+//                              kind Method
 //                              documentation  Called to check if the item at the position is a sticky item,\n by default returns false.\n\n The sub-classes should override the function if they are\n using sticky header feature.\n
 //                                  ^^^^^^^^ definition local 81
 //                                           display_name position
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
index f2ec538f0..aa511b003 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
@@ -59,6 +59,7 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
 //                 ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#
 //                                        display_name EpoxyControllerAdapter
 //                                        signature_documentation java public final class EpoxyControllerAdapter
+//                                        kind Class
 //                                        relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                                        relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
 //                                        relationship is_implementation semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
@@ -70,33 +71,39 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
 //                            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyBlocker.
 //                                          display_name notifyBlocker
 //                                          signature_documentation java private final NotifyBlocker notifyBlocker
+//                                          kind Field
 //                                                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#`<init>`().
   private final AsyncEpoxyDiffer differ;
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                      display_name differ
 //                                      signature_documentation java private final AsyncEpoxyDiffer differ
+//                                      kind Field
   private final EpoxyController epoxyController;
 //              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
 //                                              display_name epoxyController
 //                                              signature_documentation java private final EpoxyController epoxyController
+//                                              kind Field
   private int itemCount;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#itemCount.
 //                      display_name itemCount
 //                      signature_documentation java private int itemCount
+//                      kind Field
   private final List<OnModelBuildFinishedListener> modelBuildListeners = new ArrayList<>();
 //              ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                 ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                                                                     display_name modelBuildListeners
 //                                                                     signature_documentation java private final List<OnModelBuildFinishedListener> modelBuildListeners
+//                                                                     kind Field
 //                                                                           ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
 
   EpoxyControllerAdapter(@NonNull EpoxyController epoxyController, Handler diffingHandler) {
 //^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java EpoxyControllerAdapter(EpoxyController epoxyController, unresolved_type diffingHandler)
+//                       kind Constructor
 //                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                ^^^^^^^^^^^^^^^ definition local 0
@@ -131,6 +138,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed().
 //                                    display_name onExceptionSwallowed
 //                                    signature_documentation java @Override\nprotected void onExceptionSwallowed(RuntimeException exception)
+//                                    kind Method
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onExceptionSwallowed().
 //                                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/RuntimeException#
@@ -154,6 +162,7 @@ List<? extends EpoxyModel<?>> getCurrentModels() {
 //                              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                               display_name getCurrentModels
 //                                               signature_documentation java @NonNull\n@Override\nList<? extends EpoxyModel<?>> getCurrentModels()
+//                                               kind Method
 //                                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
     return differ.getCurrentList();
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
@@ -166,6 +175,7 @@ public int getItemCount() {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
 //                        display_name getItemCount
 //                        signature_documentation java @Override\npublic int getItemCount()
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getItemCount().
     // RecyclerView calls this A LOT. The base class implementation does
     // getCurrentModels().size() which adds some overhead because of the method calls.
@@ -179,6 +189,7 @@ void setModels(@NonNull ControllerModelList models) {
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
 //               display_name setModels
 //               signature_documentation java void setModels(ControllerModelList models)
+//               kind Method
 //               documentation This is set from whatever thread model building happened on, so must be thread safe. 
 //                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerModelList#
@@ -250,6 +261,7 @@ public boolean isDiffInProgress() {
 //               ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isDiffInProgress().
 //                                display_name isDiffInProgress
 //                                signature_documentation java public boolean isDiffInProgress()
+//                                kind Method
 //                                documentation  @return True if a diff operation is in progress.\n
     return differ.isDiffInProgress();
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
@@ -263,6 +275,7 @@ public void onResult(@NonNull DiffResult result) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
 //                     display_name onResult
 //                     signature_documentation java @Override\npublic void onResult(DiffResult result)
+//                     kind Method
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult().
 //                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
@@ -307,6 +320,7 @@ public void addModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#addModelBuildListener().
 //                                  display_name addModelBuildListener
 //                                  signature_documentation java public void addModelBuildListener(OnModelBuildFinishedListener listener)
+//                                  kind Method
 //                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                               ^^^^^^^^ definition local 9
 //                                                                        display_name listener
@@ -322,6 +336,7 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#removeModelBuildListener().
 //                                     display_name removeModelBuildListener
 //                                     signature_documentation java public void removeModelBuildListener(OnModelBuildFinishedListener listener)
+//                                     kind Method
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                                                  ^^^^^^^^ definition local 10
 //                                                                           display_name listener
@@ -339,6 +354,7 @@ boolean diffPayloadsEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#diffPayloadsEnabled().
 //                            display_name diffPayloadsEnabled
 //                            signature_documentation java @Override\nboolean diffPayloadsEnabled()
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
     return true;
   }
@@ -349,6 +365,7 @@ public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onAttachedToRecyclerView().
 //                                     display_name onAttachedToRecyclerView
 //                                     signature_documentation java @Override\npublic void onAttachedToRecyclerView(unresolved_type recyclerView)
+//                                     kind Method
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                           ^^^^^^^^^^^^ definition local 11
@@ -371,6 +388,7 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView().
 //                                       display_name onDetachedFromRecyclerView
 //                                       signature_documentation java @Override\npublic void onDetachedFromRecyclerView(unresolved_type recyclerView)
+//                                       kind Method
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView().
 //                                        ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -394,6 +412,7 @@ public void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
 //                                   signature_documentation java @Override\npublic void onViewAttachedToWindow(EpoxyViewHolder holder)
+//                                   kind Method
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow().
 //                                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -419,6 +438,7 @@ public void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
 //                                     signature_documentation java @Override\npublic void onViewDetachedFromWindow(EpoxyViewHolder holder)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -444,6 +464,7 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel
 //               ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound().
 //                            display_name onModelBound
 //                            signature_documentation java @Override\nprotected void onModelBound(EpoxyViewHolder holder, EpoxyModel<?> model, int position, EpoxyModel<?> previouslyBoundModel)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+1).
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -483,6 +504,7 @@ protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyMod
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound().
 //                              display_name onModelUnbound
 //                              signature_documentation java @Override\nprotected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel<?> model)
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onModelUnbound().
 //                               ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -512,6 +534,7 @@ public List<EpoxyModel<?>> getCopyOfModels() {
 //                           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCopyOfModels().
 //                                           display_name getCopyOfModels
 //                                           signature_documentation java @NonNull\npublic List<EpoxyModel<?>> getCopyOfModels()
+//                                           kind Method
 //                                           documentation Get an unmodifiable copy of the current models set on the adapter. 
     //noinspection unchecked
     return (List<EpoxyModel<?>>) getCurrentModels();
@@ -531,6 +554,7 @@ public EpoxyModel<?> getModelAtPosition(int position) {
 //                     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelAtPosition().
 //                                        display_name getModelAtPosition
 //                                        signature_documentation java @NonNull\npublic EpoxyModel<?> getModelAtPosition(int position)
+//                                        kind Method
 //                                        documentation  @throws IndexOutOfBoundsException If the given position is out of range of the current model\n                                   list.\n
 //                                            ^^^^^^^^ definition local 21
 //                                                     display_name position
@@ -553,6 +577,7 @@ public EpoxyModel<?> getModelById(long id) {
 //                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelById().
 //                                  display_name getModelById
 //                                  signature_documentation java @Nullable\npublic EpoxyModel<?> getModelById(long id)
+//                                  kind Method
 //                                  documentation  Searches the current model list for the model with the given id. Returns the matching model if\n one is found, otherwise null is returned.\n
 //                                       ^^ definition local 22
 //                                          display_name id
@@ -583,6 +608,7 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
 //                            display_name getModelPosition
 //                            signature_documentation java @Override\npublic int getModelPosition(EpoxyModel<?> targetModel)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -636,6 +662,7 @@ public BoundViewHolders getBoundViewHolders() {
 //                        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getBoundViewHolders().
 //                                            display_name getBoundViewHolders
 //                                            signature_documentation java @NonNull\n@Override\npublic BoundViewHolders getBoundViewHolders()
+//                                            kind Method
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
     return super.getBoundViewHolders();
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#super.
@@ -648,6 +675,7 @@ void moveModel(int fromPosition, int toPosition) {
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
 //               display_name moveModel
 //               signature_documentation java @UiThread\nvoid moveModel(int fromPosition, int toPosition)
+//               kind Method
 //                   ^^^^^^^^^^^^ definition local 28
 //                                display_name fromPosition
 //                                signature_documentation java int fromPosition
@@ -709,6 +737,7 @@ void notifyModelChanged(int position) {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged().
 //                        display_name notifyModelChanged
 //                        signature_documentation java @UiThread\nvoid notifyModelChanged(int position)
+//                        kind Method
 //                            ^^^^^^^^ definition local 32
 //                                     display_name position
 //                                     signature_documentation java int position
@@ -758,6 +787,7 @@ void notifyModelChanged(int position) {
 //                                                 ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#ITEM_CALLBACK.
 //                                                               display_name ITEM_CALLBACK
 //                                                               signature_documentation java private static final unresolved_type ITEM_CALLBACK
+//                                                               kind StaticField
       new ItemCallback<EpoxyModel<?>>() {
 //        ^^^^^^^^^^^^ reference semanticdb maven . . ItemCallback#
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -787,6 +817,7 @@ public boolean isStickyHeader(int position) {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader().
 //                              display_name isStickyHeader
 //                              signature_documentation java @Override\npublic boolean isStickyHeader(int position)
+//                              kind Method
 //                              documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader().
 //                                  ^^^^^^^^ definition local 35
@@ -809,6 +840,7 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView().
 //                                  display_name setupStickyHeaderView
 //                                  signature_documentation java @Override\npublic void setupStickyHeaderView(unresolved_type stickyHeader)
+//                                  kind Method
 //                                  documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView().
 //                                   ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
@@ -833,6 +865,7 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView().
 //                                     display_name teardownStickyHeaderView
 //                                     signature_documentation java @Override\npublic void teardownStickyHeaderView(unresolved_type stickyHeader)
+//                                     kind Method
 //                                     documentation  Delegates the callbacks received in the adapter\n to the controller.\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView().
 //                                      ^^^^^^^ reference semanticdb maven maven/org.jetbrains/annotations 13.0 org/jetbrains/annotations/NotNull#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
index 51d042c4d..ec64e659b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
@@ -31,6 +31,7 @@ public class EpoxyDiffLogger extends AdapterDataObserver {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#
 //                           display_name EpoxyDiffLogger
 //                           signature_documentation java public class EpoxyDiffLogger
+//                           kind Class
 //                           documentation  This data observer can be registered with an Epoxy adapter or controller to log all item change\n events. This may be useful to use in debug builds in order to observe model updates and monitor\n for issues.\n <p>\n You may want to look for unexpected item updates to catch improper hashCode/equals\n implementations in your models.\n <p>\n Additionally, you may want to look for frequent or unnecessary updates as an opportunity for\n optimization.\n
 //                           relationship is_implementation semanticdb maven . . AdapterDataObserver#
 //                                   ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . AdapterDataObserver#
@@ -39,11 +40,13 @@ public class EpoxyDiffLogger extends AdapterDataObserver {
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#tag.
 //                         display_name tag
 //                         signature_documentation java private final String tag
+//                         kind Field
 
   public EpoxyDiffLogger(String tag) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java public EpoxyDiffLogger(String tag)
+//                       kind Constructor
 //                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                              ^^^ definition local 0
 //                                  display_name tag
@@ -60,6 +63,7 @@ public void onItemRangeChanged(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged().
 //                               display_name onItemRangeChanged
 //                               signature_documentation java @Override\npublic void onItemRangeChanged(int positionStart, int itemCount)
+//                               kind Method
 //                                   ^^^^^^^^^^^^^ definition local 1
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
@@ -82,6 +86,7 @@ public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Objec
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(+1).
 //                               display_name onItemRangeChanged
 //                               signature_documentation java @Override\npublic void onItemRangeChanged(int positionStart, int itemCount, Object payload)
+//                               kind Method
 //                                   ^^^^^^^^^^^^^ definition local 3
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
@@ -119,6 +124,7 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeInserted().
 //                                display_name onItemRangeInserted
 //                                signature_documentation java @Override\npublic void onItemRangeInserted(int positionStart, int itemCount)
+//                                kind Method
 //                                    ^^^^^^^^^^^^^ definition local 6
 //                                                  display_name positionStart
 //                                                  signature_documentation java int positionStart
@@ -141,6 +147,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeRemoved().
 //                               display_name onItemRangeRemoved
 //                               signature_documentation java @Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)
+//                               kind Method
 //                                   ^^^^^^^^^^^^^ definition local 8
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
@@ -163,6 +170,7 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeMoved().
 //                             display_name onItemRangeMoved
 //                             signature_documentation java @Override\npublic void onItemRangeMoved(int fromPosition, int toPosition, int itemCount)
+//                             kind Method
 //                                 ^^^^^^^^^^^^ definition local 10
 //                                              display_name fromPosition
 //                                              signature_documentation java int fromPosition
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
index fa57a7348..b2ff70804 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java
@@ -12,11 +12,13 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
 //                                 display_name EpoxyDragCallback
 //                                 signature_documentation java public interface EpoxyDragCallback<T extends EpoxyModel>
+//                                 kind Interface
 //                                 documentation  For use with {@link EpoxyModelTouchCallback}\n
 //                                 relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                 ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
 //                                   display_name T
 //                                   signature_documentation java T extends EpoxyModel
+//                                   kind TypeParameter
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                                                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#[T]
@@ -36,6 +38,7 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
 //     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                   display_name onDragStarted
 //                   signature_documentation java public abstract void onDragStarted(T model, unresolved_type itemView, int adapterPosition)
+//                   kind AbstractMethod
 //                   documentation  Called when the view switches from an idle state to a dragged state, as the user begins a drag\n interaction with it. You can use this callback to modify the view to indicate it is being\n dragged.\n <p>\n This is the first callback in the lifecycle of a drag event.\n\n @param model           The model representing the view that is being dragged\n @param itemView        The view that is being dragged\n @param adapterPosition The adapter position of the model\n
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
@@ -72,6 +75,7 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                  display_name onModelMoved
 //                  signature_documentation java public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)
+//                  kind AbstractMethod
 //                  documentation  Called after {@link #onDragStarted(EpoxyModel, View, int)} when the dragged view is dropped to\n a new position. The EpoxyController will be updated automatically for you to reposition the\n models and notify the RecyclerView of the change.\n <p>\n You MUST use this callback to modify your data backing the models to reflect the change.\n <p>\n The next callback in the drag lifecycle will be {@link #onDragStarted(EpoxyModel, View, int)}\n\n @param modelBeingMoved The model representing the view that was moved\n @param itemView        The view that was moved\n @param fromPosition    The adapter position that the model came from\n @param toPosition      The new adapter position of the model\n
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
@@ -112,6 +116,7 @@ public interface EpoxyDragCallback<T extends EpoxyModel> extends BaseEpoxyTouchC
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                    display_name onDragReleased
 //                    signature_documentation java public abstract void onDragReleased(T model, unresolved_type itemView)
+//                    kind AbstractMethod
 //                    documentation  Called after {@link #onDragStarted(EpoxyModel, View, int)} when the view being dragged is\n released. If the view was dragged to a new, valid location then {@link #onModelMoved(int, int,\n EpoxyModel, View)} will be called before this and the view will settle to the new location.\n Otherwise the view will animate back to its original position.\n <p>\n You can use this callback to modify the view as it animates back into position.\n <p>\n {@link BaseEpoxyTouchCallback#clearView(EpoxyModel, View)} will be called after this, when the\n view has finished animating. Final cleanup of the view should be done there.\n\n @param model    The model representing the view that is being released\n @param itemView The view that was being dragged\n
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
index d772cd2cc..fc4c38fc8 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java
@@ -22,12 +22,14 @@ public abstract class EpoxyHolder {
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                                display_name EpoxyHolder
 //                                signature_documentation java public abstract class EpoxyHolder
+//                                kind Class
 //                                documentation  Used in conjunction with {@link com.airbnb.epoxy.EpoxyModelWithHolder} to provide a view holder\n pattern when binding to a model.\n
 
   public EpoxyHolder(@NonNull ViewParent parent) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`().
 //                   display_name <init>
 //                   signature_documentation java public EpoxyHolder(unresolved_type parent)
+//                   kind Constructor
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                       ^^^^^^ definition local 0
@@ -42,6 +44,7 @@ public EpoxyHolder() {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#`<init>`(+1).
 //                   display_name <init>
 //                   signature_documentation java public EpoxyHolder()
+//                   kind Constructor
   }
 
   /**
@@ -56,6 +59,7 @@ public EpoxyHolder() {
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#bindView().
 //                                 display_name bindView
 //                                 signature_documentation java protected abstract void bindView(unresolved_type itemView)
+//                                 kind AbstractMethod
 //                                 documentation  Called when this holder is created, with the view that it should hold. You can use this\n opportunity to find views by id, and do any other initialization you need. This is called only\n once for the lifetime of the class.\n\n @param itemView A view inflated from the layout provided by\n {@link EpoxyModelWithHolder#getLayout()}\n
 //                                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                          ^^^^ reference semanticdb maven . . View#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
index f539d4773..f587a2c95 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
@@ -60,6 +60,7 @@ public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#
 //                                     display_name EpoxyItemSpacingDecorator
 //                                     signature_documentation java public class EpoxyItemSpacingDecorator
+//                                     kind Class
 //                                     documentation  Modifies item spacing in a recycler view so that items are equally spaced no matter where they\n are on the grid. Only designed to work with standard linear or grid layout managers.\n
 //                                     relationship is_implementation semanticdb maven . . RecyclerView/ItemDecoration#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
@@ -68,48 +69,59 @@ public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
 //                           display_name pxBetweenItems
 //                           signature_documentation java private int pxBetweenItems
+//                           kind Field
   private boolean verticallyScrolling;
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#verticallyScrolling.
 //                                    display_name verticallyScrolling
 //                                    signature_documentation java private boolean verticallyScrolling
+//                                    kind Field
   private boolean horizontallyScrolling;
 //                ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#horizontallyScrolling.
 //                                      display_name horizontallyScrolling
 //                                      signature_documentation java private boolean horizontallyScrolling
+//                                      kind Field
   private boolean firstItem;
 //                ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#firstItem.
 //                          display_name firstItem
 //                          signature_documentation java private boolean firstItem
+//                          kind Field
   private boolean lastItem;
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#lastItem.
 //                         display_name lastItem
 //                         signature_documentation java private boolean lastItem
+//                         kind Field
   private boolean grid;
 //                ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
 //                     display_name grid
 //                     signature_documentation java private boolean grid
+//                     kind Field
 
   private boolean isFirstItemInRow;
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isFirstItemInRow.
 //                                 display_name isFirstItemInRow
 //                                 signature_documentation java private boolean isFirstItemInRow
+//                                 kind Field
   private boolean fillsLastSpan;
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#fillsLastSpan.
 //                              display_name fillsLastSpan
 //                              signature_documentation java private boolean fillsLastSpan
+//                              kind Field
   private boolean isInFirstRow;
 //                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow.
 //                             display_name isInFirstRow
 //                             signature_documentation java private boolean isInFirstRow
+//                             kind Field
   private boolean isInLastRow;
 //                ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow.
 //                            display_name isInLastRow
 //                            signature_documentation java private boolean isInLastRow
+//                            kind Field
 
   public EpoxyItemSpacingDecorator() {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`().
 //                                 display_name <init>
 //                                 signature_documentation java public EpoxyItemSpacingDecorator()
+//                                 kind Constructor
     this(0);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`(+1).
   }
@@ -118,6 +130,7 @@ public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#`<init>`(+1).
 //                                 display_name <init>
 //                                 signature_documentation java public EpoxyItemSpacingDecorator(int pxBetweenItems)
+//                                 kind Constructor
 //                                  ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                         ^^^^^^^^^^^^^^ definition local 0
 //                                                        display_name pxBetweenItems
@@ -132,6 +145,7 @@ public void setPxBetweenItems(@Px int pxBetweenItems) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems().
 //                              display_name setPxBetweenItems
 //                              signature_documentation java public void setPxBetweenItems(int pxBetweenItems)
+//                              kind Method
 //                               ^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Px#
 //                                      ^^^^^^^^^^^^^^ definition local 1
 //                                                     display_name pxBetweenItems
@@ -148,6 +162,7 @@ public int getPxBetweenItems() {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getPxBetweenItems().
 //                             display_name getPxBetweenItems
 //                             signature_documentation java @Px\npublic int getPxBetweenItems()
+//                             kind Method
     return pxBetweenItems;
 //         ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
   }
@@ -158,6 +173,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
 //                           display_name getItemOffsets
 //                           signature_documentation java @Override\npublic void getItemOffsets(unresolved_type outRect, unresolved_type view, unresolved_type parent, unresolved_type state)
+//                           kind Method
 //                           ^^^^ reference semanticdb maven . . Rect#
 //                                ^^^^^^^ definition local 2
 //                                        display_name outRect
@@ -307,6 +323,7 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //             ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
 //                                      display_name calculatePositionDetails
 //                                      signature_documentation java private void calculatePositionDetails(unresolved_type parent, int position, unresolved_type layout)
+//                                      kind Method
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                   ^^^^^^ definition local 15
 //                                                          display_name parent
@@ -421,6 +438,7 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
 //                                           display_name shouldReverseLayout
 //                                           signature_documentation java private static boolean shouldReverseLayout(unresolved_type layout, boolean horizontallyScrolling)
+//                                           kind StaticMethod
 //                                           ^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#
 //                                                         ^^^^^^ definition local 24
 //                                                                display_name layout
@@ -467,6 +485,7 @@ private boolean useBottomPadding() {
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useBottomPadding().
 //                                 display_name useBottomPadding
 //                                 signature_documentation java private boolean useBottomPadding()
+//                                 kind Method
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
       return (horizontallyScrolling && !fillsLastSpan)
@@ -486,6 +505,7 @@ private boolean useTopPadding() {
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useTopPadding().
 //                              display_name useTopPadding
 //                              signature_documentation java private boolean useTopPadding()
+//                              kind Method
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
       return (horizontallyScrolling && !isFirstItemInRow)
@@ -505,6 +525,7 @@ private boolean useRightPadding() {
 //                ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useRightPadding().
 //                                display_name useRightPadding
 //                                signature_documentation java private boolean useRightPadding()
+//                                kind Method
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
       return (horizontallyScrolling && !isInLastRow)
@@ -524,6 +545,7 @@ private boolean useLeftPadding() {
 //                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useLeftPadding().
 //                               display_name useLeftPadding
 //                               signature_documentation java private boolean useLeftPadding()
+//                               kind Method
     if (grid) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#grid.
       return (horizontallyScrolling && !isInFirstRow)
@@ -543,6 +565,7 @@ private static boolean isInFirstRow(int position, SpanSizeLookup spanSizeLookup,
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
 //                                    display_name isInFirstRow
 //                                    signature_documentation java private static boolean isInFirstRow(int position, unresolved_type spanSizeLookup, int spanCount)
+//                                    kind StaticMethod
 //                                        ^^^^^^^^ definition local 28
 //                                                 display_name position
 //                                                 signature_documentation java int position
@@ -588,6 +611,7 @@ private static boolean isInLastRow(int position, int itemCount, SpanSizeLookup s
 //                       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
 //                                   display_name isInLastRow
 //                                   signature_documentation java private static boolean isInLastRow(int position, int itemCount, unresolved_type spanSizeLookup, int spanCount)
+//                                   kind StaticMethod
 //                                       ^^^^^^^^ definition local 33
 //                                                display_name position
 //                                                signature_documentation java int position
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
index 95005f894..97fedeeb0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
@@ -74,10 +74,12 @@ public abstract class EpoxyModel<T> {
 //                    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                               display_name EpoxyModel
 //                               signature_documentation java public abstract class EpoxyModel<T>
+//                               kind Class
 //                               documentation  Helper to bind data to a view using a builder style. The parameterized type should extend\n Android's View or EpoxyHolder.\n\n @see EpoxyModelWithHolder\n @see EpoxyModelWithView\n
 //                               ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#[T]
 //                                 display_name T
 //                                 signature_documentation java T
+//                                 kind TypeParameter
 
   /**
    * Counts how many of these objects are created, so that each new object can have a unique id .
@@ -88,6 +90,7 @@ public abstract class EpoxyModel<T> {
 //                    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#idCounter.
 //                              display_name idCounter
 //                              signature_documentation java private static long idCounter
+//                              kind StaticField
 //                              documentation  Counts how many of these objects are created, so that each new object can have a unique id .\n Uses negative values so that these autogenerated ids don't clash with database ids that may be\n set with {@link #id(long)}\n
 
   /**
@@ -99,16 +102,19 @@ public abstract class EpoxyModel<T> {
 //             ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
 //                display_name id
 //                signature_documentation java private long id
+//                kind Field
 //                documentation  An id that can be used to uniquely identify this {@link EpoxyModel} for use in RecyclerView\n stable ids. It defaults to a unique id for this object instance, if you want to maintain the\n same id across instances use {@link #id(long)}\n
   @LayoutRes private int layout;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                       ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout.
 //                              display_name layout
 //                              signature_documentation java @LayoutRes\nprivate int layout
+//                              kind Field
   private boolean shown = true;
 //                ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shown.
 //                      display_name shown
 //                      signature_documentation java private boolean shown
+//                      kind Field
   /**
    * Set to true once this model is diffed in an adapter. Used to ensure that this model's id
    * doesn't change after being diffed.
@@ -117,6 +123,7 @@ public abstract class EpoxyModel<T> {
 //        ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addedToAdapter.
 //                       display_name addedToAdapter
 //                       signature_documentation java boolean addedToAdapter
+//                       kind Field
 //                       documentation  Set to true once this model is diffed in an adapter. Used to ensure that this model's id\n doesn't change after being diffed.\n
   /**
    * The first controller this model was added to. A reference is kept in debug mode in order to run
@@ -128,6 +135,7 @@ public abstract class EpoxyModel<T> {
 //                        ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo.
 //                                               display_name firstControllerAddedTo
 //                                               signature_documentation java private EpoxyController firstControllerAddedTo
+//                                               kind Field
 //                                               documentation  The first controller this model was added to. A reference is kept in debug mode in order to run\n validations. The model is allowed to be added to other controllers, but we only keep a\n reference to the first.\n
   /**
    * Models are staged when they are changed. This allows them to be automatically added when they
@@ -139,30 +147,36 @@ public abstract class EpoxyModel<T> {
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#controllerToStageTo.
 //                                    display_name controllerToStageTo
 //                                    signature_documentation java EpoxyController controllerToStageTo
+//                                    kind Field
 //                                    documentation  Models are staged when they are changed. This allows them to be automatically added when they\n are done being changed (eg the next model is changed/added or buildModels finishes). It is only\n allowed for AutoModels, and only if implicit adding is enabled.\n
   private boolean currentlyInInterceptors;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#currentlyInInterceptors.
 //                                        display_name currentlyInInterceptors
 //                                        signature_documentation java private boolean currentlyInInterceptors
+//                                        kind Field
   private int hashCodeWhenAdded;
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCodeWhenAdded.
 //                              display_name hashCodeWhenAdded
 //                              signature_documentation java private int hashCodeWhenAdded
+//                              kind Field
   private boolean hasDefaultId;
 //                ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId.
 //                             display_name hasDefaultId
 //                             signature_documentation java private boolean hasDefaultId
+//                             kind Field
   @Nullable private SpanSizeOverrideCallback spanSizeOverride;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
 //                                           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride.
 //                                                            display_name spanSizeOverride
 //                                                            signature_documentation java @Nullable\nprivate SpanSizeOverrideCallback spanSizeOverride
+//                                                            kind Field
 
   protected EpoxyModel(long id) {
 //          ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
 //                     display_name <init>
 //                     signature_documentation java protected EpoxyModel(long id)
+//                     kind Constructor
 //                          ^^ definition local 0
 //                             display_name id
 //                             signature_documentation java long id
@@ -176,6 +190,7 @@ public EpoxyModel() {
 //       ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`(+1).
 //                  display_name <init>
 //                  signature_documentation java public EpoxyModel()
+//                  kind Constructor
     this(idCounter--);
 //  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#`<init>`().
 //       ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#idCounter.
@@ -187,6 +202,7 @@ boolean hasDefaultId() {
 //        ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId().
 //                     display_name hasDefaultId
 //                     signature_documentation java boolean hasDefaultId()
+//                     kind Method
     return hasDefaultId;
 //         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hasDefaultId.
   }
@@ -203,6 +219,7 @@ protected int getViewType() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
 //                          display_name getViewType
 //                          signature_documentation java protected int getViewType()
+//                          kind Method
 //                          documentation  Get the view type to associate with this model in the recyclerview. For models that use a\n layout resource, the view type is simply the layout resource value by default.\n <p>\n If this returns 0 Epoxy will assign a unique view type for this model at run time.\n\n @see androidx.recyclerview.widget.RecyclerView.Adapter#getItemViewType(int)\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getViewType().
     return getLayout();
@@ -218,6 +235,7 @@ protected View buildView(@NonNull ViewGroup parent) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
 //                         display_name buildView
 //                         signature_documentation java protected unresolved_type buildView(unresolved_type parent)
+//                         kind Method
 //                         documentation  Create and return a new instance of a view for this model. By default a view is created by\n inflating the layout resource.\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#buildView().
 //                          ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -244,6 +262,7 @@ public void bind(@NonNull T view) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                 display_name bind
 //                 signature_documentation java public void bind(T view)
+//                 kind Method
 //                 documentation  Binds the current data to the given view. You should bind all fields including unset/empty\n fields to ensure proper recycling.\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
@@ -269,6 +288,7 @@ public void bind(@NonNull T view, @NonNull List<Object> payloads) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                 display_name bind
 //                 signature_documentation java public void bind(T view, List<Object> payloads)
+//                 kind Method
 //                 documentation  Similar to {@link #bind(Object)}, but provides a non null, non empty list of payloads\n describing what changed. This is the payloads list specified in the adapter's notifyItemChanged\n method. This is a useful optimization to allow you to only change part of a view instead of\n updating the whole thing, which may prevent unnecessary layout calls. If there are no payloads\n then {@link #bind(Object)} is called instead. This will only be used if the model is used with\n an {@link EpoxyAdapter}\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
@@ -325,6 +345,7 @@ public void bind(@NonNull T view, @NonNull EpoxyModel<?> previouslyBoundModel) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                 display_name bind
 //                 signature_documentation java public void bind(T view, EpoxyModel<?> previouslyBoundModel)
+//                 kind Method
 //                 documentation  Similar to {@link #bind(Object)}, but provides a non null model which was previously bound to\n this view. This will only be called if the model is used with an {@link EpoxyController}.\n\n @param previouslyBoundModel This is a model with the same id that was previously bound. You can\n                             compare this previous model with the current one to see exactly\n                             what changed.\n                             <p>\n                             This model and the previously bound model are guaranteed to have\n                             the same id, but will not necessarily be of the same type depending\n                             on your implementation of {@link EpoxyController#buildModels()}.\n                             With common usage patterns of Epoxy they should be the same type,\n                             and will only differ if you are using different model classes with\n                             the same id.\n                             <p>\n                             Comparing the newly bound model with the previous model allows you\n                             to be more intelligent when binding your view. This may help you\n                             optimize view binding, or make it easier to work with animations.\n                             <p>\n                             If the new model and the previous model have the same view type\n                             (given by {@link EpoxyModel#getViewType()}), and if you are using\n                             the default ReyclerView item animator, the same view will be\n                             reused. This means that you only need to update the view to reflect\n                             the data that changed. If you are using a custom item animator then\n                             the view will be the same if the animator returns true in\n                             canReuseUpdatedViewHolder.\n                             <p>\n                             This previously bound model is taken as a payload from the diffing\n                             process, and follows the same general conditions for all\n                             recyclerview change payloads.\n
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
@@ -359,6 +380,7 @@ public void unbind(@NonNull T view) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                   display_name unbind
 //                   signature_documentation java public void unbind(T view)
+//                   kind Method
 //                   documentation  Called when the view bound to this model is recycled. Subclasses can override this if their\n view should release resources when it's recycled.\n <p>\n Note that {@link #bind(Object)} can be called multiple times without an unbind call in between\n if the view has remained on screen to be reused across item changes. This means that you should\n not rely on unbind to clear a view or model's state before bind is called again.\n\n @see EpoxyAdapter#onViewRecycled(EpoxyViewHolder)\n
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
@@ -380,6 +402,7 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
 //                                     display_name onVisibilityStateChanged
 //                                     signature_documentation java public void onVisibilityStateChanged(int visibilityState, T view)
+//                                     kind Method
 //                                     documentation  TODO link to the wiki\n\n @see OnVisibilityStateChanged annotation\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged().
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
@@ -404,6 +427,7 @@ public void onVisibilityChanged(
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
 //                                display_name onVisibilityChanged
 //                                signature_documentation java public void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T view)
+//                                kind Method
 //                                documentation  TODO link to the wiki\n\n @see OnVisibilityChanged annotation\n
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleHeight,
@@ -448,6 +472,7 @@ public long id() {
 //            ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id().
 //               display_name id
 //               signature_documentation java public long id()
+//               kind Method
     return id;
 //         ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
   }
@@ -463,6 +488,7 @@ public EpoxyModel<T> id(long id) {
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+1).
 //                        display_name id
 //                        signature_documentation java public EpoxyModel<T> id(long id)
+//                        kind Method
 //                        documentation  Override the default id in cases where the data subject naturally has an id, like an object\n from a database. This id can only be set before the model is added to the adapter, it is an\n error to change the id after that.\n
 //                             ^^ definition local 15
 //                                display_name id
@@ -498,6 +524,7 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+2).
 //                        display_name id
 //                        signature_documentation java public EpoxyModel<T> id(Number[] ids)
+//                        kind Method
 //                        documentation  Use multiple numbers as the id for this model. Useful when you don't have a single long that\n represents a unique id.\n <p>\n This hashes the numbers, so there is a tiny risk of collision with other ids.\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Number#
@@ -546,6 +573,7 @@ public EpoxyModel<T> id(long id1, long id2) {
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+3).
 //                        display_name id
 //                        signature_documentation java public EpoxyModel<T> id(long id1, long id2)
+//                        kind Method
 //                        documentation  Use two numbers as the id for this model. Useful when you don't have a single long that\n represents a unique id.\n <p>\n This hashes the two numbers, so there is a tiny risk of collision with other ids.\n
 //                             ^^^ definition local 19
 //                                 display_name id1
@@ -590,6 +618,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key) {
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+4).
 //                        display_name id
 //                        signature_documentation java public EpoxyModel<T> id(CharSequence key)
+//                        kind Method
 //                        documentation  Use a string as the model id. Useful for models that don't clearly map to a numerical id. This\n is preferable to using {@link String#hashCode()} because that is a 32 bit hash and this is a 64\n bit hash, giving better spread and less chance of collision with other ids.\n <p>\n Since this uses a hashcode method to convert the String to a long there is a very small chance\n that you may have a collision with another id. Assuming an even spread of hashcodes, and\n several hundred models in the adapter, there would be roughly 1 in 100 trillion chance of a\n collision. (http://preshing.com/20110504/hash-collision-probabilities/)\n\n @see IdUtils#hashString64Bit(CharSequence)\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
@@ -615,6 +644,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
 //                        display_name id
 //                        signature_documentation java public EpoxyModel<T> id(CharSequence key, CharSequence[] otherKeys)
+//                        kind Method
 //                        documentation  Use several strings to define the id of the model.\n <p>\n Similar to {@link #id(CharSequence)}, but with additional strings.\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
@@ -674,6 +704,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, long id) {
 //                     ^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+6).
 //                        display_name id
 //                        signature_documentation java public EpoxyModel<T> id(CharSequence key, long id)
+//                        kind Method
 //                        documentation  Set an id that is namespaced with a string. This is useful when you need to show models of\n multiple types, side by side and don't want to risk id collisions.\n <p>\n Since this uses a hashcode method to convert the String to a long there is a very small chance\n that you may have a collision with another id. Assuming an even spread of hashcodes, and\n several hundred models in the adapter, there would be roughly 1 in 100 trillion chance of a\n collision. (http://preshing.com/20110504/hash-collision-probabilities/)\n\n @see IdUtils#hashString64Bit(CharSequence)\n @see IdUtils#hashLong64Bit(long)\n
 //                         ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
@@ -720,6 +751,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, long id) {
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
 //                                        display_name getDefaultLayout
 //                                        signature_documentation java @LayoutRes\nprotected abstract int getDefaultLayout()
+//                                        kind AbstractMethod
 //                                        documentation  Return the default layout resource to be used when creating views for this model. The resource\n will be inflated to create a view for the model; additionally the layout int is used as the\n views type in the RecyclerView.\n <p>\n This can be left unimplemented if you use the {@link EpoxyModelClass} annotation to define a\n layout.\n <p>\n This default value can be overridden with {@link #layout(int)} at runtime to change the layout\n dynamically.\n
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getDefaultLayout().
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getDefaultLayout().
@@ -734,6 +766,7 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout().
 //                            display_name layout
 //                            signature_documentation java @NonNull\npublic EpoxyModel<T> layout(int layoutRes)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#layout().
 //                             ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                           ^^^^^^^^^ definition local 30
@@ -754,6 +787,7 @@ public final int getLayout() {
 //                 ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getLayout().
 //                           display_name getLayout
 //                           signature_documentation java @LayoutRes\npublic final int getLayout()
+//                           kind Method
     if (layout == 0) {
 //      ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout.
       return getDefaultLayout();
@@ -775,6 +809,7 @@ public EpoxyModel<T> reset() {
 //                     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#reset().
 //                           display_name reset
 //                           signature_documentation java @NonNull\npublic EpoxyModel<T> reset()
+//                           kind Method
 //                           documentation  Sets fields of the model to default ones.\n
     onMutation();
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
@@ -795,6 +830,7 @@ public void addTo(@NonNull EpoxyController controller) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addTo().
 //                  display_name addTo
 //                  signature_documentation java public void addTo(EpoxyController controller)
+//                  kind Method
 //                  documentation  Add this model to the given controller. Can only be called from inside {@link\n EpoxyController#buildModels()}.\n
 //                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
@@ -815,6 +851,7 @@ public void addIf(boolean condition, @NonNull EpoxyController controller) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf().
 //                  display_name addIf
 //                  signature_documentation java public void addIf(boolean condition, EpoxyController controller)
+//                  kind Method
 //                  documentation  Add this model to the given controller if the condition is true. Can only be called from inside\n {@link EpoxyController#buildModels()}.\n
 //                          ^^^^^^^^^ definition local 32
 //                                    display_name condition
@@ -852,6 +889,7 @@ public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController cont
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addIf(+1).
 //                  display_name addIf
 //                  signature_documentation java public void addIf(AddPredicate predicate, EpoxyController controller)
+//                  kind Method
 //                  documentation  Add this model to the given controller if the {@link AddPredicate} return true. Can only be\n called from inside {@link EpoxyController#buildModels()}.\n
 //                   ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#
@@ -879,11 +917,13 @@ public interface AddPredicate {
 //                 ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#
 //                              display_name AddPredicate
 //                              signature_documentation java public interface AddPredicate
+//                              kind Interface
 //                              documentation  @see #addIf(AddPredicate, EpoxyController)\n
     boolean addIf();
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#AddPredicate#addIf().
 //                display_name addIf
 //                signature_documentation java public abstract boolean addIf()
+//                kind AbstractMethod
   }
 
   /**
@@ -894,6 +934,7 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller)
 //                     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#addWithDebugValidation().
 //                                            display_name addWithDebugValidation
 //                                            signature_documentation java protected final void addWithDebugValidation(EpoxyController controller)
+//                                            kind Method
 //                                            documentation  This is used internally by generated models to turn on validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with an {@link EpoxyController}.\n
 //                                             ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
@@ -945,6 +986,7 @@ public void onInterceptorsStarted(EpoxyController controller) {
 //                                        display_name onInterceptorsStarted
 //                                        signature_documentation java @Override\npublic void onInterceptorsStarted(EpoxyController controller)
 //                                        enclosing_symbol local 37
+//                                        kind Method
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                        ^^^^^^^^^^ definition local 39
@@ -962,6 +1004,7 @@ public void onInterceptorsFinished(EpoxyController controller) {
 //                                         display_name onInterceptorsFinished
 //                                         signature_documentation java @Override\npublic void onInterceptorsFinished(EpoxyController controller)
 //                                         enclosing_symbol local 37
+//                                         kind Method
 //                                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                         ^^^^^^^^^^ definition local 41
@@ -984,6 +1027,7 @@ boolean isDebugValidationEnabled() {
 //        ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isDebugValidationEnabled().
 //                                 display_name isDebugValidationEnabled
 //                                 signature_documentation java boolean isDebugValidationEnabled()
+//                                 kind Method
     return firstControllerAddedTo != null;
 //         ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo.
   }
@@ -1002,6 +1046,7 @@ protected final void onMutation() {
 //                     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onMutation().
 //                                display_name onMutation
 //                                signature_documentation java protected final void onMutation()
+//                                kind Method
 //                                documentation  This is used internally by generated models to do validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with an {@link EpoxyController}.\n This method validates that it is ok to change this model. It is only valid if the model hasn't\n yet been added, or the change is being done from an {@link EpoxyController.Interceptor}\n callback.\n <p>\n This is also used to stage the model for implicitly adding it, if it is an AutoModel and\n implicit adding is enabled.\n
     // The model may be added to multiple controllers, in which case if it was already diffed
     // and added to an adapter in one controller we don't want to even allow interceptors
@@ -1028,6 +1073,7 @@ private static int getPosition(@NonNull EpoxyController controller,
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getPosition().
 //                               display_name getPosition
 //                               signature_documentation java private static int getPosition(EpoxyController controller, EpoxyModel<?> model)
+//                               kind StaticMethod
 //                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                        ^^^^^^^^^^ definition local 42
@@ -1073,6 +1119,7 @@ protected final void validateStateHasNotChangedSinceAdded(String descriptionOfCh
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#validateStateHasNotChangedSinceAdded().
 //                                                          display_name validateStateHasNotChangedSinceAdded
 //                                                          signature_documentation java protected final void validateStateHasNotChangedSinceAdded(String descriptionOfChange, int modelPosition)
+//                                                          kind Method
 //                                                          documentation  This is used internally by generated models to do validation checking when\n "validateEpoxyModelUsage" is enabled and the model is used with a {@link EpoxyController}. This\n method validates that the model's hashCode hasn't been changed since it was added to the\n controller. This is similar to {@link #onMutation()}, but that method is only used for\n specific model changes such as calling a setter. By checking the hashCode, this method allows\n us to catch more subtle changes, such as through setting a field directly or through changing\n an object that is set on the model.\n
 //                                                          ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                                                 ^^^^^^^^^^^^^^^^^^^ definition local 44
@@ -1104,6 +1151,7 @@ public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                      display_name equals
 //                      signature_documentation java @Override\npublic boolean equals(Object o)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
@@ -1155,6 +1203,7 @@ public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                    display_name hashCode
 //                    signature_documentation java @Override\npublic int hashCode()
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
@@ -1189,6 +1238,7 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                       display_name getSpanSize
 //                       signature_documentation java public int getSpanSize(int totalSpanCount, int position, int itemCount)
+//                       kind Method
 //                       documentation  Subclasses can override this if they want their view to take up more than one span in a grid\n layout.\n\n @param totalSpanCount The number of spans in the grid\n @param position       The position of the model\n @param itemCount      The total number of items in the adapter\n
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
@@ -1214,6 +1264,7 @@ public EpoxyModel<T> spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz
 //                     ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSizeOverride().
 //                                      display_name spanSizeOverride
 //                                      signature_documentation java public EpoxyModel<T> spanSizeOverride(SpanSizeOverrideCallback spanSizeCallback)
+//                                      kind Method
 //                                       ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
 //                                                                         ^^^^^^^^^^^^^^^^ definition local 52
@@ -1230,10 +1281,12 @@ public interface SpanSizeOverrideCallback {
 //                 ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#
 //                                          display_name SpanSizeOverrideCallback
 //                                          signature_documentation java public interface SpanSizeOverrideCallback
+//                                          kind Interface
     int getSpanSize(int totalSpanCount, int position, int itemCount);
 //      ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize().
 //                  display_name getSpanSize
 //                  signature_documentation java public abstract int getSpanSize(int totalSpanCount, int position, int itemCount)
+//                  kind AbstractMethod
 //                      ^^^^^^^^^^^^^^ definition local 53
 //                                     display_name totalSpanCount
 //                                     signature_documentation java int totalSpanCount
@@ -1256,6 +1309,7 @@ public final int spanSize(int totalSpanCount, int position, int itemCount) {
 //                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#spanSize().
 //                          display_name spanSize
 //                          signature_documentation java public final int spanSize(int totalSpanCount, int position, int itemCount)
+//                          kind Method
 //                          documentation  Returns the actual span size of this model, using the {@link SpanSizeOverrideCallback} if one\n was set, otherwise using the value from {@link #getSpanSize(int, int, int)}\n
 //                              ^^^^^^^^^^^^^^ definition local 56
 //                                             display_name totalSpanCount
@@ -1299,6 +1353,7 @@ public EpoxyModel<T> show() {
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show().
 //                          display_name show
 //                          signature_documentation java @NonNull\npublic EpoxyModel<T> show()
+//                          kind Method
 //                          documentation  Change the visibility of the model so that it's view is shown. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
     return show(true);
 //         ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show(+1).
@@ -1317,6 +1372,7 @@ public EpoxyModel<T> show(boolean show) {
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show(+1).
 //                          display_name show
 //                          signature_documentation java @NonNull\npublic EpoxyModel<T> show(boolean show)
+//                          kind Method
 //                          documentation  Change the visibility of the model's view. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
 //                                  ^^^^ definition local 59
 //                                       display_name show
@@ -1343,6 +1399,7 @@ public EpoxyModel<T> hide() {
 //                     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hide().
 //                          display_name hide
 //                          signature_documentation java @NonNull\npublic EpoxyModel<T> hide()
+//                          kind Method
 //                          documentation  Change the visibility of the model so that it's view is hidden. This only works if the model is\n used in {@link EpoxyAdapter} or a {@link EpoxyModelGroup}, but is not supported in {@link\n EpoxyController}\n
     return show(false);
 //         ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#show(+1).
@@ -1356,6 +1413,7 @@ public boolean isShown() {
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#isShown().
 //                       display_name isShown
 //                       signature_documentation java public boolean isShown()
+//                       kind Method
 //                       documentation  Whether the model's view should be shown on screen. If false it won't be inflated and drawn,\n and will be like it was never added to the recycler view.\n
     return shown;
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shown.
@@ -1368,6 +1426,7 @@ public boolean shouldSaveViewState() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shouldSaveViewState().
 //                                   display_name shouldSaveViewState
 //                                   signature_documentation java public boolean shouldSaveViewState()
+//                                   kind Method
 //                                   documentation  Whether the adapter should save the state of the view bound to this model.\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(+1).
     return false;
@@ -1386,6 +1445,7 @@ public boolean onFailedToRecycleView(@NonNull T view) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
 //                                     display_name onFailedToRecycleView
 //                                     signature_documentation java public boolean onFailedToRecycleView(T view)
+//                                     kind Method
 //                                     documentation  Called if the RecyclerView failed to recycle this model's view. You can take this opportunity\n to clear the animation(s) that affect the View's transient state and return <code>true</code>\n so that the View can be recycled. Keep in mind that the View in question is already removed\n from the RecyclerView.\n\n @return True if the View should be recycled, false otherwise\n @see EpoxyAdapter#onFailedToRecycleView(androidx.recyclerview.widget.RecyclerView.ViewHolder)\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -1406,6 +1466,7 @@ public void onViewAttachedToWindow(@NonNull T view) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
 //                                   signature_documentation java public void onViewAttachedToWindow(T view)
+//                                   kind Method
 //                                   documentation  Called when this model's view is attached to the window.\n\n @see EpoxyAdapter#onViewAttachedToWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder)\n
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
@@ -1428,6 +1489,7 @@ public void onViewDetachedFromWindow(@NonNull T view) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
 //                                     signature_documentation java public void onViewDetachedFromWindow(T view)
+//                                     kind Method
 //                                     documentation  Called when this model's view is detached from the the window.\n\n @see EpoxyAdapter#onViewDetachedFromWindow(androidx.recyclerview.widget.RecyclerView\n .ViewHolder)\n
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
@@ -1447,6 +1509,7 @@ public String toString() {
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModel#toString().
 //                       display_name toString
 //                       signature_documentation java @Override\npublic String toString()
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return getClass().getSimpleName() + "{"
 //         ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
index 02fe8fe03..484579d1a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
@@ -100,6 +100,7 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                           display_name EpoxyModelGroup
 //                           signature_documentation java @SuppressWarnings("rawtypes")\npublic class EpoxyModelGroup
+//                           kind Class
 //                           documentation  An {@link EpoxyModel} that contains other models, and allows you to combine those models in\n whatever view configuration you want.\n <p>\n The constructors take a list of models and a layout resource. The layout must have a viewgroup as\n its top level view; it determines how the view of each model is laid out. There are two ways to\n specify this\n <p>\n 1. Leave the viewgroup empty. The view for each model will be inflated and added in order. This\n works fine if you don't need to include any other views, your model views don't need their layout\n params changed, and your views don't need ids (eg for saving state).\n <p>\n Alternatively you can have nested view groups, with the innermost viewgroup given the id\n "epoxy_model_group_child_container" to mark it as the viewgroup that should have the model views\n added to it. The viewgroup marked with this id should be empty. This allows you to nest\n viewgroups, such as a LinearLayout inside of a CardView.\n <p>\n 2. Include a {@link ViewStub} for each of the models in the list. There should be at least as\n many view stubs as models. Extra stubs will be ignored. Each model will have its view replace the\n stub in order of the view stub's position in the view group. That is, the view group's children\n will be iterated through in order. The first view stub found will be used for the first model in\n the models list, the second view stub will be used for the second model, and so on. A depth first\n recursive search through nested viewgroups is done to find these viewstubs.\n <p>\n The layout can be of any ViewGroup subclass, and can have arbitrary other child views besides the\n view stubs. It can arrange the views and view stubs however is needed.\n <p>\n Any layout param options set on the view stubs will be transferred to the corresponding model\n view by default. If you want a model to keep the layout params from it's own layout resource you\n can override {@link #useViewStubLayoutParams(EpoxyModel, int)}\n <p>\n If you want to override the id used for a model's view you can set {@link\n ViewStub#setInflatedId(int)} via xml. That id will be transferred over to the view taking that\n stub's place. This is necessary if you want your model to save view state, since without this the\n model's view won't have an id to associate the saved state with.\n <p>\n By default this model inherits the same id as the first model in the list. Call {@link #id(long)}\n to override that if needed.\n <p>\n When a model group is recycled, its child views are automatically recycled to a pool that is\n shared with all other model groups in the activity. This enables model groups to more efficiently\n manage their children. The shared pool is cleaned up when the activity is destroyed.\n
 //                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#
@@ -112,11 +113,13 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
 //                                    ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                                           display_name models
 //                                           signature_documentation java protected final List<EpoxyModel<?>> models
+//                                           kind Field
 
   private boolean shouldSaveViewStateDefault = false;
 //                ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewStateDefault.
 //                                           display_name shouldSaveViewStateDefault
 //                                           signature_documentation java private boolean shouldSaveViewStateDefault
+//                                           kind Field
 
   @Nullable
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
@@ -125,6 +128,7 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder<ModelGroupHolder> {
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState.
 //                                    display_name shouldSaveViewState
 //                                    signature_documentation java @Nullable\nprivate Boolean shouldSaveViewState
+//                                    kind Field
 
   /**
    * @param layoutRes The layout to use with these models.
@@ -134,6 +138,7 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, Collection<? extends EpoxyModel
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java public EpoxyModelGroup(int layoutRes, Collection<? extends EpoxyModel<?>> models)
+//                       kind Constructor
 //                       documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                      ^^^^^^^^^ definition local 0
@@ -161,6 +166,7 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel<?>... models) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+1).
 //                       display_name <init>
 //                       signature_documentation java public EpoxyModelGroup(int layoutRes, EpoxyModel<?>[] models)
+//                       kind Constructor
 //                       documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                        ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                      ^^^^^^^^^ definition local 2
@@ -189,6 +195,7 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
 //        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
 //                        display_name <init>
 //                        signature_documentation java private EpoxyModelGroup(int layoutRes, List<EpoxyModel<?>> models)
+//                        kind Constructor
 //                        documentation  @param layoutRes The layout to use with these models.\n @param models    The models that will be used to bind the views in the given layout.\n
 //                         ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                       ^^^^^^^^^ definition local 4
@@ -253,6 +260,7 @@ protected EpoxyModelGroup() {
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+3).
 //                          display_name <init>
 //                          signature_documentation java protected EpoxyModelGroup()
+//                          kind Constructor
 //                          documentation  Constructor use for DSL\n
     models = new ArrayList<>();
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
@@ -268,6 +276,7 @@ protected EpoxyModelGroup(@LayoutRes int layoutRes) {
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+4).
 //                          display_name <init>
 //                          signature_documentation java protected EpoxyModelGroup(int layoutRes)
+//                          kind Constructor
 //                          documentation  Constructor use for DSL\n
 //                           ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                         ^^^^^^^^^ definition local 8
@@ -285,6 +294,7 @@ protected void addModel(@NonNull EpoxyModel<?> model) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#addModel().
 //                        display_name addModel
 //                        signature_documentation java protected void addModel(EpoxyModel<?> model)
+//                        kind Method
 //                         ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                               ^^^^^ definition local 9
@@ -310,6 +320,7 @@ public void bind(@NonNull ModelGroupHolder holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
 //                 display_name bind
 //                 signature_documentation java @CallSuper\n@Override\npublic void bind(unresolved_type holder)
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -329,6 +340,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        enclosing_symbol local 11
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 13
@@ -367,6 +379,7 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull final List<Object> p
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
 //                 display_name bind
 //                 signature_documentation java @CallSuper\n@Override\npublic void bind(unresolved_type holder, List<Object> payloads)
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -393,6 +406,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        enclosing_symbol local 18
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 20
@@ -429,6 +443,7 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                 display_name bind
 //                 signature_documentation java @Override\npublic void bind(unresolved_type holder, EpoxyModel<?> previouslyBoundModel)
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -472,6 +487,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        enclosing_symbol local 26
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 28
@@ -539,6 +555,7 @@ private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHold
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#setViewVisibility().
 //                                      display_name setViewVisibility
 //                                      signature_documentation java private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHolder)
+//                                      kind StaticMethod
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^ definition local 32
 //                                                       display_name model
@@ -576,6 +593,7 @@ public void unbind(@NonNull ModelGroupHolder holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
 //                   display_name unbind
 //                   signature_documentation java @CallSuper\n@Override\npublic void unbind(unresolved_type holder)
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -597,6 +615,7 @@ public void onViewAttachedToWindow(ModelGroupHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
 //                                   signature_documentation java @CallSuper\n@Override\npublic void onViewAttachedToWindow(unresolved_type holder)
+//                                   kind Method
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
 //                                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
@@ -615,6 +634,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        enclosing_symbol local 36
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 38
@@ -648,6 +668,7 @@ public void onViewDetachedFromWindow(ModelGroupHolder holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
 //                                     signature_documentation java @CallSuper\n@Override\npublic void onViewDetachedFromWindow(unresolved_type holder)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
@@ -666,6 +687,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                        display_name onModel
 //                        signature_documentation java @Override\npublic void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
 //                        enclosing_symbol local 42
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 44
@@ -695,6 +717,7 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
 //                           display_name iterateModels
 //                           signature_documentation java private void iterateModels(unresolved_type holder, IterateModelsCallback callback)
+//                           kind Method
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . ModelGroupHolder#
 //                                            ^^^^^^ definition local 47
 //                                                   display_name holder
@@ -742,10 +765,12 @@ private interface IterateModelsCallback {
 //                  ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
 //                                        display_name IterateModelsCallback
 //                                        signature_documentation java private interface IterateModelsCallback
+//                                        kind Interface
     void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex);
 //       ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel().
 //               display_name onModel
 //               signature_documentation java public abstract void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex)
+//               kind AbstractMethod
 //               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                          ^^^^^ definition local 51
 //                                display_name model
@@ -768,6 +793,7 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getSpanSize().
 //                       display_name getSpanSize
 //                       signature_documentation java @Override\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^^^^^^ definition local 54
 //                                          display_name totalSpanCount
@@ -797,6 +823,7 @@ protected final int getDefaultLayout() {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#getDefaultLayout().
 //                                     display_name getDefaultLayout
 //                                     signature_documentation java @Override\nprotected final int getDefaultLayout()
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     throw new UnsupportedOperationException(
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`(+1).
@@ -810,6 +837,7 @@ public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) {
 //                       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState().
 //                                           display_name shouldSaveViewState
 //                                           signature_documentation java @NonNull\npublic EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState)
+//                                           kind Method
 //                                                   ^^^^^^^^^^^^^^^^^^^ definition local 57
 //                                                                       display_name shouldSaveViewState
 //                                                                       signature_documentation java boolean shouldSaveViewState
@@ -828,6 +856,7 @@ public boolean shouldSaveViewState() {
 //               ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(+1).
 //                                   display_name shouldSaveViewState
 //                                   signature_documentation java @Override\npublic boolean shouldSaveViewState()
+//                                   kind Method
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#shouldSaveViewState().
     // By default state is saved if any of the models have saved state enabled.
     // Override this if you need custom behavior.
@@ -854,6 +883,7 @@ protected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#useViewStubLayoutParams().
 //                                          display_name useViewStubLayoutParams
 //                                          signature_documentation java protected boolean useViewStubLayoutParams(EpoxyModel<?> model, int modelPosition)
+//                                          kind Method
 //                                          documentation  Whether the layout params set on the view stub for the given model should be carried over to\n the model's view. Default is true\n <p>\n Set this to false if you want the layout params on the model's layout resource to be kept.\n\n @param model         The model who's view is being created\n @param modelPosition The position of the model in the models list\n
 //                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                        ^^^^^ definition local 58
@@ -874,6 +904,7 @@ protected final ModelGroupHolder createNewHolder(@NonNull ViewParent parent) {
 //                                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#createNewHolder().
 //                                                 display_name createNewHolder
 //                                                 signature_documentation java @Override\nprotected final unresolved_type createNewHolder(unresolved_type parent)
+//                                                 kind Method
 //                                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#createNewHolder().
 //                                                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
@@ -891,6 +922,7 @@ public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
 //                      display_name equals
 //                      signature_documentation java @Override\npublic boolean equals(Object o)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
@@ -936,6 +968,7 @@ public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#hashCode().
 //                    display_name hashCode
 //                    signature_documentation java @Override\npublic int hashCode()
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = super.hashCode();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
index ba8f8b37d..f8ae67343 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
@@ -42,6 +42,7 @@ public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
 //                                            display_name EpoxyModelTouchCallback
 //                                            signature_documentation java public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
+//                                            kind Class
 //                                            documentation  A wrapper around {@link androidx.recyclerview.widget.ItemTouchHelper.Callback} to enable\n easier touch support when working with Epoxy models.\n <p>\n For simplicity you can use {@link EpoxyTouchHelper} to set up touch handling via this class for\n you instead of using this class directly. However, you may choose to use this class directly with\n your own {@link ItemTouchHelper} if you need extra flexibility or customization.\n
 //                                            relationship is_implementation semanticdb maven . . ItemTouchHelper/Callback#
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
@@ -51,6 +52,7 @@ public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                              display_name T
 //                                              signature_documentation java T extends EpoxyModel
+//                                              kind TypeParameter
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
     extends EpoxyTouchHelperCallback implements EpoxyDragCallback<T>, EpoxySwipeCallback<T> {
 //          ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#
@@ -63,6 +65,7 @@ public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                         ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#TOUCH_DEBOUNCE_MILLIS.
 //                                               display_name TOUCH_DEBOUNCE_MILLIS
 //                                               signature_documentation java private static final int TOUCH_DEBOUNCE_MILLIS
+//                                               kind StaticField
 
   @Nullable private final EpoxyController controller;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
@@ -70,27 +73,32 @@ public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
 //                                        ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#controller.
 //                                                   display_name controller
 //                                                   signature_documentation java @Nullable\nprivate final EpoxyController controller
+//                                                   kind Field
   private final Class<T> targetModelClass;
 //              ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#targetModelClass.
 //                                        display_name targetModelClass
 //                                        signature_documentation java private final Class<T> targetModelClass
+//                                        kind Field
   private EpoxyViewHolder holderBeingDragged;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                        ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingDragged.
 //                                           display_name holderBeingDragged
 //                                           signature_documentation java private EpoxyViewHolder holderBeingDragged
+//                                           kind Field
   private EpoxyViewHolder holderBeingSwiped;
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingSwiped.
 //                                          display_name holderBeingSwiped
 //                                          signature_documentation java private EpoxyViewHolder holderBeingSwiped
+//                                          kind Field
 
   public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class<T> targetModelClass) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#`<init>`().
 //                               display_name <init>
 //                               signature_documentation java public EpoxyModelTouchCallback(EpoxyController controller, Class<T> targetModelClass)
+//                               kind Constructor
 //                                ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                         ^^^^^^^^^^ definition local 0
@@ -117,6 +125,7 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                               display_name getMovementFlags
 //                               signature_documentation java @Override\nprotected int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder)
+//                               kind Method
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(+1).
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -176,6 +185,7 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                              display_name canDropOver
 //                              signature_documentation java @Override\nprotected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target)
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -205,6 +215,7 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                  ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                   display_name isTouchableModel
 //                                   signature_documentation java protected boolean isTouchableModel(EpoxyModel<?> model)
+//                                   kind Method
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                 ^^^^^ definition local 9
 //                                                       display_name model
@@ -222,6 +233,7 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                  ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                         display_name onMove
 //                         signature_documentation java @Override\nprotected boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target)
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -304,6 +316,7 @@ public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, Vi
 //            ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                         display_name onModelMoved
 //                         signature_documentation java @Override\npublic void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                             ^^^^^^^^^^^^ definition local 16
 //                                          display_name fromPosition
@@ -332,6 +345,7 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 //               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //                        display_name onSwiped
 //                        signature_documentation java @Override\nprotected void onSwiped(EpoxyViewHolder viewHolder, int direction)
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                        ^^^^^^^^^^ definition local 20
@@ -392,6 +406,7 @@ public void onSwipeCompleted(T model, View itemView, int position, int direction
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                             display_name onSwipeCompleted
 //                             signature_documentation java @Override\npublic void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                               ^^^^^ definition local 25
@@ -420,6 +435,7 @@ protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actio
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
 //                                 display_name onSelectedChanged
 //                                 signature_documentation java @Override\nprotected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState)
+//                                 kind Method
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
 //                                  ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
@@ -528,6 +544,7 @@ private void markRecyclerViewHasSelection(RecyclerView recyclerView) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#markRecyclerViewHasSelection().
 //                                          display_name markRecyclerViewHasSelection
 //                                          signature_documentation java private void markRecyclerViewHasSelection(unresolved_type recyclerView)
+//                                          kind Method
 //                                          ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                       ^^^^^^^^^^^^ definition local 32
 //                                                                    display_name recyclerView
@@ -547,6 +564,7 @@ private boolean recyclerViewHasSelection(RecyclerView recyclerView) {
 //                ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#recyclerViewHasSelection().
 //                                         display_name recyclerViewHasSelection
 //                                         signature_documentation java private boolean recyclerViewHasSelection(unresolved_type recyclerView)
+//                                         kind Method
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                      ^^^^^^^^^^^^ definition local 33
 //                                                                   display_name recyclerView
@@ -564,6 +582,7 @@ private void clearRecyclerViewSelectionMarker(RecyclerView recyclerView) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearRecyclerViewSelectionMarker().
 //                                              display_name clearRecyclerViewSelectionMarker
 //                                              signature_documentation java private void clearRecyclerViewSelectionMarker(unresolved_type recyclerView)
+//                                              kind Method
 //                                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                           ^^^^^^^^^^^^ definition local 34
 //                                                                        display_name recyclerView
@@ -583,6 +602,7 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                           display_name onSwipeStarted
 //                           signature_documentation java @Override\npublic void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                             ^^^^^ definition local 35
@@ -607,6 +627,7 @@ public void onSwipeReleased(T model, View itemView) {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                            display_name onSwipeReleased
 //                            signature_documentation java @Override\npublic void onSwipeReleased(T model, unresolved_type itemView)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                              ^^^^^ definition local 38
@@ -627,6 +648,7 @@ public void onDragStarted(T model, View itemView, int adapterPosition) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                          display_name onDragStarted
 //                          signature_documentation java @Override\npublic void onDragStarted(T model, unresolved_type itemView, int adapterPosition)
+//                          kind Method
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                            ^^^^^ definition local 40
@@ -651,6 +673,7 @@ public void onDragReleased(T model, View itemView) {
 //            ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                           display_name onDragReleased
 //                           signature_documentation java @Override\npublic void onDragReleased(T model, unresolved_type itemView)
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                             ^^^^^ definition local 43
@@ -671,6 +694,7 @@ protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHo
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                         display_name clearView
 //                         signature_documentation java @Override\nprotected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder)
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
@@ -714,6 +738,7 @@ public void run() {
 //                    display_name run
 //                    signature_documentation java @Override\npublic void run()
 //                    enclosing_symbol local 47
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Runnable#run().
         clearRecyclerViewSelectionMarker(recyclerView);
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearRecyclerViewSelectionMarker().
@@ -729,6 +754,7 @@ public void clearView(T model, View itemView) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 //                      display_name clearView
 //                      signature_documentation java @Override\npublic void clearView(T model, unresolved_type itemView)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
@@ -751,6 +777,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                           display_name onChildDraw
 //                           signature_documentation java @Override\nprotected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                           ^^^^^^ reference semanticdb maven . . Canvas#
@@ -876,6 +903,7 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                                   display_name onSwipeProgressChanged
 //                                   signature_documentation java @Override\npublic void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
+//                                   kind Method
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#[T]
 //                                     ^^^^^ definition local 62
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
index 137f2d375..2173fea47 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java
@@ -38,11 +38,13 @@ public abstract class EpoxyModelWithHolder<T extends EpoxyHolder> extends EpoxyM
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#
 //                                         display_name EpoxyModelWithHolder
 //                                         signature_documentation java public abstract class EpoxyModelWithHolder<T extends EpoxyHolder>
+//                                         kind Class
 //                                         documentation  A version of {@link com.airbnb.epoxy.EpoxyModel} that allows you to use a view holder pattern\n instead of a specific view when binding to your model.\n
 //                                         relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                         ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                           display_name T
 //                                           signature_documentation java T extends EpoxyHolder
+//                                           kind TypeParameter
 //                                                   ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                                                                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
@@ -51,12 +53,14 @@ public EpoxyModelWithHolder() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#`<init>`().
 //                            display_name <init>
 //                            signature_documentation java public EpoxyModelWithHolder()
+//                            kind Constructor
   }
 
   public EpoxyModelWithHolder(long id) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#`<init>`(+1).
 //                            display_name <init>
 //                            signature_documentation java public EpoxyModelWithHolder(long id)
+//                            kind Constructor
 //                                 ^^ definition local 0
 //                                    display_name id
 //                                    signature_documentation java long id
@@ -72,6 +76,7 @@ public EpoxyModelWithHolder(long id) {
 //                     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#createNewHolder().
 //                                     display_name createNewHolder
 //                                     signature_documentation java protected abstract T createNewHolder(unresolved_type parent)
+//                                     kind AbstractMethod
 //                                     documentation This should return a new instance of your {@link com.airbnb.epoxy.EpoxyHolder} class. 
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#createNewHolder().
 //                                      ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -87,6 +92,7 @@ public void bind(@NonNull T holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind().
 //                 display_name bind
 //                 signature_documentation java @Override\npublic void bind(T holder)
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -107,6 +113,7 @@ public void bind(@NonNull T holder, @NonNull List<Object> payloads) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1).
 //                 display_name bind
 //                 signature_documentation java @Override\npublic void bind(T holder, List<Object> payloads)
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+1).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+1).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -135,6 +142,7 @@ public void bind(@NonNull T holder, @NonNull EpoxyModel<?> previouslyBoundModel)
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2).
 //                 display_name bind
 //                 signature_documentation java @Override\npublic void bind(T holder, EpoxyModel<?> previouslyBoundModel)
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind(+2).
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -162,6 +170,7 @@ public void unbind(@NonNull T holder) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#unbind().
 //                   display_name unbind
 //                   signature_documentation java @Override\npublic void unbind(T holder)
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -183,6 +192,7 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged().
 //                                     display_name onVisibilityStateChanged
 //                                     signature_documentation java @Override\npublic void onVisibilityStateChanged(int visibilityState, T holder)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged().
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                     ^^^^^^^^^^^^^^^ definition local 8
@@ -208,6 +218,7 @@ public void onVisibilityChanged(
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged().
 //                                display_name onVisibilityChanged
 //                                signature_documentation java @Override\npublic void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T holder)
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onVisibilityChanged().
       @FloatRange(from = 0, to = 100) float percentVisibleHeight,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
@@ -262,6 +273,7 @@ public boolean onFailedToRecycleView(T holder) {
 //               ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView().
 //                                     display_name onFailedToRecycleView
 //                                     signature_documentation java @Override\npublic boolean onFailedToRecycleView(T holder)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
 //                                       ^^^^^^ definition local 15
@@ -280,6 +292,7 @@ public void onViewAttachedToWindow(T holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow().
 //                                   display_name onViewAttachedToWindow
 //                                   signature_documentation java @Override\npublic void onViewAttachedToWindow(T holder)
+//                                   kind Method
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow().
 //                                   ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
@@ -299,6 +312,7 @@ public void onViewDetachedFromWindow(T holder) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow().
 //                                     display_name onViewDetachedFromWindow
 //                                     signature_documentation java @Override\npublic void onViewDetachedFromWindow(T holder)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithHolder#[T]
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
index 033ae6f91..470891095 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java
@@ -38,14 +38,17 @@ public abstract class EpoxyModelWithView<T extends View> extends EpoxyModel<T> {
 //                    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#
 //                                       display_name EpoxyModelWithView
 //                                       signature_documentation java public abstract class EpoxyModelWithView<T extends unresolved_type>
+//                                       kind Class
 //                                       documentation  A model that allows its view to be built programmatically instead of by inflating a layout\n resource. Just implement {@link #buildView} so the adapter can create a new view for this model\n when needed.\n <p>\n {@link #getViewType()} is used by the adapter to know how to reuse views for this model. This\n means that all models that return the same type should be able to share the same view, and the\n view won't be shared with models of any other type.\n <p>\n If it is left unimplemented then at runtime a unique view type will be created to use for all\n models of that class. The generated view type will be negative so that it cannot collide with\n values from resource files, which are used in normal Epoxy models. If you would like to share\n the same view between models of different classes you can have those classes return the same view\n type. A good way to manually create a view type value is by creating an R.id. value in an ids\n resource file.\n
 //                                       relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#`<init>`().
 //                                       display_name <init>
 //                                       signature_documentation java public EpoxyModelWithView()
+//                                       kind Constructor
 //                                       ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
 //                                         display_name T
 //                                         signature_documentation java T extends unresolved_type
+//                                         kind TypeParameter
 //                                                 ^^^^ reference semanticdb maven . . View#
 //                                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#[T]
@@ -62,6 +65,7 @@ protected int getViewType() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getViewType().
 //                          display_name getViewType
 //                          signature_documentation java @Override\nprotected int getViewType()
+//                          kind Method
 //                          documentation  Get the view type associated with this model's view. Any models with the same view type will\n have views recycled between them.\n\n @see androidx.recyclerview.widget.RecyclerView.Adapter#getItemViewType(int)\n
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
     return 0;
@@ -80,6 +84,7 @@ protected int getViewType() {
 //                     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#buildView().
 //                               display_name buildView
 //                               signature_documentation java @Override\nprotected abstract T buildView(unresolved_type parent)
+//                               kind AbstractMethod
 //                               documentation  Create and return a new instance of a view for this model. If no layout params are set on the\n returned view then default layout params will be used.\n\n @param parent The parent ViewGroup that the returned view will be added to.\n
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
 //                                ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
@@ -95,6 +100,7 @@ protected final int getDefaultLayout() {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#getDefaultLayout().
 //                                     display_name getDefaultLayout
 //                                     signature_documentation java @Override\nprotected final int getDefaultLayout()
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     throw new UnsupportedOperationException(
 //            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/UnsupportedOperationException#`<init>`(+1).
@@ -109,6 +115,7 @@ public EpoxyModel<T> layout(@LayoutRes int layoutRes) {
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyModelWithView#layout().
 //                            display_name layout
 //                            signature_documentation java @Override\npublic EpoxyModel<T> layout(int layoutRes)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#layout().
 //                             ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                           ^^^^^^^^^ definition local 1
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
index 5f4b7c5c0..c9bf1afd0 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java
@@ -22,11 +22,13 @@ public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouch
 //               ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                                  display_name EpoxySwipeCallback
 //                                  signature_documentation java public interface EpoxySwipeCallback<T extends EpoxyModel>
+//                                  kind Interface
 //                                  documentation  For use with {@link EpoxyModelTouchCallback}\n
 //                                  relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                  ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
 //                                    display_name T
 //                                    signature_documentation java T extends EpoxyModel
+//                                    kind TypeParameter
 //                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                                                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#[T]
@@ -46,6 +48,7 @@ public interface EpoxySwipeCallback<T extends EpoxyModel> extends BaseEpoxyTouch
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                    display_name onSwipeStarted
 //                    signature_documentation java public abstract void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)
+//                    kind AbstractMethod
 //                    documentation  Called when the view switches from an idle state to a swiped state, as the user begins a swipe\n interaction with it. You can use this callback to modify the view to indicate it is being\n swiped.\n <p>\n This is the first callback made in the lifecycle of a swipe event.\n\n @param model           The model representing the view that is being swiped\n @param itemView        The view that is being swiped\n @param adapterPosition The adapter position of the model\n
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
@@ -82,6 +85,7 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                            display_name onSwipeProgressChanged
 //                            signature_documentation java public abstract void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
+//                            kind AbstractMethod
 //                            documentation  Once a view has begun swiping with {@link #onSwipeStarted(EpoxyModel, View, int)} it will\n receive this callback as the swipe distance changes. This can be called multiple times as the\n swipe interaction progresses.\n\n @param model         The model representing the view that is being swiped\n @param itemView      The view that is being swiped\n @param swipeProgress A float from -1 to 1 representing the percentage that the view has been\n                      swiped relative to its width. This will be positive if the view is being\n                      swiped to the right and negative if it is swiped to the left. For\n                      example,\n @param canvas        The canvas on which RecyclerView is drawing its children. You can draw to\n                      this to support custom swipe animations.\n
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
@@ -119,6 +123,7 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //     ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                     display_name onSwipeReleased
 //                     signature_documentation java public abstract void onSwipeReleased(T model, unresolved_type itemView)
+//                     kind AbstractMethod
 //                     documentation  Called when the user has released their touch on the view. If the displacement passed the swipe\n threshold then {@link #onSwipeCompleted(EpoxyModel, View, int, int)} will be called after this\n and the view will be animated off screen. Otherwise the view will animate back to its original\n position.\n\n @param model    The model representing the view that was being swiped\n @param itemView The view that was being swiped\n
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
@@ -154,6 +159,7 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //     ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                      display_name onSwipeCompleted
 //                      signature_documentation java public abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)
+//                      kind AbstractMethod
 //                      documentation  Called after {@link #onSwipeReleased(EpoxyModel, View)} if the swipe surpassed the threshold to\n be considered a full swipe. The view will now be animated off screen.\n <p>\n You MUST use this callback to remove this item from your backing data and request a model\n update.\n <p>\n {@link #clearView(EpoxyModel, View)} will be called after this.\n\n @param model     The model representing the view that was being swiped\n @param itemView  The view that was being swiped\n @param position  The adapter position of the model\n @param direction The direction that the view was swiped. Can be any of {@link\n                  ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n                  ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN} depending on what swipe\n                  directions were enabled.\n
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
index 2cd16c760..24d9215e8 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
@@ -66,10 +66,12 @@ public abstract class EpoxyTouchHelper {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#
 //                                     display_name EpoxyTouchHelper
 //                                     signature_documentation java public abstract class EpoxyTouchHelper
+//                                     kind Class
 //                                     documentation  A simple way to set up drag or swipe interactions with Epoxy.\n <p>\n Drag events work with the EpoxyController and automatically update the controller and\n RecyclerView when an item is moved. You just need to implement a callback to update your data to\n reflect the change.\n <p>\n Both swipe and drag events implement a small lifecycle to help you style the views as they are\n moved. You can register callbacks for the lifecycle events you care about.\n <p>\n If you want to set up multiple drag and swipe rules for the same RecyclerView, you can use this\n class multiple times to specify different targets or swipe and drag directions and callbacks.\n <p>\n If you want more control over configuration and handling, you can opt to not use this class and\n instead you can implement {@link EpoxyModelTouchCallback} directly with your own {@link\n ItemTouchHelper}. That class provides an interface that makes it easier to work with Epoxy models\n and simplifies touch callbacks.\n <p>\n If you want even more control you can implement {@link EpoxyTouchHelperCallback}. This is just a\n light layer over the normal RecyclerView touch callbacks, but it converts all view holders to\n Epoxy view holders to remove some boilerplate for you.\n
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#`<init>`().
 //                                     display_name <init>
 //                                     signature_documentation java public EpoxyTouchHelper()
+//                                     kind Constructor
 
   /**
    * The entry point for setting up drag support.
@@ -83,6 +85,7 @@ public static DragBuilder initDragging(EpoxyController controller) {
 //                          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#initDragging().
 //                                       display_name initDragging
 //                                       signature_documentation java public static DragBuilder initDragging(EpoxyController controller)
+//                                       kind StaticMethod
 //                                       documentation  The entry point for setting up drag support.\n\n @param controller The EpoxyController with the models that will be dragged. The controller will\n                   be updated for you when a model is dragged and moved by a user's touch\n                   interaction.\n
 //                                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                                       ^^^^^^^^^^ definition local 0
@@ -98,17 +101,20 @@ public static class DragBuilder {
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#
 //                                display_name DragBuilder
 //                                signature_documentation java public static class DragBuilder
+//                                kind Class
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller.
 //                                           display_name controller
 //                                           signature_documentation java private final EpoxyController controller
+//                                           kind Field
 
     private DragBuilder(EpoxyController controller) {
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#`<init>`().
 //                      display_name <init>
 //                      signature_documentation java private DragBuilder(EpoxyController controller)
+//                      kind Constructor
 //                      ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                      ^^^^^^^^^^ definition local 1
 //                                                 display_name controller
@@ -129,6 +135,7 @@ public DragBuilder2 withRecyclerView(RecyclerView recyclerView) {
 //                      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#withRecyclerView().
 //                                       display_name withRecyclerView
 //                                       signature_documentation java public DragBuilder2 withRecyclerView(unresolved_type recyclerView)
+//                                       kind Method
 //                                       documentation  The recyclerview that the EpoxyController has its adapter added to. An {@link\n androidx.recyclerview.widget.ItemTouchHelper} will be created and configured for you, and\n attached to this RecyclerView.\n
 //                                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                    ^^^^^^^^^^^^ definition local 2
@@ -146,22 +153,26 @@ public static class DragBuilder2 {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#
 //                                 display_name DragBuilder2
 //                                 signature_documentation java public static class DragBuilder2
+//                                 kind Class
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller.
 //                                           display_name controller
 //                                           signature_documentation java private final EpoxyController controller
+//                                           kind Field
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#recyclerView.
 //                                          display_name recyclerView
 //                                          signature_documentation java private final unresolved_type recyclerView
+//                                          kind Field
 
     private DragBuilder2(EpoxyController controller, RecyclerView recyclerView) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java private DragBuilder2(EpoxyController controller, unresolved_type recyclerView)
+//                       kind Constructor
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 3
 //                                                  display_name controller
@@ -186,6 +197,7 @@ public DragBuilder3 forVerticalList() {
 //                      ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forVerticalList().
 //                                      display_name forVerticalList
 //                                      signature_documentation java public DragBuilder3 forVerticalList()
+//                                      kind Method
 //                                      documentation Enable dragging vertically, up and down. 
       return withDirections(ItemTouchHelper.UP | ItemTouchHelper.DOWN);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
@@ -201,6 +213,7 @@ public DragBuilder3 forHorizontalList() {
 //                      ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forHorizontalList().
 //                                        display_name forHorizontalList
 //                                        signature_documentation java public DragBuilder3 forHorizontalList()
+//                                        kind Method
 //                                        documentation Enable dragging horizontally, left and right. 
       return withDirections(ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
@@ -216,6 +229,7 @@ public DragBuilder3 forGrid() {
 //                      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#forGrid().
 //                              display_name forGrid
 //                              signature_documentation java public DragBuilder3 forGrid()
+//                              kind Method
 //                              documentation Enable dragging in all directions. 
       return withDirections(ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
@@ -244,6 +258,7 @@ public DragBuilder3 withDirections(int directionFlags) {
 //                      ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#withDirections().
 //                                     display_name withDirections
 //                                     signature_documentation java public DragBuilder3 withDirections(int directionFlags)
+//                                     kind Method
 //                                     documentation  Set custom movement flags to dictate which drag directions should be allowed.\n <p>\n Can be any of {@link ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN}, {@link ItemTouchHelper#START}, {@link\n ItemTouchHelper#END}\n <p>\n Flags can be OR'd together to allow multiple directions.\n
 //                                         ^^^^^^^^^^^^^^ definition local 5
 //                                                        display_name directionFlags
@@ -262,26 +277,31 @@ public static class DragBuilder3 {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#
 //                                 display_name DragBuilder3
 //                                 signature_documentation java public static class DragBuilder3
+//                                 kind Class
 
     private final EpoxyController controller;
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller.
 //                                           display_name controller
 //                                           signature_documentation java private final EpoxyController controller
+//                                           kind Field
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#recyclerView.
 //                                          display_name recyclerView
 //                                          signature_documentation java private final unresolved_type recyclerView
+//                                          kind Field
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#movementFlags.
 //                                  display_name movementFlags
 //                                  signature_documentation java private final int movementFlags
+//                                  kind Field
 
     private DragBuilder3(EpoxyController controller, RecyclerView recyclerView, int movementFlags) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java private DragBuilder3(EpoxyController controller, unresolved_type recyclerView, int movementFlags)
+//                       kind Constructor
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 6
 //                                                  display_name controller
@@ -315,12 +335,14 @@ public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelCla
 //          ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
 //            display_name U
 //            signature_documentation java U extends EpoxyModel
+//            kind TypeParameter
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
 //                                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().
 //                                                           display_name withTarget
 //                                                           signature_documentation java public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelClass)
+//                                                           kind Method
 //                                                           documentation  Set the type of Epoxy model that is draggable. This approach works well if you only have one\n draggable type.\n
 //                                                           ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                 ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().[U]
@@ -364,6 +386,7 @@ public DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>... targe
 //                                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTargets().
 //                                              display_name withTargets
 //                                              signature_documentation java public DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)
+//                                              kind Method
 //                                              documentation  Specify which Epoxy model types are draggable. Use this if you have more than one type that\n is draggable.\n <p>\n If you only have one draggable type you should use {@link #withTarget(Class)}\n
 //                                              ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -396,6 +419,7 @@ public DragBuilder4<EpoxyModel> forAllModels() {
 //                                  ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#forAllModels().
 //                                               display_name forAllModels
 //                                               signature_documentation java public DragBuilder4<EpoxyModel> forAllModels()
+//                                               kind Method
 //                                               documentation  Use this if all models in the controller should be draggable, and if there are multiple types\n of models in the controller.\n <p>\n If you only have one model type you should use {@link #withTarget(Class)}\n
       return withTarget(EpoxyModel.class);
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().
@@ -408,9 +432,11 @@ public static class DragBuilder4<U extends EpoxyModel> {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
 //                                 display_name DragBuilder4
 //                                 signature_documentation java public static class DragBuilder4<U extends EpoxyModel>
+//                                 kind Class
 //                                 ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                   display_name U
 //                                   signature_documentation java U extends EpoxyModel
+//                                   kind TypeParameter
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
     private final EpoxyController controller;
@@ -418,21 +444,25 @@ public static class DragBuilder4<U extends EpoxyModel> {
 //                                ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#controller.
 //                                           display_name controller
 //                                           signature_documentation java private final EpoxyController controller
+//                                           kind Field
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#recyclerView.
 //                                          display_name recyclerView
 //                                          signature_documentation java private final unresolved_type recyclerView
+//                                          kind Field
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#movementFlags.
 //                                  display_name movementFlags
 //                                  signature_documentation java private final int movementFlags
+//                                  kind Field
     private final Class<U> targetModelClass;
 //                ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClass.
 //                                          display_name targetModelClass
 //                                          signature_documentation java private final Class<U> targetModelClass
+//                                          kind Field
     private final List<Class<? extends EpoxyModel>> targetModelClasses;
 //                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
@@ -440,11 +470,13 @@ public static class DragBuilder4<U extends EpoxyModel> {
 //                                                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClasses.
 //                                                                     display_name targetModelClasses
 //                                                                     signature_documentation java private final List<Class<? extends EpoxyModel>> targetModelClasses
+//                                                                     kind Field
 
     private DragBuilder4(EpoxyController controller,
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java private DragBuilder4(EpoxyController controller, unresolved_type recyclerView, int movementFlags, Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses)
+//                       kind Constructor
 //                       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 //                                       ^^^^^^^^^^ definition local 12
 //                                                  display_name controller
@@ -511,6 +543,7 @@ public ItemTouchHelper andCallbacks(final DragCallbacks<U> callbacks) {
 //                         ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#andCallbacks().
 //                                      display_name andCallbacks
 //                                      signature_documentation java public unresolved_type andCallbacks(DragCallbacks<U> callbacks)
+//                                      kind Method
 //                                      documentation  Set callbacks to handle drag actions and lifecycle events.\n <p>\n You MUST implement {@link DragCallbacks#onModelMoved(int, int, EpoxyModel,\n View)} to update your data to reflect an item move.\n <p>\n You can optionally implement the other callbacks to modify the view being dragged. This is\n useful if you want to change things like the view background, size, color, etc\n\n @return An {@link ItemTouchHelper} instance that has been initialized and attached to a\n recyclerview. The touch helper has already been fully set up and can be ignored, but you may\n want to hold a reference to it if you need to later detach the recyclerview to disable touch\n events via setting null on {@link ItemTouchHelper#attachToRecyclerView(RecyclerView)}\n
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#
 //                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
@@ -537,6 +570,7 @@ public int getMovementFlagsForModel(U model, int adapterPosition) {
 //                                              display_name getMovementFlagsForModel
 //                                              signature_documentation java @Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)
 //                                              enclosing_symbol local 20
+//                                              kind Method
 //                                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
 //                                                ^^^^^ definition local 24
@@ -558,6 +592,7 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                                             display_name isTouchableModel
 //                                             signature_documentation java @Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)
 //                                             enclosing_symbol local 20
+//                                             kind Method
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 27
@@ -597,6 +632,7 @@ public void onDragStarted(U model, View itemView, int adapterPosition) {
 //                                    display_name onDragStarted
 //                                    signature_documentation java @Override\npublic void onDragStarted(U model, unresolved_type itemView, int adapterPosition)
 //                                    enclosing_symbol local 20
+//                                    kind Method
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted().
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
@@ -628,6 +664,7 @@ public void onDragReleased(U model, View itemView) {
 //                                     display_name onDragReleased
 //                                     signature_documentation java @Override\npublic void onDragReleased(U model, unresolved_type itemView)
 //                                     enclosing_symbol local 20
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
@@ -654,6 +691,7 @@ public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved,
 //                                   display_name onModelMoved
 //                                   signature_documentation java @Override\npublic void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, unresolved_type itemView)
 //                                   enclosing_symbol local 20
+//                                   kind Method
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved().
 //                                       ^^^^^^^^^^^^ definition local 38
@@ -691,6 +729,7 @@ public void clearView(U model, View itemView) {
 //                                display_name clearView
 //                                signature_documentation java @Override\npublic void clearView(U model, unresolved_type itemView)
 //                                enclosing_symbol local 20
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
@@ -728,14 +767,17 @@ public abstract static class DragCallbacks<T extends EpoxyModel>
 //                             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#
 //                                           display_name DragCallbacks
 //                                           signature_documentation java public abstract static class DragCallbacks<T extends EpoxyModel>
+//                                           kind Class
 //                                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                           relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
 //                             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#`<init>`().
 //                                           display_name <init>
 //                                           signature_documentation java public DragCallbacks()
+//                                           kind Constructor
 //                                           ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                             display_name T
 //                                             signature_documentation java T extends EpoxyModel
+//                                             kind TypeParameter
 //                                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
       implements EpoxyDragCallback<T> {
 //               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
@@ -747,6 +789,7 @@ public void onDragStarted(T model, View itemView, int adapterPosition) {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted().
 //                            display_name onDragStarted
 //                            signature_documentation java @Override\npublic void onDragStarted(T model, unresolved_type itemView, int adapterPosition)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragStarted().
 //                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                              ^^^^^ definition local 45
@@ -771,6 +814,7 @@ public void onDragReleased(T model, View itemView) {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased().
 //                             display_name onDragReleased
 //                             signature_documentation java @Override\npublic void onDragReleased(T model, unresolved_type itemView)
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onDragReleased().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                               ^^^^^ definition local 48
@@ -791,6 +835,7 @@ public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeing
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved().
 //                                    display_name onModelMoved
 //                                    signature_documentation java @Override\npublic abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView)
+//                                    kind AbstractMethod
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#onModelMoved().
 //                                        ^^^^^^^^^^^^ definition local 50
 //                                                     display_name fromPosition
@@ -818,6 +863,7 @@ public void clearView(T model, View itemView) {
 //              ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView().
 //                        display_name clearView
 //                        signature_documentation java @Override\npublic void clearView(T model, unresolved_type itemView)
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                          ^^^^^ definition local 54
@@ -841,6 +887,7 @@ public boolean isDragEnabledForModel(T model) {
 //                 ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#isDragEnabledForModel().
 //                                       display_name isDragEnabledForModel
 //                                       signature_documentation java public boolean isDragEnabledForModel(T model)
+//                                       kind Method
 //                                       documentation  Whether the given model should be draggable.\n <p>\n True by default. You may override this to toggle draggability for a model.\n
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                         ^^^^^ definition local 56
@@ -856,6 +903,7 @@ public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel().
 //                                            display_name getMovementFlagsForModel
 //                                            signature_documentation java @Override\npublic final int getMovementFlagsForModel(T model, int adapterPosition)
+//                                            kind Method
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T]
 //                                              ^^^^^ definition local 57
@@ -884,6 +932,7 @@ public static SwipeBuilder initSwiping(RecyclerView recyclerView) {
 //                           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#initSwiping().
 //                                       display_name initSwiping
 //                                       signature_documentation java public static SwipeBuilder initSwiping(unresolved_type recyclerView)
+//                                       kind StaticMethod
 //                                       documentation  The entry point for setting up swipe support for a RecyclerView. The RecyclerView must be set\n with an Epoxy adapter or controller.\n
 //                                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                                    ^^^^^^^^^^^^ definition local 59
@@ -899,17 +948,20 @@ public static class SwipeBuilder {
 //                    ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#
 //                                 display_name SwipeBuilder
 //                                 signature_documentation java public static class SwipeBuilder
+//                                 kind Class
 
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView.
 //                                          display_name recyclerView
 //                                          signature_documentation java private final unresolved_type recyclerView
+//                                          kind Field
 
     private SwipeBuilder(RecyclerView recyclerView) {
 //          ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java private SwipeBuilder(unresolved_type recyclerView)
+//                       kind Constructor
 //                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                    ^^^^^^^^^^^^ definition local 60
 //                                                 display_name recyclerView
@@ -926,6 +978,7 @@ public SwipeBuilder2 right() {
 //                       ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#right().
 //                             display_name right
 //                             signature_documentation java public SwipeBuilder2 right()
+//                             kind Method
 //                             documentation Enable swiping right. 
       return withDirections(ItemTouchHelper.RIGHT);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
@@ -939,6 +992,7 @@ public SwipeBuilder2 left() {
 //                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#left().
 //                            display_name left
 //                            signature_documentation java public SwipeBuilder2 left()
+//                            kind Method
 //                            documentation Enable swiping left. 
       return withDirections(ItemTouchHelper.LEFT);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
@@ -952,6 +1006,7 @@ public SwipeBuilder2 leftAndRight() {
 //                       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#leftAndRight().
 //                                    display_name leftAndRight
 //                                    signature_documentation java public SwipeBuilder2 leftAndRight()
+//                                    kind Method
 //                                    documentation Enable swiping horizontally, left and right. 
       return withDirections(ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
 //           ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
@@ -975,6 +1030,7 @@ public SwipeBuilder2 withDirections(int directionFlags) {
 //                       ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#withDirections().
 //                                      display_name withDirections
 //                                      signature_documentation java public SwipeBuilder2 withDirections(int directionFlags)
+//                                      kind Method
 //                                      documentation  Set custom movement flags to dictate which swipe directions should be allowed.\n <p>\n Can be any of {@link ItemTouchHelper#LEFT}, {@link ItemTouchHelper#RIGHT}, {@link\n ItemTouchHelper#UP}, {@link ItemTouchHelper#DOWN}, {@link ItemTouchHelper#START}, {@link\n ItemTouchHelper#END}\n <p>\n Flags can be OR'd together to allow multiple directions.\n
 //                                          ^^^^^^^^^^^^^^ definition local 61
 //                                                         display_name directionFlags
@@ -992,21 +1048,25 @@ public static class SwipeBuilder2 {
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#
 //                                  display_name SwipeBuilder2
 //                                  signature_documentation java public static class SwipeBuilder2
+//                                  kind Class
 
     private final RecyclerView recyclerView;
 //                ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView.
 //                                          display_name recyclerView
 //                                          signature_documentation java private final unresolved_type recyclerView
+//                                          kind Field
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#movementFlags.
 //                                  display_name movementFlags
 //                                  signature_documentation java private final int movementFlags
+//                                  kind Field
 
     private SwipeBuilder2(RecyclerView recyclerView,
 //          ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#`<init>`().
 //                        display_name <init>
 //                        signature_documentation java private SwipeBuilder2(unresolved_type recyclerView, int movementFlags)
+//                        kind Constructor
 //                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                     ^^^^^^^^^^^^ definition local 62
 //                                                  display_name recyclerView
@@ -1033,12 +1093,14 @@ public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelCl
 //          ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
 //            display_name U
 //            signature_documentation java U extends EpoxyModel
+//            kind TypeParameter
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
 //                                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().
 //                                                            display_name withTarget
 //                                                            signature_documentation java public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelClass)
+//                                                            kind Method
 //                                                            documentation  Set the type of Epoxy model that is swipable. Use this if you only have one\n swipable type.\n
 //                                                            ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                  ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().[U]
@@ -1085,6 +1147,7 @@ public SwipeBuilder3<EpoxyModel> withTargets(
 //                                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTargets().
 //                                               display_name withTargets
 //                                               signature_documentation java public SwipeBuilder3<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)
+//                                               kind Method
 //                                               documentation  Specify which Epoxy model types are swipable. Use this if you have more than one type that\n is swipable.\n <p>\n If you only have one swipable type you should use {@link #withTarget(Class)}\n
         Class<? extends EpoxyModel>... targetModelClasses) {
 //      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
@@ -1117,6 +1180,7 @@ public SwipeBuilder3<EpoxyModel> forAllModels() {
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#forAllModels().
 //                                                display_name forAllModels
 //                                                signature_documentation java public SwipeBuilder3<EpoxyModel> forAllModels()
+//                                                kind Method
 //                                                documentation  Use this if all models in the controller should be swipable, and if there are multiple types\n of models in the controller.\n <p>\n If you only have one model type you should use {@link #withTarget(Class)}\n
       return withTarget(EpoxyModel.class);
 //           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().
@@ -1129,9 +1193,11 @@ public static class SwipeBuilder3<U extends EpoxyModel> {
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
 //                                  display_name SwipeBuilder3
 //                                  signature_documentation java public static class SwipeBuilder3<U extends EpoxyModel>
+//                                  kind Class
 //                                  ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                    display_name U
 //                                    signature_documentation java U extends EpoxyModel
+//                                    kind TypeParameter
 //                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 
     private final RecyclerView recyclerView;
@@ -1139,16 +1205,19 @@ public static class SwipeBuilder3<U extends EpoxyModel> {
 //                             ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#recyclerView.
 //                                          display_name recyclerView
 //                                          signature_documentation java private final unresolved_type recyclerView
+//                                          kind Field
     private final int movementFlags;
 //                    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#movementFlags.
 //                                  display_name movementFlags
 //                                  signature_documentation java private final int movementFlags
+//                                  kind Field
     private final Class<U> targetModelClass;
 //                ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                         ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClass.
 //                                          display_name targetModelClass
 //                                          signature_documentation java private final Class<U> targetModelClass
+//                                          kind Field
     private final List<Class<? extends EpoxyModel>> targetModelClasses;
 //                ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
@@ -1156,11 +1225,13 @@ public static class SwipeBuilder3<U extends EpoxyModel> {
 //                                                  ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClasses.
 //                                                                     display_name targetModelClasses
 //                                                                     signature_documentation java private final List<Class<? extends EpoxyModel>> targetModelClasses
+//                                                                     kind Field
 
     private SwipeBuilder3(
 //          ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`().
 //                        display_name <init>
 //                        signature_documentation java private SwipeBuilder3(unresolved_type recyclerView, int movementFlags, Class<U> targetModelClass, List<Class<? extends EpoxyModel>> targetModelClasses)
+//                        kind Constructor
         RecyclerView recyclerView, int movementFlags,
 //      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                   ^^^^^^^^^^^^ definition local 67
@@ -1218,6 +1289,7 @@ public ItemTouchHelper andCallbacks(final SwipeCallbacks<U> callbacks) {
 //                         ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#andCallbacks().
 //                                      display_name andCallbacks
 //                                      signature_documentation java public unresolved_type andCallbacks(SwipeCallbacks<U> callbacks)
+//                                      kind Method
 //                                      documentation  Set callbacks to handle swipe actions and lifecycle events.\n <p>\n You MUST implement {@link SwipeCallbacks#onSwipeCompleted(EpoxyModel, View, int, int)} to\n remove the swiped item from your data and request a model build.\n <p>\n You can optionally implement the other callbacks to modify the view as it is being swiped.\n\n @return An {@link ItemTouchHelper} instance that has been initialized and attached to a\n recyclerview. The touch helper has already been fully set up and can be ignored, but you may\n want to hold a reference to it if you need to later detach the recyclerview to disable touch\n events via setting null on {@link ItemTouchHelper#attachToRecyclerView(RecyclerView)}\n
 //                                            ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#
 //                                                           ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
@@ -1243,6 +1315,7 @@ public int getMovementFlagsForModel(U model, int adapterPosition) {
 //                                              display_name getMovementFlagsForModel
 //                                              signature_documentation java @Override\npublic int getMovementFlagsForModel(U model, int adapterPosition)
 //                                              enclosing_symbol local 74
+//                                              kind Method
 //                                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
 //                                                ^^^^^ definition local 78
@@ -1264,6 +1337,7 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                                             display_name isTouchableModel
 //                                             signature_documentation java @Override\nprotected boolean isTouchableModel(EpoxyModel<?> model)
 //                                             enclosing_symbol local 74
+//                                             kind Method
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#isTouchableModel().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 81
@@ -1303,6 +1377,7 @@ public void onSwipeStarted(U model, View itemView, int adapterPosition) {
 //                                     display_name onSwipeStarted
 //                                     signature_documentation java @Override\npublic void onSwipeStarted(U model, unresolved_type itemView, int adapterPosition)
 //                                     enclosing_symbol local 74
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted().
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
@@ -1334,6 +1409,7 @@ public void onSwipeProgressChanged(U model, View itemView, float swipeProgress,
 //                                             display_name onSwipeProgressChanged
 //                                             signature_documentation java @Override\npublic void onSwipeProgressChanged(U model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
 //                                             enclosing_symbol local 74
+//                                             kind Method
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged().
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
@@ -1372,6 +1448,7 @@ public void onSwipeCompleted(U model, View itemView, int position, int direction
 //                                       display_name onSwipeCompleted
 //                                       signature_documentation java @Override\npublic void onSwipeCompleted(U model, unresolved_type itemView, int position, int direction)
 //                                       enclosing_symbol local 74
+//                                       kind Method
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted().
 //                                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                       ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
@@ -1408,6 +1485,7 @@ public void onSwipeReleased(U model, View itemView) {
 //                                      display_name onSwipeReleased
 //                                      signature_documentation java @Override\npublic void onSwipeReleased(U model, unresolved_type itemView)
 //                                      enclosing_symbol local 74
+//                                      kind Method
 //                                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased().
 //                                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                                      ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
@@ -1434,6 +1512,7 @@ public void clearView(U model, View itemView) {
 //                                display_name clearView
 //                                signature_documentation java @Override\npublic void clearView(U model, unresolved_type itemView)
 //                                enclosing_symbol local 74
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
@@ -1471,14 +1550,17 @@ public abstract static class SwipeCallbacks<T extends EpoxyModel>
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#
 //                                            display_name SwipeCallbacks
 //                                            signature_documentation java public abstract static class SwipeCallbacks<T extends EpoxyModel>
+//                                            kind Class
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#
 //                                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                             ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#`<init>`().
 //                                            display_name <init>
 //                                            signature_documentation java public SwipeCallbacks()
+//                                            kind Constructor
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                              display_name T
 //                                              signature_documentation java T extends EpoxyModel
+//                                              kind TypeParameter
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
       implements EpoxySwipeCallback<T> {
 //               ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
@@ -1490,6 +1572,7 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) {
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted().
 //                             display_name onSwipeStarted
 //                             signature_documentation java @Override\npublic void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition)
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted().
 //                             ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                               ^^^^^ definition local 104
@@ -1514,6 +1597,7 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged().
 //                                     display_name onSwipeProgressChanged
 //                                     signature_documentation java @Override\npublic void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged().
 //                                     ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                       ^^^^^ definition local 107
@@ -1544,6 +1628,7 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress,
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted().
 //                                        display_name onSwipeCompleted
 //                                        signature_documentation java @Override\npublic abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction)
+//                                        kind AbstractMethod
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted().
 //                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                          ^^^^^ definition local 111
@@ -1570,6 +1655,7 @@ public void onSwipeReleased(T model, View itemView) {
 //              ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased().
 //                              display_name onSwipeReleased
 //                              signature_documentation java @Override\npublic void onSwipeReleased(T model, unresolved_type itemView)
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased().
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                ^^^^^ definition local 115
@@ -1590,6 +1676,7 @@ public void clearView(T model, View itemView) {
 //              ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView().
 //                        display_name clearView
 //                        signature_documentation java @Override\npublic void clearView(T model, unresolved_type itemView)
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView().
 //                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                          ^^^^^ definition local 117
@@ -1613,6 +1700,7 @@ public boolean isSwipeEnabledForModel(T model) {
 //                 ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#isSwipeEnabledForModel().
 //                                        display_name isSwipeEnabledForModel
 //                                        signature_documentation java public boolean isSwipeEnabledForModel(T model)
+//                                        kind Method
 //                                        documentation  Whether the given model should be swipable.\n <p>\n True by default. You may override this to toggle swipabaility for a model.\n
 //                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                          ^^^^^ definition local 119
@@ -1628,6 +1716,7 @@ public final int getMovementFlagsForModel(T model, int adapterPosition) {
 //                   ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel().
 //                                            display_name getMovementFlagsForModel
 //                                            signature_documentation java @Override\npublic final int getMovementFlagsForModel(T model, int adapterPosition)
+//                                            kind Method
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel().
 //                                            ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T]
 //                                              ^^^^^ definition local 120
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
index 21cd94033..6896a3edf 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java
@@ -35,11 +35,13 @@ public abstract class EpoxyTouchHelperCallback extends ItemTouchHelper.Callback
 //                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#
 //                                             display_name EpoxyTouchHelperCallback
 //                                             signature_documentation java public abstract class EpoxyTouchHelperCallback
+//                                             kind Class
 //                                             documentation  A wrapper around {@link androidx.recyclerview.widget.ItemTouchHelper.Callback} to cast all\n view holders to {@link com.airbnb.epoxy.EpoxyViewHolder} for simpler use with Epoxy.\n
 //                                             relationship is_implementation semanticdb maven . . ItemTouchHelper/Callback#
 //                    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#`<init>`().
 //                                             display_name <init>
 //                                             signature_documentation java public EpoxyTouchHelperCallback()
+//                                             kind Constructor
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . ItemTouchHelper/
 //                                                                     ^^^^^^^^ reference semanticdb maven . . ItemTouchHelper/Callback#
 
@@ -49,6 +51,7 @@ public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHold
 //                 ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags().
 //                                  display_name getMovementFlags
 //                                  signature_documentation java @Override\npublic final int getMovementFlags(unresolved_type recyclerView, unresolved_type viewHolder)
+//                                  kind Method
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                               ^^^^^^^^^^^^ definition local 0
@@ -74,6 +77,7 @@ public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHold
 //                       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(+1).
 //                                        display_name getMovementFlags
 //                                        signature_documentation java protected abstract int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder)
+//                                        kind AbstractMethod
 //                                        documentation  @see #getMovementFlags(RecyclerView, ViewHolder)\n
 //                                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
 //                                        ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -93,6 +97,7 @@ public final boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder, Vi
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove().
 //                            display_name onMove
 //                            signature_documentation java @Override\npublic final boolean onMove(unresolved_type recyclerView, unresolved_type viewHolder, unresolved_type target)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                         ^^^^^^^^^^^^ definition local 4
@@ -125,6 +130,7 @@ protected abstract boolean onMove(RecyclerView recyclerView, EpoxyViewHolder vie
 //                           ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(+1).
 //                                  display_name onMove
 //                                  signature_documentation java protected abstract boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target)
+//                                  kind AbstractMethod
 //                                  documentation  @see #onMove(RecyclerView, ViewHolder, ViewHolder)\n
 //                                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -150,6 +156,7 @@ public final void onSwiped(ViewHolder viewHolder, int direction) {
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped().
 //                           display_name onSwiped
 //                           signature_documentation java @Override\npublic final void onSwiped(unresolved_type viewHolder, int direction)
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
 //                           ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                      ^^^^^^^^^^ definition local 10
@@ -174,6 +181,7 @@ public final void onSwiped(ViewHolder viewHolder, int direction) {
 //                        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped(+-1).
 //                                 display_name onSwiped
 //                                 signature_documentation java protected abstract void onSwiped(EpoxyViewHolder viewHolder, int direction)
+//                                 kind AbstractMethod
 //                                 documentation  @see #onSwiped(ViewHolder, int)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 12
@@ -191,6 +199,7 @@ public final boolean canDropOver(RecyclerView recyclerView, ViewHolder current,
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver().
 //                                 display_name canDropOver
 //                                 signature_documentation java @Override\npublic final boolean canDropOver(unresolved_type recyclerView, unresolved_type current, unresolved_type target)
+//                                 kind Method
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                                 ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                              ^^^^^^^^^^^^ definition local 14
@@ -224,6 +233,7 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(+1).
 //                              display_name canDropOver
 //                              signature_documentation java protected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target)
+//                              kind Method
 //                              documentation  @see #canDropOver(RecyclerView, ViewHolder, ViewHolder)\n
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver().
 //                              ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -256,6 +266,7 @@ public final float getSwipeThreshold(ViewHolder viewHolder) {
 //                   ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold().
 //                                     display_name getSwipeThreshold
 //                                     signature_documentation java @Override\npublic final float getSwipeThreshold(unresolved_type viewHolder)
+//                                     kind Method
 //                                     ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                ^^^^^^^^^^ definition local 20
 //                                                           display_name viewHolder
@@ -274,6 +285,7 @@ protected float getSwipeThreshold(EpoxyViewHolder viewHolder) {
 //                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold(+-1).
 //                                  display_name getSwipeThreshold
 //                                  signature_documentation java protected float getSwipeThreshold(EpoxyViewHolder viewHolder)
+//                                  kind Method
 //                                  documentation  @see #getSwipeThreshold(ViewHolder)\n
 //                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                  ^^^^^^^^^^ definition local 21
@@ -292,6 +304,7 @@ public final float getMoveThreshold(ViewHolder viewHolder) {
 //                   ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold().
 //                                    display_name getMoveThreshold
 //                                    signature_documentation java @Override\npublic final float getMoveThreshold(unresolved_type viewHolder)
+//                                    kind Method
 //                                    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                               ^^^^^^^^^^ definition local 22
 //                                                          display_name viewHolder
@@ -310,6 +323,7 @@ protected float getMoveThreshold(EpoxyViewHolder viewHolder) {
 //                ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold(+-1).
 //                                 display_name getMoveThreshold
 //                                 signature_documentation java protected float getMoveThreshold(EpoxyViewHolder viewHolder)
+//                                 kind Method
 //                                 documentation  @see #getMoveThreshold(ViewHolder)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 23
@@ -329,6 +343,7 @@ public final ViewHolder chooseDropTarget(ViewHolder selected, List dropTargets,
 //                        ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget().
 //                                         display_name chooseDropTarget
 //                                         signature_documentation java @Override\npublic final unresolved_type chooseDropTarget(unresolved_type selected, List dropTargets, int curX, int curY)
+//                                         kind Method
 //                                         ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                                    ^^^^^^^^ definition local 24
 //                                                             display_name selected
@@ -369,6 +384,7 @@ protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected,
 //                          ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(+1).
 //                                           display_name chooseDropTarget
 //                                           signature_documentation java protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected, List<EpoxyViewHolder> dropTargets, int curX, int curY)
+//                                           kind Method
 //                                           documentation  @see #chooseDropTarget(ViewHolder, List, int, int)\n
 //                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                           ^^^^^^^^ definition local 28
@@ -409,6 +425,7 @@ public final void onSelectedChanged(ViewHolder viewHolder, int actionState) {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged().
 //                                    display_name onSelectedChanged
 //                                    signature_documentation java @Override\npublic final void onSelectedChanged(unresolved_type viewHolder, int actionState)
+//                                    kind Method
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
 //                                    ^^^^^^^^^^ reference semanticdb maven . . ViewHolder#
 //                                               ^^^^^^^^^^ definition local 32
@@ -433,6 +450,7 @@ protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged(+-1).
 //                                 display_name onSelectedChanged
 //                                 signature_documentation java protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState)
+//                                 kind Method
 //                                 documentation  @see #onSelectedChanged(ViewHolder, int)\n
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^^^^^ definition local 34
@@ -456,6 +474,7 @@ public final void onMoved(RecyclerView recyclerView, ViewHolder viewHolder, int
 //                  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved().
 //                          display_name onMoved
 //                          signature_documentation java @Override\npublic final void onMoved(unresolved_type recyclerView, unresolved_type viewHolder, int fromPos, unresolved_type target, int toPos, int x, int y)
+//                          kind Method
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                       ^^^^^^^^^^^^ definition local 36
 //                                                    display_name recyclerView
@@ -510,6 +529,7 @@ protected void onMoved(RecyclerView recyclerView, EpoxyViewHolder viewHolder, in
 //               ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(+1).
 //                       display_name onMoved
 //                       signature_documentation java protected void onMoved(unresolved_type recyclerView, EpoxyViewHolder viewHolder, int fromPos, EpoxyViewHolder target, int toPos, int x, int y)
+//                       kind Method
 //                       documentation  @see #onMoved(RecyclerView, ViewHolder, int, ViewHolder, int, int, int)\n
 //                       ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
 //                                    ^^^^^^^^^^^^ definition local 43
@@ -561,6 +581,7 @@ public final void clearView(RecyclerView recyclerView, ViewHolder viewHolder) {
 //                  ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView().
 //                            display_name clearView
 //                            signature_documentation java @Override\npublic final void clearView(unresolved_type recyclerView, unresolved_type viewHolder)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
 //                            ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#
@@ -587,6 +608,7 @@ protected void clearView(RecyclerView recyclerView, EpoxyViewHolder viewHolder)
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(+1).
 //                         display_name clearView
 //                         signature_documentation java protected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder)
+//                         kind Method
 //                         documentation  @see #clearView(RecyclerView, ViewHolder)\n
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView().
 //                         relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1).
@@ -613,6 +635,7 @@ public final void onChildDraw(Canvas c, RecyclerView recyclerView, ViewHolder vi
 //                  ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw().
 //                              display_name onChildDraw
 //                              signature_documentation java @Override\npublic final void onChildDraw(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                              ^^^^^^ reference semanticdb maven . . Canvas#
 //                                     ^ definition local 54
@@ -668,6 +691,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(+1).
 //                           display_name onChildDraw
 //                           signature_documentation java protected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
+//                           kind Method
 //                           documentation  @see #onChildDraw(Canvas, RecyclerView, ViewHolder, float, float, int, boolean)\n
 //                           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
 //                           ^^^^^^ reference semanticdb maven . . Canvas#
@@ -720,6 +744,7 @@ public final void onChildDrawOver(Canvas c, RecyclerView recyclerView, ViewHolde
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver().
 //                                  display_name onChildDrawOver
 //                                  signature_documentation java @Override\npublic final void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
+//                                  kind Method
 //                                  ^^^^^^ reference semanticdb maven . . Canvas#
 //                                         ^ definition local 68
 //                                           display_name c
@@ -774,6 +799,7 @@ protected void onChildDrawOver(Canvas c, RecyclerView recyclerView, EpoxyViewHol
 //               ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(+1).
 //                               display_name onChildDrawOver
 //                               signature_documentation java protected void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive)
+//                               kind Method
 //                               documentation  @see #onChildDrawOver(Canvas, RecyclerView, ViewHolder, float, float, int, boolean)\n
 //                               ^^^^^^ reference semanticdb maven . . Canvas#
 //                                      ^ definition local 75
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
index d98d98066..94e1e7575 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java
@@ -55,6 +55,7 @@ public class EpoxyViewHolder extends RecyclerView.ViewHolder {
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                           display_name EpoxyViewHolder
 //                           signature_documentation java @SuppressWarnings("WeakerAccess")\npublic class EpoxyViewHolder
+//                           kind Class
 //                           relationship is_implementation semanticdb maven . . RecyclerView/ViewHolder#
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView/
 //                                                ^^^^^^^^^^ reference semanticdb maven . . RecyclerView/ViewHolder#
@@ -64,17 +65,20 @@ public class EpoxyViewHolder extends RecyclerView.ViewHolder {
 //                                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyModel.
 //                                                            display_name epoxyModel
 //                                                            signature_documentation java @SuppressWarnings("rawtypes")\nprivate EpoxyModel epoxyModel
+//                                                            kind Field
   private List<Object> payloads;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //             ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#payloads.
 //                              display_name payloads
 //                              signature_documentation java private List<Object> payloads
+//                              kind Field
   private EpoxyHolder epoxyHolder;
 //        ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyHolder#
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder.
 //                                display_name epoxyHolder
 //                                signature_documentation java private EpoxyHolder epoxyHolder
+//                                kind Field
   @Nullable ViewHolderState.ViewState initialViewState;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
@@ -82,6 +86,7 @@ public class EpoxyViewHolder extends RecyclerView.ViewHolder {
 //                                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#initialViewState.
 //                                                     display_name initialViewState
 //                                                     signature_documentation java @Nullable\nViewState initialViewState
+//                                                     kind Field
 
   // Once the EpoxyHolder is created parent will be set to null.
   private ViewParent parent;
@@ -89,11 +94,13 @@ public class EpoxyViewHolder extends RecyclerView.ViewHolder {
 //                   ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#parent.
 //                          display_name parent
 //                          signature_documentation java private unresolved_type parent
+//                          kind Field
 
   public EpoxyViewHolder(ViewParent parent, View view, boolean saveInitialState) {
 //       ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java public EpoxyViewHolder(unresolved_type parent, unresolved_type view, boolean saveInitialState)
+//                       kind Constructor
 //                       ^^^^^^^^^^ reference semanticdb maven . . ViewParent#
 //                                  ^^^^^^ definition local 0
 //                                         display_name parent
@@ -133,6 +140,7 @@ void restoreInitialViewState() {
 //     ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#restoreInitialViewState().
 //                             display_name restoreInitialViewState
 //                             signature_documentation java void restoreInitialViewState()
+//                             kind Method
     if (initialViewState != null) {
 //      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#initialViewState.
       initialViewState.restore(itemView);
@@ -146,6 +154,7 @@ public void bind(@SuppressWarnings("rawtypes") EpoxyModel model,
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#bind().
 //                 display_name bind
 //                 signature_documentation java public void bind(EpoxyModel model, EpoxyModel<?> previouslyBoundModel, List<Object> payloads, int position)
+//                 kind Method
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
 //                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                          ^^^^^ definition local 3
@@ -255,6 +264,7 @@ Object objectToBind() {
 //       ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#objectToBind().
 //                    display_name objectToBind
 //                    signature_documentation java @NonNull\nObject objectToBind()
+//                    kind Method
     return epoxyHolder != null ? epoxyHolder : itemView;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder.
 //                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder.
@@ -265,6 +275,7 @@ public void unbind() {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#unbind().
 //                   display_name unbind
 //                   signature_documentation java public void unbind()
+//                   kind Method
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     // noinspection unchecked
@@ -283,6 +294,7 @@ public void visibilityStateChanged(@Visibility int visibilityState) {
 //            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityStateChanged().
 //                                   display_name visibilityStateChanged
 //                                   signature_documentation java public void visibilityStateChanged(int visibilityState)
+//                                   kind Method
 //                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                                                   ^^^^^^^^^^^^^^^ definition local 7
 //                                                                   display_name visibilityState
@@ -302,6 +314,7 @@ public void visibilityChanged(
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#visibilityChanged().
 //                              display_name visibilityChanged
 //                              signature_documentation java public void visibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth)
+//                              kind Method
       @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleHeight,
 //     ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#
 //                ^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/FloatRange#from().
@@ -351,6 +364,7 @@ public List<Object> getPayloads() {
 //                    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getPayloads().
 //                                display_name getPayloads
 //                                signature_documentation java public List<Object> getPayloads()
+//                                kind Method
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     return payloads;
@@ -362,6 +376,7 @@ public EpoxyModel<?> getModel() {
 //                     ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
 //                              display_name getModel
 //                              signature_documentation java public EpoxyModel<?> getModel()
+//                              kind Method
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     return epoxyModel;
@@ -373,6 +388,7 @@ public EpoxyHolder getHolder() {
 //                   ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getHolder().
 //                             display_name getHolder
 //                             signature_documentation java public EpoxyHolder getHolder()
+//                             kind Method
     assertBound();
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
     return epoxyHolder;
@@ -383,6 +399,7 @@ private void assertBound() {
 //             ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#assertBound().
 //                         display_name assertBound
 //                         signature_documentation java private void assertBound()
+//                         kind Method
     if (epoxyModel == null) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyModel.
       throw new IllegalStateException("This holder is not currently bound.");
@@ -397,6 +414,7 @@ public String toString() {
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#toString().
 //                       display_name toString
 //                       signature_documentation java @Override\npublic String toString()
+//                       kind Method
     return "EpoxyViewHolder{"
         + "epoxyModel=" + epoxyModel
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#epoxyModel.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
index d9283c54f..2f67c4c8a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java
@@ -5,10 +5,12 @@ public interface GeneratedModel<T> {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#
 //                              display_name GeneratedModel
 //                              signature_documentation java public interface GeneratedModel<T>
+//                              kind Interface
 //                              documentation Interface applied to generated models to allow the base adapter to interact with them. 
 //                              ^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
 //                                display_name T
 //                                signature_documentation java T
+//                                kind TypeParameter
   /**
    * Called on the generated model immediately before the main model onBind method has been called.
    * This let's the generated model handle binding setup of its own
@@ -19,6 +21,7 @@ public interface GeneratedModel<T> {
 //     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePreBind().
 //                   display_name handlePreBind
 //                   signature_documentation java public abstract void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position)
+//                   kind AbstractMethod
 //                   documentation  Called on the generated model immediately before the main model onBind method has been called.\n This let's the generated model handle binding setup of its own\n <p>\n The ViewHolder is needed to get the model's adapter position when clicked.\n
 //                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                   ^^^^^^ definition local 0
@@ -47,6 +50,7 @@ public interface GeneratedModel<T> {
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/GeneratedModel#handlePostBind().
 //                    display_name handlePostBind
 //                    signature_documentation java public abstract void handlePostBind(T objectToBind, int position)
+//                    kind AbstractMethod
 //                    documentation  Called on the generated model immediately after the main model onBind method has been called.\n This let's the generated model handle binding of its own and dispatch calls to its onBind\n listener.\n <p>\n We don't want to rely on the main onBind method to dispatch the onBind listener call because\n there are two onBind methods (one for payloads and one for no payloads), and one can call into\n the other. We don't want to dispatch two onBind listener calls in that case.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/GeneratedModel#[T]
 //                      ^^^^^^^^^^^^ definition local 3
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
index 3af455e9b..5dc48802e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
@@ -30,6 +30,7 @@ class HandlerExecutor implements Executor {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#
 //                    display_name HandlerExecutor
 //                    signature_documentation java class HandlerExecutor
+//                    kind Class
 //                    documentation  An executor that does it's work via posting to a Handler.\n <p>\n A key feature of this is the runnable is executed synchronously if the current thread is the\n same as the handler's thread.\n
 //                    relationship is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#
 //                               ^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/Executor#
@@ -38,11 +39,13 @@ class HandlerExecutor implements Executor {
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#handler.
 //                      display_name handler
 //                      signature_documentation java final unresolved_type handler
+//                      kind Field
 
   HandlerExecutor(Handler handler) {
 //^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#`<init>`().
 //                display_name <init>
 //                signature_documentation java HandlerExecutor(unresolved_type handler)
+//                kind Constructor
 //                ^^^^^^^ reference semanticdb maven . . Handler#
 //                        ^^^^^^^ definition local 0
 //                                display_name handler
@@ -59,6 +62,7 @@ public void execute(@NonNull Runnable command) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#execute().
 //                    display_name execute
 //                    signature_documentation java @Override\npublic void execute(Runnable command)
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#execute().
 //                     ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Runnable#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
index 7279603b9..32c6770b7 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java
@@ -21,11 +21,13 @@ class HiddenEpoxyModel extends EpoxyModel<Space> {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#
 //                     display_name HiddenEpoxyModel
 //                     signature_documentation java class HiddenEpoxyModel
+//                     kind Class
 //                     documentation  Used by the {@link EpoxyAdapter} as a placeholder for when {@link EpoxyModel#isShown()} is false.\n Using a zero height and width {@link Space} view, as well as 0 span size, to exclude itself from\n view.\n
 //                     relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
 //                     display_name <init>
 //                     signature_documentation java HiddenEpoxyModel()
+//                     kind Constructor
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^ reference semanticdb maven . . Space#
   @Override
@@ -34,6 +36,7 @@ public int getDefaultLayout() {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getDefaultLayout().
 //                            display_name getDefaultLayout
 //                            signature_documentation java @Override\npublic int getDefaultLayout()
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     return R.layout.view_holder_empty_view;
 //         ^ reference semanticdb maven . . R/
@@ -47,6 +50,7 @@ public int getSpanSize(int spanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize().
 //                       display_name getSpanSize
 //                       signature_documentation java @Override\npublic int getSpanSize(int spanCount, int position, int itemCount)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^ definition local 0
 //                                     display_name spanCount
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
index 5a7c6ee2f..a1b64b9d6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
@@ -12,11 +12,13 @@ public final class IdUtils {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#
 //                         display_name IdUtils
 //                         signature_documentation java public final class IdUtils
+//                         kind Class
 //                         documentation  Utilities for generating 64-bit long IDs from types such as {@link CharSequence}.\n
   private IdUtils() {
 //        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#`<init>`().
 //                display_name <init>
 //                signature_documentation java private IdUtils()
+//                kind Constructor
   }
 
   /**
@@ -31,6 +33,7 @@ public static long hashLong64Bit(long value) {
 //                   ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#hashLong64Bit().
 //                                 display_name hashLong64Bit
 //                                 signature_documentation java public static long hashLong64Bit(long value)
+//                                 kind StaticMethod
 //                                 documentation  Hash a long into 64 bits instead of the normal 32. This uses a xor shift implementation to\n attempt psuedo randomness so object ids have an even spread for less chance of collisions.\n <p>\n From http://stackoverflow.com/a/11554034\n <p>\n http://www.javamex.com/tutorials/random_numbers/xorshift.shtml\n
 //                                      ^^^^^ definition local 0
 //                                            display_name value
@@ -62,6 +65,7 @@ public static long hashString64Bit(@Nullable CharSequence str) {
 //                   ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                   display_name hashString64Bit
 //                                   signature_documentation java public static long hashString64Bit(CharSequence str)
+//                                   kind StaticMethod
 //                                   documentation  Hash a string into 64 bits instead of the normal 32. This allows us to better use strings as a\n model id with less chance of collisions. This uses the FNV-1a algorithm for a good mix of speed\n and distribution.\n <p>\n Performance comparisons found at http://stackoverflow.com/a/1660613\n <p>\n Hash implementation from http://www.isthe.com/chongo/tech/comp/fnv/index.html#FNV-1a\n
 //                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
index 53367faec..ab425d73a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java
@@ -4,6 +4,7 @@ public class IllegalEpoxyUsage extends RuntimeException {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IllegalEpoxyUsage#
 //                             display_name IllegalEpoxyUsage
 //                             signature_documentation java public class IllegalEpoxyUsage
+//                             kind Class
 //                             relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/Exception#
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/RuntimeException#
@@ -13,6 +14,7 @@ public IllegalEpoxyUsage(String message) {
 //       ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/IllegalEpoxyUsage#`<init>`().
 //                         display_name <init>
 //                         signature_documentation java public IllegalEpoxyUsage(String message)
+//                         kind Constructor
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                ^^^^^^^ definition local 0
 //                                        display_name message
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
index 6c51c9084..ebf633feb 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java
@@ -12,6 +12,7 @@ class ImmutableModelException extends RuntimeException {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#
 //                            display_name ImmutableModelException
 //                            signature_documentation java class ImmutableModelException
+//                            kind Class
 //                            documentation  Thrown if a model is changed after it is added to an {@link com.airbnb.epoxy.EpoxyController}.\n
 //                            relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                            relationship is_implementation semanticdb maven jdk 11 java/lang/Exception#
@@ -23,6 +24,7 @@ class ImmutableModelException extends RuntimeException {
 //                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#MODEL_CANNOT_BE_CHANGED_MESSAGE.
 //                                                            display_name MODEL_CANNOT_BE_CHANGED_MESSAGE
 //                                                            signature_documentation java private static final String MODEL_CANNOT_BE_CHANGED_MESSAGE
+//                                                            kind StaticField
       "Epoxy attribute fields on a model cannot be changed once the model is added to a "
           + "controller. Check that these fields are not updated, or that the assigned objects "
           + "are not mutated, outside of the buildModels method. The only exception is if "
@@ -35,6 +37,7 @@ class ImmutableModelException extends RuntimeException {
 //^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`().
 //                        display_name <init>
 //                        signature_documentation java ImmutableModelException(EpoxyModel model, int modelPosition)
+//                        kind Constructor
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 0
 //                                         display_name model
@@ -54,6 +57,7 @@ class ImmutableModelException extends RuntimeException {
 //^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#`<init>`(+1).
 //                        display_name <init>
 //                        signature_documentation java ImmutableModelException(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition)
+//                        kind Constructor
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                   ^^^^^ definition local 2
 //                                         display_name model
@@ -84,6 +88,7 @@ private static String buildMessage(EpoxyModel model,
 //                      ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ImmutableModelException#buildMessage().
 //                                   display_name buildMessage
 //                                   signature_documentation java @NonNull\nprivate static String buildMessage(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition)
+//                                   kind StaticMethod
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 5
 //                                                    display_name model
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
index 67a5c448c..0e6dc227f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
@@ -29,9 +29,11 @@ public class ListenersUtils {
 //           ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#
 //                          display_name ListenersUtils
 //                          signature_documentation java public class ListenersUtils
+//                          kind Class
 //           ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#`<init>`().
 //                          display_name <init>
 //                          signature_documentation java public ListenersUtils()
+//                          kind Constructor
 
   @Nullable
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
@@ -40,6 +42,7 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
 //                                                  display_name getEpoxyHolderForChildView
 //                                                  signature_documentation java @Nullable\nstatic EpoxyViewHolder getEpoxyHolderForChildView(unresolved_type v)
+//                                                  kind StaticMethod
 //                                                  ^^^^ reference semanticdb maven . . View#
 //                                                       ^ definition local 0
 //                                                         display_name v
@@ -90,6 +93,7 @@ private static RecyclerView findParentRecyclerView(@Nullable View v) {
 //                            ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
 //                                                   display_name findParentRecyclerView
 //                                                   signature_documentation java @Nullable\nprivate static unresolved_type findParentRecyclerView(unresolved_type v)
+//                                                   kind StaticMethod
 //                                                    ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                                             ^^^^ reference semanticdb maven . . View#
 //                                                                  ^ definition local 3
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
index 7a8801ec1..93461bc9f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java
@@ -15,6 +15,7 @@ class MainThreadExecutor extends HandlerExecutor {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                       display_name MainThreadExecutor
 //                       signature_documentation java class MainThreadExecutor
+//                       kind Class
 //                       relationship is_implementation semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#
 //                       relationship is_implementation semanticdb maven jdk 11 java/util/concurrent/Executor#
 //                               ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HandlerExecutor#
@@ -23,18 +24,21 @@ class MainThreadExecutor extends HandlerExecutor {
 //                                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
 //                                         display_name INSTANCE
 //                                         signature_documentation java static final MainThreadExecutor INSTANCE
+//                                         kind StaticField
 //                                               ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
   static final MainThreadExecutor ASYNC_INSTANCE = new MainThreadExecutor(true);
 //             ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#
 //                                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#ASYNC_INSTANCE.
 //                                               display_name ASYNC_INSTANCE
 //                                               signature_documentation java static final MainThreadExecutor ASYNC_INSTANCE
+//                                               kind StaticField
 //                                                     ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
 
   MainThreadExecutor(boolean async) {
 //^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/MainThreadExecutor#`<init>`().
 //                   display_name <init>
 //                   signature_documentation java MainThreadExecutor(boolean async)
+//                   kind Constructor
 //                           ^^^^^ definition local 0
 //                                 display_name async
 //                                 signature_documentation java boolean async
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
index d662367f2..520f4b0e5 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
@@ -47,6 +47,7 @@ class ModelList extends ArrayList<EpoxyModel<?>> {
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#
 //              display_name ModelList
 //              signature_documentation java class ModelList
+//              kind Class
 //              documentation  Used by our {@link EpoxyAdapter} to track models. It simply wraps ArrayList and notifies an\n observer when remove or insertion operations are done on the list. This allows us to optimize\n diffing since we have a knowledge of what changed in the list.\n
 //              relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //              relationship is_implementation semanticdb maven jdk 11 java/lang/Cloneable#
@@ -64,6 +65,7 @@ class ModelList extends ArrayList<EpoxyModel<?>> {
 //^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`().
 //          display_name <init>
 //          signature_documentation java ModelList(int expectedModelCount)
+//          kind Constructor
 //              ^^^^^^^^^^^^^^^^^^ definition local 0
 //                                 display_name expectedModelCount
 //                                 signature_documentation java int expectedModelCount
@@ -77,6 +79,7 @@ class ModelList extends ArrayList<EpoxyModel<?>> {
 //^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#`<init>`(+1).
 //          display_name <init>
 //          signature_documentation java ModelList()
+//          kind Constructor
 
   }
 
@@ -84,10 +87,12 @@ interface ModelListObserver {
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                            display_name ModelListObserver
 //                            signature_documentation java interface ModelListObserver
+//                            kind Interface
     void onItemRangeInserted(int positionStart, int itemCount);
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted().
 //                           display_name onItemRangeInserted
 //                           signature_documentation java public abstract void onItemRangeInserted(int positionStart, int itemCount)
+//                           kind AbstractMethod
 //                               ^^^^^^^^^^^^^ definition local 1
 //                                             display_name positionStart
 //                                             signature_documentation java int positionStart
@@ -100,6 +105,7 @@ interface ModelListObserver {
 //       ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved().
 //                          display_name onItemRangeRemoved
 //                          signature_documentation java public abstract void onItemRangeRemoved(int positionStart, int itemCount)
+//                          kind AbstractMethod
 //                              ^^^^^^^^^^^^^ definition local 3
 //                                            display_name positionStart
 //                                            signature_documentation java int positionStart
@@ -114,16 +120,19 @@ interface ModelListObserver {
 //                ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
 //                                    display_name notificationsPaused
 //                                    signature_documentation java private boolean notificationsPaused
+//                                    kind Field
   private ModelListObserver observer;
 //        ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#observer.
 //                                   display_name observer
 //                                   signature_documentation java private ModelListObserver observer
+//                                   kind Field
 
   void pauseNotifications() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#pauseNotifications().
 //                        display_name pauseNotifications
 //                        signature_documentation java void pauseNotifications()
+//                        kind Method
     if (notificationsPaused) {
 //      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
       throw new IllegalStateException("Notifications already paused");
@@ -137,6 +146,7 @@ void resumeNotifications() {
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#resumeNotifications().
 //                         display_name resumeNotifications
 //                         signature_documentation java void resumeNotifications()
+//                         kind Method
     if (!notificationsPaused) {
 //       ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#notificationsPaused.
       throw new IllegalStateException("Notifications already resumed");
@@ -150,6 +160,7 @@ void setObserver(ModelListObserver observer) {
 //     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#setObserver().
 //                 display_name setObserver
 //                 signature_documentation java void setObserver(ModelListObserver observer)
+//                 kind Method
 //                 ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#ModelListObserver#
 //                                   ^^^^^^^^ definition local 5
 //                                            display_name observer
@@ -164,6 +175,7 @@ private void notifyInsertion(int positionStart, int itemCount) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notifyInsertion().
 //                             display_name notifyInsertion
 //                             signature_documentation java private void notifyInsertion(int positionStart, int itemCount)
+//                             kind Method
 //                                 ^^^^^^^^^^^^^ definition local 6
 //                                               display_name positionStart
 //                                               signature_documentation java int positionStart
@@ -187,6 +199,7 @@ private void notifyRemoval(int positionStart, int itemCount) {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#notifyRemoval().
 //                           display_name notifyRemoval
 //                           signature_documentation java private void notifyRemoval(int positionStart, int itemCount)
+//                           kind Method
 //                               ^^^^^^^^^^^^^ definition local 8
 //                                             display_name positionStart
 //                                             signature_documentation java int positionStart
@@ -213,6 +226,7 @@ public EpoxyModel<?> set(int index, EpoxyModel<?> element) {
 //                     ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#set().
 //                         display_name set
 //                         signature_documentation java @Override\npublic EpoxyModel<?> set(int index, EpoxyModel<?> element)
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#set().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#set().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#set().
@@ -259,6 +273,7 @@ public boolean add(EpoxyModel<?> epoxyModel) {
 //               ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#add().
 //                   display_name add
 //                   signature_documentation java @Override\npublic boolean add(EpoxyModel<?> epoxyModel)
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#add().
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add().
 //                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#add().
@@ -284,6 +299,7 @@ public void add(int index, EpoxyModel<?> element) {
 //            ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#add(+1).
 //                display_name add
 //                signature_documentation java @Override\npublic void add(int index, EpoxyModel<?> element)
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add(+1).
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#add(+1).
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#add(+1).
@@ -312,6 +328,7 @@ public boolean addAll(Collection<? extends EpoxyModel<?>> c) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#addAll().
 //                      display_name addAll
 //                      signature_documentation java @Override\npublic boolean addAll(Collection<? extends EpoxyModel<?>> c)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#addAll().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#addAll().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#addAll().
@@ -339,6 +356,7 @@ public boolean addAll(int index, Collection<? extends EpoxyModel<?>> c) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                      display_name addAll
 //                      signature_documentation java @Override\npublic boolean addAll(int index, Collection<? extends EpoxyModel<?>> c)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#addAll().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#addAll(+1).
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#addAll(+1).
@@ -371,6 +389,7 @@ public EpoxyModel<?> remove(int index) {
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#remove().
 //                            display_name remove
 //                            signature_documentation java @Override\npublic EpoxyModel<?> remove(int index)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#remove().
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#remove().
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#remove(+1).
@@ -393,6 +412,7 @@ public boolean remove(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#remove(+1).
 //                      display_name remove
 //                      signature_documentation java @Override\npublic boolean remove(Object o)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#remove().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#remove(+1).
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#remove().
@@ -431,6 +451,7 @@ public void clear() {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#clear().
 //                  display_name clear
 //                  signature_documentation java @Override\npublic void clear()
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#clear().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#clear().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#clear().
@@ -453,6 +474,7 @@ protected void removeRange(int fromIndex, int toIndex) {
 //               ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#removeRange().
 //                           display_name removeRange
 //                           signature_documentation java @Override\nprotected void removeRange(int fromIndex, int toIndex)
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#removeRange().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#removeRange().
 //                               ^^^^^^^^^ definition local 22
@@ -487,6 +509,7 @@ public boolean removeAll(Collection<?> collection) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#removeAll().
 //                         display_name removeAll
 //                         signature_documentation java @Override\npublic boolean removeAll(Collection<?> collection)
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#removeAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#removeAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#removeAll().
@@ -536,6 +559,7 @@ public boolean retainAll(Collection<?> collection) {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#retainAll().
 //                         display_name retainAll
 //                         signature_documentation java @Override\npublic boolean retainAll(Collection<?> collection)
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#retainAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#retainAll().
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#retainAll().
@@ -589,6 +613,7 @@ public Iterator<EpoxyModel<?>> iterator() {
 //                               ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
 //                                        display_name iterator
 //                                        signature_documentation java @NonNull\n@Override\npublic Iterator<EpoxyModel<?>> iterator()
+//                                        kind Method
 //                                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
 //                                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#iterator().
 //                                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#iterator().
@@ -609,31 +634,37 @@ private class Itr implements Iterator<EpoxyModel<?>> {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#
 //                  display_name Itr
 //                  signature_documentation java private class Itr
+//                  kind Class
 //                  documentation  An Iterator implementation that calls through to the parent list's methods for modification.\n Some implementations, like the Android ArrayList.ArrayListIterator class, modify the list data\n directly instead of calling into the parent list's methods. We need the implementation to call\n the parent methods so that the proper notifications are done.\n
 //                  relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#`<init>`().
 //                  display_name <init>
 //                  signature_documentation java private Itr()
+//                  kind Constructor
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
     int cursor;       // index of next element to return
 //      ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
 //             display_name cursor
 //             signature_documentation java int cursor
+//             kind Field
     int lastRet = -1; // index of last element returned; -1 if no such
 //      ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#lastRet.
 //              display_name lastRet
 //              signature_documentation java int lastRet
+//              kind Field
     int expectedModCount = modCount;
 //      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#expectedModCount.
 //                       display_name expectedModCount
 //                       signature_documentation java int expectedModCount
+//                       kind Field
 //                         ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 
     public boolean hasNext() {
 //                 ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#hasNext().
 //                         display_name hasNext
 //                         signature_documentation java public boolean hasNext()
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
       return cursor != size();
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -647,6 +678,7 @@ public EpoxyModel<?> next() {
 //                       ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#next().
 //                            display_name next
 //                            signature_documentation java @SuppressWarnings("unchecked")\npublic EpoxyModel<?> next()
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
@@ -673,6 +705,7 @@ public void remove() {
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#remove().
 //                     display_name remove
 //                     signature_documentation java public void remove()
+//                     kind Method
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
       if (lastRet < 0) {
 //        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#lastRet.
@@ -711,6 +744,7 @@ final void checkForComodification() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
 //                                    display_name checkForComodification
 //                                    signature_documentation java final void checkForComodification()
+//                                    kind Method
       if (modCount != expectedModCount) {
 //        ^^^^^^^^ reference semanticdb maven jdk 11 java/util/AbstractList#modCount.
 //                    ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#expectedModCount.
@@ -730,6 +764,7 @@ public ListIterator<EpoxyModel<?>> listIterator() {
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#listIterator().
 //                                                display_name listIterator
 //                                                signature_documentation java @NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator()
+//                                                kind Method
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator().
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#listIterator(+1).
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#listIterator().
@@ -747,6 +782,7 @@ public ListIterator<EpoxyModel<?>> listIterator(int index) {
 //                                   ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#listIterator(+1).
 //                                                display_name listIterator
 //                                                signature_documentation java @NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator(int index)
+//                                                kind Method
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator(+1).
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#listIterator().
 //                                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#listIterator(+1).
@@ -769,6 +805,7 @@ private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#
 //                      display_name ListItr
 //                      signature_documentation java private class ListItr
+//                      kind Class
 //                      documentation  A ListIterator implementation that calls through to the parent list's methods for modification.\n Some implementations may modify the list data directly instead of calling into the parent\n list's methods. We need the implementation to call the parent methods so that the proper\n notifications are done.\n
 //                      relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#
 //                      relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
@@ -780,6 +817,7 @@ private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#`<init>`().
 //          display_name <init>
 //          signature_documentation java ListItr(int index)
+//          kind Constructor
 //              ^^^^^ definition local 33
 //                    display_name index
 //                    signature_documentation java int index
@@ -793,6 +831,7 @@ public boolean hasPrevious() {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#hasPrevious().
 //                             display_name hasPrevious
 //                             signature_documentation java public boolean hasPrevious()
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasPrevious().
       return cursor != 0;
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -802,6 +841,7 @@ public int nextIndex() {
 //             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#nextIndex().
 //                       display_name nextIndex
 //                       signature_documentation java public int nextIndex()
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#nextIndex().
       return cursor;
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -811,6 +851,7 @@ public int previousIndex() {
 //             ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#previousIndex().
 //                           display_name previousIndex
 //                           signature_documentation java public int previousIndex()
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
       return cursor - 1;
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -823,6 +864,7 @@ public EpoxyModel<?> previous() {
 //                       ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#previous().
 //                                display_name previous
 //                                signature_documentation java @SuppressWarnings("unchecked")\npublic EpoxyModel<?> previous()
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previous().
       checkForComodification();
 //    ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#checkForComodification().
@@ -855,6 +897,7 @@ public void set(EpoxyModel<?> e) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#set().
 //                  display_name set
 //                  signature_documentation java public void set(EpoxyModel<?> e)
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#set().
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^ definition local 35
@@ -891,6 +934,7 @@ public void add(EpoxyModel<?> e) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#add().
 //                  display_name add
 //                  signature_documentation java public void add(EpoxyModel<?> e)
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#add().
 //                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                ^ definition local 37
@@ -943,6 +987,7 @@ public List<EpoxyModel<?>> subList(int start, int end) {
 //                           ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#subList().
 //                                   display_name subList
 //                                   signature_documentation java @NonNull\n@Override\npublic List<EpoxyModel<?>> subList(int start, int end)
+//                                   kind Method
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#subList().
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ArrayList#subList().
 //                                   relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#subList().
@@ -983,6 +1028,7 @@ private static class SubList extends AbstractList<EpoxyModel<?>> {
 //                     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#
 //                             display_name SubList
 //                             signature_documentation java private static class SubList
+//                             kind Class
 //                             documentation  A SubList implementation from Android's AbstractList class. It's copied here to make sure the\n implementation doesn't change, since some implementations, like the Java 1.8 ArrayList.SubList\n class, modify the list data directly instead of calling into the parent list's methods. We need\n the implementation to call the parent methods so that the proper notifications are done.\n
 //                             relationship is_implementation semanticdb maven jdk 11 java/lang/Iterable#
 //                             relationship is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#
@@ -996,19 +1042,23 @@ private static class SubList extends AbstractList<EpoxyModel<?>> {
 //                          ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                   display_name fullList
 //                                   signature_documentation java private final ModelList fullList
+//                                   kind Field
     private int offset;
 //              ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#offset.
 //                     display_name offset
 //                     signature_documentation java private int offset
+//                     kind Field
     private int size;
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#size.
 //                   display_name size
 //                   signature_documentation java private int size
+//                   kind Field
 
     private static final class SubListIterator implements ListIterator<EpoxyModel<?>> {
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#
 //                                             display_name SubListIterator
 //                                             signature_documentation java private static final class SubListIterator
+//                                             kind Class
 //                                             relationship is_implementation semanticdb maven jdk 11 java/util/Iterator#
 //                                             relationship is_implementation semanticdb maven jdk 11 java/util/ListIterator#
 //                                                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
@@ -1018,25 +1068,30 @@ private static final class SubListIterator implements ListIterator<EpoxyModel<?>
 //                          ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#subList.
 //                                  display_name subList
 //                                  signature_documentation java private final SubList subList
+//                                  kind Field
       private final ListIterator<EpoxyModel<?>> iterator;
 //                  ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //                                                       display_name iterator
 //                                                       signature_documentation java private final ListIterator<EpoxyModel<?>> iterator
+//                                                       kind Field
       private int start;
 //                ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#start.
 //                      display_name start
 //                      signature_documentation java private int start
+//                      kind Field
       private int end;
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#end.
 //                    display_name end
 //                    signature_documentation java private int end
+//                    kind Field
 
       SubListIterator(ListIterator<EpoxyModel<?>> it, SubList list, int offset, int length) {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#`<init>`().
 //                    display_name <init>
 //                    signature_documentation java SubListIterator(ListIterator<EpoxyModel<?>> it, SubList list, int offset, int length)
+//                    kind Constructor
 //                    ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#
 //                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                ^^ definition local 42
@@ -1075,6 +1130,7 @@ public void add(EpoxyModel<?> object) {
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#add().
 //                    display_name add
 //                    signature_documentation java public void add(EpoxyModel<?> object)
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#add().
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^ definition local 46
@@ -1096,6 +1152,7 @@ public boolean hasNext() {
 //                   ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#hasNext().
 //                           display_name hasNext
 //                           signature_documentation java public boolean hasNext()
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#hasNext().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasNext().
         return iterator.nextIndex() < end;
@@ -1108,6 +1165,7 @@ public boolean hasPrevious() {
 //                   ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#hasPrevious().
 //                               display_name hasPrevious
 //                               signature_documentation java public boolean hasPrevious()
+//                               kind Method
 //                               relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#hasPrevious().
         return iterator.previousIndex() >= start;
 //             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -1120,6 +1178,7 @@ public EpoxyModel<?> next() {
 //                         ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#next().
 //                              display_name next
 //                              signature_documentation java public EpoxyModel<?> next()
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#next().
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#next().
         if (iterator.nextIndex() < end) {
@@ -1138,6 +1197,7 @@ public int nextIndex() {
 //               ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#nextIndex().
 //                         display_name nextIndex
 //                         signature_documentation java public int nextIndex()
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#nextIndex().
         return iterator.nextIndex() - start;
 //             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -1150,6 +1210,7 @@ public EpoxyModel<?> previous() {
 //                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#previous().
 //                                  display_name previous
 //                                  signature_documentation java public EpoxyModel<?> previous()
+//                                  kind Method
 //                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previous().
         if (iterator.previousIndex() >= start) {
 //          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
@@ -1167,6 +1228,7 @@ public int previousIndex() {
 //               ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#previousIndex().
 //                             display_name previousIndex
 //                             signature_documentation java public int previousIndex()
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         int previous = iterator.previousIndex();
 //          ^^^^^^^^ definition local 47
@@ -1189,6 +1251,7 @@ public void remove() {
 //                ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#remove().
 //                       display_name remove
 //                       signature_documentation java public void remove()
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Iterator#remove().
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#remove().
         iterator.remove();
@@ -1205,6 +1268,7 @@ public void set(EpoxyModel<?> object) {
 //                ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#set().
 //                    display_name set
 //                    signature_documentation java public void set(EpoxyModel<?> object)
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/util/ListIterator#set().
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                  ^^^^^^ definition local 48
@@ -1222,6 +1286,7 @@ public void set(EpoxyModel<?> object) {
 //  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#`<init>`().
 //          display_name <init>
 //          signature_documentation java SubList(ModelList list, int start, int end)
+//          kind Constructor
 //          ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
 //                    ^^^^ definition local 49
 //                         display_name list
@@ -1257,6 +1322,7 @@ public void add(int location, EpoxyModel<?> object) {
 //              ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#add().
 //                  display_name add
 //                  signature_documentation java @Override\npublic void add(int location, EpoxyModel<?> object)
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#add(+1).
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#add(+1).
 //                      ^^^^^^^^ definition local 52
@@ -1304,6 +1370,7 @@ public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collecti
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll().
 //                        display_name addAll
 //                        signature_documentation java @Override\npublic boolean addAll(int location, Collection<? extends EpoxyModel<?>> collection)
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#addAll().
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#addAll(+1).
 //                            ^^^^^^^^ definition local 54
@@ -1361,6 +1428,7 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll(+1).
 //                        display_name addAll
 //                        signature_documentation java @Override\npublic boolean addAll(Collection<? extends EpoxyModel<?>> collection)
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#addAll().
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#addAll().
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#addAll().
@@ -1410,6 +1478,7 @@ public EpoxyModel<?> get(int location) {
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#get().
 //                           display_name get
 //                           signature_documentation java @Override\npublic EpoxyModel<?> get(int location)
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#get().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#get().
 //                               ^^^^^^^^ definition local 59
@@ -1447,6 +1516,7 @@ public Iterator<EpoxyModel<?>> iterator() {
 //                                 ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#iterator().
 //                                          display_name iterator
 //                                          signature_documentation java @NonNull\n@Override\npublic Iterator<EpoxyModel<?>> iterator()
+//                                          kind Method
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Iterable#iterator().
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#iterator().
 //                                          relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#iterator().
@@ -1466,6 +1536,7 @@ public ListIterator<EpoxyModel<?>> listIterator(int location) {
 //                                     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#listIterator().
 //                                                  display_name listIterator
 //                                                  signature_documentation java @NonNull\n@Override\npublic ListIterator<EpoxyModel<?>> listIterator(int location)
+//                                                  kind Method
 //                                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#listIterator(+1).
 //                                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#listIterator(+1).
 //                                                      ^^^^^^^^ definition local 60
@@ -1503,6 +1574,7 @@ public EpoxyModel<?> remove(int location) {
 //                       ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#remove().
 //                              display_name remove
 //                              signature_documentation java @Override\npublic EpoxyModel<?> remove(int location)
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#remove().
 //                              relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#remove(+1).
 //                                  ^^^^^^^^ definition local 61
@@ -1549,6 +1621,7 @@ protected void removeRange(int start, int end) {
 //                 ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#removeRange().
 //                             display_name removeRange
 //                             signature_documentation java @Override\nprotected void removeRange(int start, int end)
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#removeRange().
 //                                 ^^^^^ definition local 63
 //                                       display_name start
@@ -1594,6 +1667,7 @@ public EpoxyModel<?> set(int location, EpoxyModel<?> object) {
 //                       ^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#set().
 //                           display_name set
 //                           signature_documentation java @Override\npublic EpoxyModel<?> set(int location, EpoxyModel<?> object)
+//                           kind Method
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractList#set().
 //                           relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#set().
 //                               ^^^^^^^^ definition local 65
@@ -1633,6 +1707,7 @@ public int size() {
 //             ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#size().
 //                  display_name size
 //                  signature_documentation java @Override\npublic int size()
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/AbstractCollection#size().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/Collection#size().
 //                  relationship is_reference is_implementation semanticdb maven jdk 11 java/util/List#size().
@@ -1651,6 +1726,7 @@ void sizeChanged(boolean increment) {
 //       ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#sizeChanged().
 //                   display_name sizeChanged
 //                   signature_documentation java void sizeChanged(boolean increment)
+//                   kind Method
 //                           ^^^^^^^^^ definition local 67
 //                                     display_name increment
 //                                     signature_documentation java boolean increment
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
index 6e6f39f61..df9858ef7 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
@@ -5,27 +5,33 @@ class ModelState {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#
 //               display_name ModelState
 //               signature_documentation java class ModelState
+//               kind Class
 //               documentation Helper to store relevant information about a model that we need to determine if it changed. 
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#`<init>`().
 //               display_name <init>
 //               signature_documentation java ModelState()
+//               kind Constructor
   long id;
 //     ^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#id.
 //        display_name id
 //        signature_documentation java long id
+//        kind Field
   int hashCode;
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#hashCode.
 //             display_name hashCode
 //             signature_documentation java int hashCode
+//             kind Field
   int position;
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#position.
 //             display_name position
 //             signature_documentation java int position
+//             kind Field
   EpoxyModel<?> model;
 //^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //              ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#model.
 //                    display_name model
 //                    signature_documentation java EpoxyModel<?> model
+//                    kind Field
 
   /**
    * A link to the item with the same id in the other list when diffing two lists. This will be null
@@ -37,6 +43,7 @@ class ModelState {
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
 //                display_name pair
 //                signature_documentation java ModelState pair
+//                kind Field
 //                documentation  A link to the item with the same id in the other list when diffing two lists. This will be null\n if the item doesn't exist, in the case of insertions or removals. This is an optimization to\n prevent having to look up the matching pair in a hash map every time.\n
 
   /**
@@ -51,6 +58,7 @@ class ModelState {
 //    ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#lastMoveOp.
 //               display_name lastMoveOp
 //               signature_documentation java int lastMoveOp
+//               kind Field
 //               documentation  How many movement operations have been applied to this item in order to update its position. As\n we find more item movements we need to update the position of affected items in the list in\n order to correctly calculate the next movement. Instead of iterating through all items in the\n list every time a movement operation happens we keep track of how many of these operations have\n been applied to an item, and apply all new operations in order when we need to get this item's\n up to date position.\n
 
   static ModelState build(EpoxyModel<?> model, int position, boolean immutableModel) {
@@ -58,6 +66,7 @@ static ModelState build(EpoxyModel<?> model, int position, boolean immutableMode
 //                  ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#build().
 //                        display_name build
 //                        signature_documentation java static ModelState build(EpoxyModel<?> model, int position, boolean immutableModel)
+//                        kind StaticMethod
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^ definition local 0
 //                                            display_name model
@@ -121,6 +130,7 @@ void pairWithSelf() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#pairWithSelf().
 //                  display_name pairWithSelf
 //                  signature_documentation java void pairWithSelf()
+//                  kind Method
 //                  documentation  Used for an item inserted into the new list when we need to track moves that effect the\n inserted item in the old list.\n
     if (pair != null) {
 //      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
@@ -162,6 +172,7 @@ public String toString() {
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ModelState#toString().
 //                       display_name toString
 //                       signature_documentation java @Override\npublic String toString()
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return "ModelState{"
         + "id=" + id
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
index d14dd044e..1d4cd59f6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java
@@ -8,11 +8,13 @@ class NoOpControllerHelper extends ControllerHelper<EpoxyController> {
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#
 //                         display_name NoOpControllerHelper
 //                         signature_documentation java class NoOpControllerHelper
+//                         kind Class
 //                         documentation  A {@link ControllerHelper} implementation for adapters with no {@link\n com.airbnb.epoxy.AutoModel} usage.\n
 //                         relationship is_implementation semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#`<init>`().
 //                         display_name <init>
 //                         signature_documentation java NoOpControllerHelper()
+//                         kind Constructor
 //                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelper#
 //                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
@@ -22,6 +24,7 @@ public void resetAutoModels() {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpControllerHelper#resetAutoModels().
 //                            display_name resetAutoModels
 //                            signature_documentation java @Override\npublic void resetAutoModels()
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/ControllerHelper#resetAutoModels().
     // No - Op
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
index 45bb69b71..7e8b3646c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
@@ -4,10 +4,12 @@ class NoOpTimer implements Timer {
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#
 //              display_name NoOpTimer
 //              signature_documentation java class NoOpTimer
+//              kind Class
 //              relationship is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#`<init>`().
 //              display_name <init>
 //              signature_documentation java NoOpTimer()
+//              kind Constructor
 //                         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Timer#
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
@@ -15,6 +17,7 @@ public void start(String sectionName) {
 //            ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#start().
 //                  display_name start
 //                  signature_documentation java @Override\npublic void start(String sectionName)
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#start().
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                         ^^^^^^^^^^^ definition local 0
@@ -30,6 +33,7 @@ public void stop() {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/NoOpTimer#stop().
 //                 display_name stop
 //                 signature_documentation java @Override\npublic void stop()
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/Timer#stop().
 
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
index dc3b7e91a..56bba69e9 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java
@@ -18,22 +18,26 @@ class NotifyBlocker extends AdapterDataObserver {
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#
 //                  display_name NotifyBlocker
 //                  signature_documentation java class NotifyBlocker
+//                  kind Class
 //                  documentation  We don't allow any data change notifications except the ones done though diffing. Forcing\n changes to happen through diffing reduces the chance for developer error when implementing an\n adapter.\n <p>\n This observer throws upon any changes done outside of diffing.\n
 //                  relationship is_implementation semanticdb maven . . AdapterDataObserver#
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#`<init>`().
 //                  display_name <init>
 //                  signature_documentation java NotifyBlocker()
+//                  kind Constructor
 //                          ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . AdapterDataObserver#
 
   private boolean changesAllowed;
 //                ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
 //                               display_name changesAllowed
 //                               signature_documentation java private boolean changesAllowed
+//                               kind Field
 
   void allowChanges() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#allowChanges().
 //                  display_name allowChanges
 //                  signature_documentation java void allowChanges()
+//                  kind Method
     changesAllowed = true;
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
   }
@@ -42,6 +46,7 @@ void blockChanges() {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#blockChanges().
 //                  display_name blockChanges
 //                  signature_documentation java void blockChanges()
+//                  kind Method
     changesAllowed = false;
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
   }
@@ -52,6 +57,7 @@ public void onChanged() {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onChanged().
 //                      display_name onChanged
 //                      signature_documentation java @Override\npublic void onChanged()
+//                      kind Method
     if (!changesAllowed) {
 //       ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#changesAllowed.
       throw new IllegalStateException(
@@ -66,6 +72,7 @@ public void onItemRangeChanged(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged().
 //                               display_name onItemRangeChanged
 //                               signature_documentation java @Override\npublic void onItemRangeChanged(int positionStart, int itemCount)
+//                               kind Method
 //                                   ^^^^^^^^^^^^^ definition local 0
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
@@ -84,6 +91,7 @@ public void onItemRangeChanged(int positionStart, int itemCount, Object payload)
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(+1).
 //                               display_name onItemRangeChanged
 //                               signature_documentation java @Override\npublic void onItemRangeChanged(int positionStart, int itemCount, Object payload)
+//                               kind Method
 //                                   ^^^^^^^^^^^^^ definition local 2
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
@@ -107,6 +115,7 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeInserted().
 //                                display_name onItemRangeInserted
 //                                signature_documentation java @Override\npublic void onItemRangeInserted(int positionStart, int itemCount)
+//                                kind Method
 //                                    ^^^^^^^^^^^^^ definition local 5
 //                                                  display_name positionStart
 //                                                  signature_documentation java int positionStart
@@ -125,6 +134,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeRemoved().
 //                               display_name onItemRangeRemoved
 //                               signature_documentation java @Override\npublic void onItemRangeRemoved(int positionStart, int itemCount)
+//                               kind Method
 //                                   ^^^^^^^^^^^^^ definition local 7
 //                                                 display_name positionStart
 //                                                 signature_documentation java int positionStart
@@ -143,6 +153,7 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/NotifyBlocker#onItemRangeMoved().
 //                             display_name onItemRangeMoved
 //                             signature_documentation java @Override\npublic void onItemRangeMoved(int fromPosition, int toPosition, int itemCount)
+//                             kind Method
 //                                 ^^^^^^^^^^^^ definition local 9
 //                                              display_name fromPosition
 //                                              signature_documentation java int fromPosition
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
index 4fa6971f1..0f14691ca 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java
@@ -5,14 +5,17 @@ public interface OnModelBoundListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#
 //                                    display_name OnModelBoundListener
 //                                    signature_documentation java public interface OnModelBoundListener<T extends EpoxyModel<?>, V>
+//                                    kind Interface
 //                                    documentation Used to register an onBind callback with a generated model. 
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[T]
 //                                      display_name T
 //                                      signature_documentation java T extends EpoxyModel<?>
+//                                      kind TypeParameter
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[V]
 //                                                               display_name V
 //                                                               signature_documentation java V
+//                                                               kind TypeParameter
   /**
    * This will be called immediately after a model was bound, with the model and view that were
    * bound together.
@@ -25,6 +28,7 @@ public interface OnModelBoundListener<T extends EpoxyModel<?>, V> {
 //     ^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#onModelBound().
 //                  display_name onModelBound
 //                  signature_documentation java public abstract void onModelBound(T model, V view, int position)
+//                  kind AbstractMethod
 //                  documentation  This will be called immediately after a model was bound, with the model and view that were\n bound together.\n\n @param model    The model being bound\n @param view     The view that is being bound to the model\n @param position The adapter position of the model\n
 //                  ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelBoundListener#[T]
 //                    ^^^^^ definition local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
index ec9febe7e..fcc771476 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java
@@ -13,6 +13,7 @@ public interface OnModelBuildFinishedListener {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#
 //                                            display_name OnModelBuildFinishedListener
 //                                            signature_documentation java public interface OnModelBuildFinishedListener
+//                                            kind Interface
 //                                            documentation  Used with {@link EpoxyController#addModelBuildListener(OnModelBuildFinishedListener)} to be\n alerted to new model changes.\n
   /**
    * Called after {@link EpoxyController#buildModels()} has run and changes have been notified to
@@ -22,6 +23,7 @@ public interface OnModelBuildFinishedListener {
 //     ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished().
 //                          display_name onModelBuildFinished
 //                          signature_documentation java public abstract void onModelBuildFinished(DiffResult result)
+//                          kind AbstractMethod
 //                          documentation  Called after {@link EpoxyController#buildModels()} has run and changes have been notified to\n the adapter. This will be called even if no changes existed.\n
 //                           ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffResult#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
index 08e2c88ba..0858ccd34 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java
@@ -9,13 +9,16 @@ public interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#
 //                                            display_name OnModelCheckedChangeListener
 //                                            signature_documentation java public interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V>
+//                                            kind Interface
 //                                            ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[T]
 //                                              display_name T
 //                                              signature_documentation java T extends EpoxyModel<?>
+//                                              kind TypeParameter
 //                                                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[V]
 //                                                                       display_name V
 //                                                                       signature_documentation java V
+//                                                                       kind TypeParameter
   /**
    * Called when the view bound to the model is checked.
    *
@@ -30,6 +33,7 @@ void onChecked(T model, V parentView,
 //     ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked().
 //               display_name onChecked
 //               signature_documentation java public abstract void onChecked(T model, V parentView, unresolved_type checkedView, boolean isChecked, int position)
+//               kind AbstractMethod
 //               documentation  Called when the view bound to the model is checked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param checkedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param isChecked   The new value for isChecked property.\n @param position    The position of the model in the adapter.\n
 //               ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#[T]
 //                 ^^^^^ definition local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
index 34a3f7303..a875f8c9d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java
@@ -10,14 +10,17 @@ public interface OnModelClickListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#
 //                                    display_name OnModelClickListener
 //                                    signature_documentation java public interface OnModelClickListener<T extends EpoxyModel<?>, V>
+//                                    kind Interface
 //                                    documentation Used to register a click listener on a generated model. 
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[T]
 //                                      display_name T
 //                                      signature_documentation java T extends EpoxyModel<?>
+//                                      kind TypeParameter
 //                                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                             ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[V]
 //                                                               display_name V
 //                                                               signature_documentation java V
+//                                                               kind TypeParameter
   /**
    * Called when the view bound to the model is clicked.
    *
@@ -31,6 +34,7 @@ public interface OnModelClickListener<T extends EpoxyModel<?>, V> {
 //     ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#onClick().
 //             display_name onClick
 //             signature_documentation java public abstract void onClick(T model, V parentView, unresolved_type clickedView, int position)
+//             kind AbstractMethod
 //             documentation  Called when the view bound to the model is clicked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param clickedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param position    The position of the model in the adapter.\n
 //             ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelClickListener#[T]
 //               ^^^^^ definition local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
index 5507b3a27..5b94ab80d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java
@@ -9,13 +9,16 @@ public interface OnModelLongClickListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#
 //                                        display_name OnModelLongClickListener
 //                                        signature_documentation java public interface OnModelLongClickListener<T extends EpoxyModel<?>, V>
+//                                        kind Interface
 //                                        ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[T]
 //                                          display_name T
 //                                          signature_documentation java T extends EpoxyModel<?>
+//                                          kind TypeParameter
 //                                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                 ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[V]
 //                                                                   display_name V
 //                                                                   signature_documentation java V
+//                                                                   kind TypeParameter
   /**
    * Called when the view bound to the model is clicked.
    *
@@ -29,6 +32,7 @@ public interface OnModelLongClickListener<T extends EpoxyModel<?>, V> {
 //        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#onLongClick().
 //                    display_name onLongClick
 //                    signature_documentation java public abstract boolean onLongClick(T model, V parentView, unresolved_type clickedView, int position)
+//                    kind AbstractMethod
 //                    documentation  Called when the view bound to the model is clicked.\n\n @param model       The model that the view is bound to.\n @param parentView  The view bound to the model which received the click.\n @param clickedView The view that received the click. This is either a child of the parentView\n                    or the parentView itself\n @param position    The position of the model in the adapter.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelLongClickListener#[T]
 //                      ^^^^^ definition local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
index 37943883f..7a2eae635 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java
@@ -5,14 +5,17 @@ public interface OnModelUnboundListener<T extends EpoxyModel<?>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#
 //                                      display_name OnModelUnboundListener
 //                                      signature_documentation java public interface OnModelUnboundListener<T extends EpoxyModel<?>, V>
+//                                      kind Interface
 //                                      documentation Used to register an onUnbind callback with a generated model. 
 //                                      ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[T]
 //                                        display_name T
 //                                        signature_documentation java T extends EpoxyModel<?>
+//                                        kind TypeParameter
 //                                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                               ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[V]
 //                                                                 display_name V
 //                                                                 signature_documentation java V
+//                                                                 kind TypeParameter
   /**
    * This will be called immediately after a model is unbound from a view, with the view and model
    * that were unbound.
@@ -21,6 +24,7 @@ public interface OnModelUnboundListener<T extends EpoxyModel<?>, V> {
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound().
 //                    display_name onModelUnbound
 //                    signature_documentation java public abstract void onModelUnbound(T model, V view)
+//                    kind AbstractMethod
 //                    documentation  This will be called immediately after a model is unbound from a view, with the view and model\n that were unbound.\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelUnboundListener#[T]
 //                      ^^^^^ definition local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
index 18f6d3b29..3562338d6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java
@@ -14,15 +14,18 @@ public interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V> {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#
 //                                                display_name OnModelVisibilityChangedListener
 //                                                signature_documentation java public interface OnModelVisibilityChangedListener<T extends EpoxyModel<V>, V>
+//                                                kind Interface
 //                                                documentation Used to register an onVisibilityChanged callback with a generated model. 
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[T]
 //                                                  display_name T
 //                                                  signature_documentation java T extends EpoxyModel<V>
+//                                                  kind TypeParameter
 //                                                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                     ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
 //                                                                         ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[V]
 //                                                                           display_name V
 //                                                                           signature_documentation java V
+//                                                                           kind TypeParameter
 
   /**
    * This will be called once the view visible part changes.
@@ -43,6 +46,7 @@ void onVisibilityChanged(T model, V view,
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged().
 //                         display_name onVisibilityChanged
 //                         signature_documentation java public abstract void onVisibilityChanged(T model, V view, float percentVisibleHeight, float percentVisibleWidth, int heightVisible, int widthVisible)
+//                         kind AbstractMethod
 //                         documentation  This will be called once the view visible part changes.\n <p>\n OnModelVisibilityChangedListener should be used with particular care since they will be\n dispatched on every frame while scrolling. No heavy work should be done inside the\n implementation. Using {@link OnModelVisibilityStateChangedListener} is recommended whenever\n possible.\n <p>\n @param model                The model being bound\n @param view                 The view that is being bound to the model\n @param percentVisibleHeight The percentage of height visible (0-100)\n @param percentVisibleWidth  The percentage of width visible (0-100)\n @param heightVisible        The visible height in pixel\n @param widthVisible         The visible width in pixel\n
 //                         ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityChangedListener#[T]
 //                           ^^^^^ definition local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
index 5ecc9a22a..4ea16bf3f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java
@@ -12,15 +12,18 @@ public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>,
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#
 //                                                     display_name OnModelVisibilityStateChangedListener
 //                                                     signature_documentation java public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>, V>
+//                                                     kind Interface
 //                                                     documentation Used to register an onVisibilityChanged callback with a generated model. 
 //                                                     ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T]
 //                                                       display_name T
 //                                                       signature_documentation java T extends EpoxyModel<V>
+//                                                       kind TypeParameter
 //                                                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                          ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
 //                                                                              ^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V]
 //                                                                                display_name V
 //                                                                                signature_documentation java V
+//                                                                                kind TypeParameter
 
   /**
    * This will be called once the visibility changed.
@@ -35,6 +38,7 @@ public interface OnModelVisibilityStateChangedListener<T extends EpoxyModel<V>,
 //     ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged().
 //                              display_name onVisibilityStateChanged
 //                              signature_documentation java public abstract void onVisibilityStateChanged(T model, V view, int visibilityState)
+//                              kind AbstractMethod
 //                              documentation  This will be called once the visibility changed.\n <p>\n @param model           The model being bound\n @param view            The view that is being bound to the model\n @param visibilityState The new visibility\n <p>\n @see VisibilityState\n
 //                              ^ reference semanticdb maven . . com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T]
 //                                ^^^^^ definition local 0
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
index 931707649..0ce6c8a3e 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
@@ -23,26 +23,31 @@ public class QuantityStringResAttribute {
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
 //                                      display_name QuantityStringResAttribute
 //                                      signature_documentation java public class QuantityStringResAttribute
+//                                      kind Class
   @PluralsRes private final int id;
 // ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                              ^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
 //                                 display_name id
 //                                 signature_documentation java @PluralsRes\nprivate final int id
+//                                 kind Field
   private final int quantity;
 //                  ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
 //                           display_name quantity
 //                           signature_documentation java private final int quantity
+//                           kind Field
   @Nullable private final Object[] formatArgs;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                                 ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
 //                                            display_name formatArgs
 //                                            signature_documentation java @Nullable\nprivate final Object[] formatArgs
+//                                            kind Field
 
   public QuantityStringResAttribute(@PluralsRes int id, int quantity,
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`().
 //                                  display_name <init>
 //                                  signature_documentation java public QuantityStringResAttribute(int id, int quantity, Object[] formatArgs)
+//                                  kind Constructor
 //                                   ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                                                  ^^ definition local 0
 //                                                     display_name id
@@ -74,6 +79,7 @@ public QuantityStringResAttribute(int id, int quantity) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#`<init>`(+1).
 //                                  display_name <init>
 //                                  signature_documentation java public QuantityStringResAttribute(int id, int quantity)
+//                                  kind Constructor
 //                                      ^^ definition local 3
 //                                         display_name id
 //                                         signature_documentation java int id
@@ -94,6 +100,7 @@ public int getId() {
 //           ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getId().
 //                 display_name getId
 //                 signature_documentation java @PluralsRes\npublic int getId()
+//                 kind Method
     return id;
 //         ^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
   }
@@ -102,6 +109,7 @@ public int getQuantity() {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getQuantity().
 //                       display_name getQuantity
 //                       signature_documentation java public int getQuantity()
+//                       kind Method
     return quantity;
 //         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#quantity.
   }
@@ -113,6 +121,7 @@ public Object[] getFormatArgs() {
 //                ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#getFormatArgs().
 //                              display_name getFormatArgs
 //                              signature_documentation java @Nullable\npublic Object[] getFormatArgs()
+//                              kind Method
     return formatArgs;
 //         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#formatArgs.
   }
@@ -122,6 +131,7 @@ public CharSequence toString(Context context) {
 //                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#toString().
 //                             display_name toString
 //                             signature_documentation java public CharSequence toString(unresolved_type context)
+//                             kind Method
 //                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                     ^^^^^^^ definition local 5
 //                                             display_name context
@@ -154,6 +164,7 @@ public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#equals().
 //                      display_name equals
 //                      signature_documentation java @Override\npublic boolean equals(Object o)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 6
@@ -206,6 +217,7 @@ public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#hashCode().
 //                    display_name hashCode
 //                    signature_documentation java @Override\npublic int hashCode()
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = id;
 //      ^^^^^^ definition local 8
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
index 7306a3f80..26cfc5392 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java
@@ -18,6 +18,7 @@ public class SimpleEpoxyAdapter extends EpoxyAdapter {
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#
 //                              display_name SimpleEpoxyAdapter
 //                              signature_documentation java public class SimpleEpoxyAdapter
+//                              kind Class
 //                              documentation  A non-abstract version of {@link com.airbnb.epoxy.EpoxyAdapter} that exposes all methods and\n models as public. Use this if you don't want to create your own adapter subclass and instead want\n to modify the adapter from elsewhere, such as from an activity.\n
 //                              relationship is_implementation semanticdb maven . . RecyclerView/Adapter#
 //                              relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -26,6 +27,7 @@ public class SimpleEpoxyAdapter extends EpoxyAdapter {
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#`<init>`().
 //                              display_name <init>
 //                              signature_documentation java public SimpleEpoxyAdapter()
+//                              kind Constructor
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#
 
   public List<EpoxyModel<?>> getModels() {
@@ -34,6 +36,7 @@ public List<EpoxyModel<?>> getModels() {
 //                           ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModels().
 //                                     display_name getModels
 //                                     signature_documentation java public List<EpoxyModel<?>> getModels()
+//                                     kind Method
     return models;
 //         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
   }
@@ -44,6 +47,7 @@ public void enableDiffing() {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#enableDiffing().
 //                          display_name enableDiffing
 //                          signature_documentation java @Override\npublic void enableDiffing()
+//                          kind Method
 //                          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#enableDiffing().
     super.enableDiffing();
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -56,6 +60,7 @@ public void notifyModelsChanged() {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelsChanged().
 //                                display_name notifyModelsChanged
 //                                signature_documentation java @Override\npublic void notifyModelsChanged()
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelsChanged().
     super.notifyModelsChanged();
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -69,6 +74,7 @@ public BoundViewHolders getBoundViewHolders() {
 //                        ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getBoundViewHolders().
 //                                            display_name getBoundViewHolders
 //                                            signature_documentation java @Override\npublic BoundViewHolders getBoundViewHolders()
+//                                            kind Method
 //                                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders().
     return super.getBoundViewHolders();
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -81,6 +87,7 @@ public void notifyModelChanged(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged().
 //                               display_name notifyModelChanged
 //                               signature_documentation java @Override\npublic void notifyModelChanged(EpoxyModel<?> model)
+//                               kind Method
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged().
 //                               ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                             ^^^^^ definition local 0
@@ -99,6 +106,7 @@ public void addModels(EpoxyModel<?>... modelsToAdd) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels().
 //                      display_name addModels
 //                      signature_documentation java @Override\npublic void addModels(EpoxyModel<?>[] modelsToAdd)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^^^^^^^^^^^ definition local 1
@@ -117,6 +125,7 @@ public void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1).
 //                      display_name addModels
 //                      signature_documentation java @Override\npublic void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
 //                      ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                                           ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -136,6 +145,7 @@ public void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelTo
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore().
 //                              display_name insertModelBefore
 //                              signature_documentation java @Override\npublic void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertBefore)
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^^^^^^^^^ definition local 3
@@ -160,6 +170,7 @@ public void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToI
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter().
 //                             display_name insertModelAfter
 //                             signature_documentation java @Override\npublic void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> modelToInsertAfter)
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
 //                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                           ^^^^^^^^^^^^^ definition local 5
@@ -184,6 +195,7 @@ public void removeModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel().
 //                        display_name removeModel
 //                        signature_documentation java @Override\npublic void removeModel(EpoxyModel<?> model)
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                      ^^^^^ definition local 7
@@ -202,6 +214,7 @@ public void removeAllModels() {
 //            ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllModels().
 //                            display_name removeAllModels
 //                            signature_documentation java @Override\npublic void removeAllModels()
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllModels().
     super.removeAllModels();
 //  ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#super.
@@ -214,6 +227,7 @@ public void removeAllAfterModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel().
 //                                display_name removeAllAfterModel
 //                                signature_documentation java @Override\npublic void removeAllAfterModel(EpoxyModel<?> model)
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 8
@@ -232,6 +246,7 @@ public void showModel(EpoxyModel<?> model, boolean show) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel().
 //                      display_name showModel
 //                      signature_documentation java @Override\npublic void showModel(EpoxyModel<?> model, boolean show)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 9
@@ -255,6 +270,7 @@ public void showModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1).
 //                      display_name showModel
 //                      signature_documentation java @Override\npublic void showModel(EpoxyModel<?> model)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel(+1).
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 11
@@ -273,6 +289,7 @@ public void showModels(EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels().
 //                       display_name showModels
 //                       signature_documentation java @Override\npublic void showModels(EpoxyModel<?>[] models)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels().
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^ definition local 12
@@ -291,6 +308,7 @@ public void showModels(boolean show, EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1).
 //                       display_name showModels
 //                       signature_documentation java @Override\npublic void showModels(boolean show, EpoxyModel<?>[] models)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+1).
 //                               ^^^^ definition local 13
 //                                    display_name show
@@ -314,6 +332,7 @@ public void showModels(Iterable<EpoxyModel<?>> epoxyModels) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2).
 //                       display_name showModels
 //                       signature_documentation java @Override\npublic void showModels(Iterable<EpoxyModel<?>> epoxyModels)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -333,6 +352,7 @@ public void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3).
 //                       display_name showModels
 //                       signature_documentation java @Override\npublic void showModels(Iterable<EpoxyModel<?>> epoxyModels, boolean show)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -357,6 +377,7 @@ public void hideModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel().
 //                      display_name hideModel
 //                      signature_documentation java @Override\npublic void hideModel(EpoxyModel<?> model)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModel().
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^ definition local 18
@@ -375,6 +396,7 @@ public void hideModels(Iterable<EpoxyModel<?>> epoxyModels) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels().
 //                       display_name hideModels
 //                       signature_documentation java @Override\npublic void hideModels(Iterable<EpoxyModel<?>> epoxyModels)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels().
 //                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -394,6 +416,7 @@ public void hideModels(EpoxyModel<?>... models) {
 //            ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1).
 //                       display_name hideModels
 //                       signature_documentation java @Override\npublic void hideModels(EpoxyModel<?>[] models)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideModels(+1).
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^ definition local 20
@@ -412,6 +435,7 @@ public void hideAllAfterModel(EpoxyModel<?> model) {
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel().
 //                              display_name hideAllAfterModel
 //                              signature_documentation java @Override\npublic void hideAllAfterModel(EpoxyModel<?> model)
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#hideAllAfterModel().
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                            ^^^^^ definition local 21
@@ -432,6 +456,7 @@ public List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //                           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter().
 //                                             display_name getAllModelsAfter
 //                                             signature_documentation java @Override\npublic List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model)
+//                                             kind Method
 //                                             relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                           ^^^^^ definition local 22
@@ -450,6 +475,7 @@ public int getModelPosition(EpoxyModel<?> model) {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition().
 //                            display_name getModelPosition
 //                            signature_documentation java @Override\npublic int getModelPosition(EpoxyModel<?> model)
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                          ^^^^^ definition local 23
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
index e7131f793..9aac941e8 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java
@@ -13,6 +13,7 @@ public class SimpleEpoxyController extends EpoxyController {
 //           ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#
 //                                 display_name SimpleEpoxyController
 //                                 signature_documentation java public class SimpleEpoxyController
+//                                 kind Class
 //                                 documentation  A small wrapper around {@link com.airbnb.epoxy.EpoxyController} that lets you set a list of\n models directly.\n
 //                                 relationship is_implementation semanticdb maven . . ModelCollector#
 //                                 relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -20,6 +21,7 @@ public class SimpleEpoxyController extends EpoxyController {
 //           ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#`<init>`().
 //                                 display_name <init>
 //                                 signature_documentation java public SimpleEpoxyController()
+//                                 kind Constructor
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   private List<? extends EpoxyModel<?>> currentModels;
 //        ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -27,10 +29,12 @@ public class SimpleEpoxyController extends EpoxyController {
 //                                      ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#currentModels.
 //                                                    display_name currentModels
 //                                                    signature_documentation java private List<? extends EpoxyModel<?>> currentModels
+//                                                    kind Field
   private boolean insideSetModels;
 //                ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#insideSetModels.
 //                                display_name insideSetModels
 //                                signature_documentation java private boolean insideSetModels
+//                                kind Field
 
   /**
    * Set the models to add to this controller. Clears any previous models and adds this new list
@@ -40,6 +44,7 @@ public void setModels(List<? extends EpoxyModel<?>> models) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#setModels().
 //                      display_name setModels
 //                      signature_documentation java public void setModels(List<? extends EpoxyModel<?>> models)
+//                      kind Method
 //                      documentation  Set the models to add to this controller. Clears any previous models and adds this new list\n .\n
 //                      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -64,6 +69,7 @@ public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
 //                                    signature_documentation java @Override\npublic final void requestModelBuild()
+//                                    kind Method
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!insideSetModels) {
 //       ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#insideSetModels.
@@ -82,6 +88,7 @@ protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyController#buildModels().
 //                                 display_name buildModels
 //                                 signature_documentation java @Override\nprotected final void buildModels()
+//                                 kind Method
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
index f96894c25..b8cede93f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
@@ -28,6 +28,7 @@ public class SimpleEpoxyModel extends EpoxyModel<View> {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                            display_name SimpleEpoxyModel
 //                            signature_documentation java public class SimpleEpoxyModel
+//                            kind Class
 //                            documentation  Helper class for cases where you don't need to do anything special when binding the view. This\n allows you to just provide the layout instead of needing to create a separate {@link EpoxyModel}\n subclass. This is useful for static layouts. You can also specify an onClick listener and the\n span size.\n
 //                            relationship is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
@@ -37,21 +38,25 @@ public class SimpleEpoxyModel extends EpoxyModel<View> {
 //                             ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#layoutRes.
 //                                       display_name layoutRes
 //                                       signature_documentation java @LayoutRes\nprivate final int layoutRes
+//                                       kind Field
   private View.OnClickListener onClickListener;
 //        ^^^^ reference semanticdb maven . . View/
 //             ^^^^^^^^^^^^^^^ reference semanticdb maven . . View/OnClickListener#
 //                             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClickListener.
 //                                             display_name onClickListener
 //                                             signature_documentation java private unresolved_type onClickListener
+//                                             kind Field
   private int spanCount = 1;
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#spanCount.
 //                      display_name spanCount
 //                      signature_documentation java private int spanCount
+//                      kind Field
 
   public SimpleEpoxyModel(@LayoutRes int layoutRes) {
 //       ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#`<init>`().
 //                        display_name <init>
 //                        signature_documentation java public SimpleEpoxyModel(int layoutRes)
+//                        kind Constructor
 //                         ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/LayoutRes#
 //                                       ^^^^^^^^^ definition local 0
 //                                                 display_name layoutRes
@@ -67,6 +72,7 @@ public SimpleEpoxyModel onClick(View.OnClickListener listener) {
 //                        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#onClick().
 //                                display_name onClick
 //                                signature_documentation java public SimpleEpoxyModel onClick(unresolved_type listener)
+//                                kind Method
 //                                ^^^^ reference semanticdb maven . . View/
 //                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . View/OnClickListener#
 //                                                     ^^^^^^^^ definition local 1
@@ -84,6 +90,7 @@ public SimpleEpoxyModel span(int span) {
 //                        ^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#span().
 //                             display_name span
 //                             signature_documentation java public SimpleEpoxyModel span(int span)
+//                             kind Method
 //                                 ^^^^ definition local 2
 //                                      display_name span
 //                                      signature_documentation java int span
@@ -102,6 +109,7 @@ public void bind(@NonNull View view) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#bind().
 //                 display_name bind
 //                 signature_documentation java @CallSuper\n@Override\npublic void bind(unresolved_type view)
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#bind().
 //                  ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                          ^^^^ reference semanticdb maven . . View#
@@ -131,6 +139,7 @@ public void unbind(@NonNull View view) {
 //            ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#unbind().
 //                   display_name unbind
 //                   signature_documentation java @CallSuper\n@Override\npublic void unbind(unresolved_type view)
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#unbind().
 //                    ^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/NonNull#
 //                            ^^^^ reference semanticdb maven . . View#
@@ -153,6 +162,7 @@ protected int getDefaultLayout() {
 //              ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getDefaultLayout().
 //                               display_name getDefaultLayout
 //                               signature_documentation java @Override\nprotected int getDefaultLayout()
+//                               kind Method
 //                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getDefaultLayout().
     return layoutRes;
 //         ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#layoutRes.
@@ -164,6 +174,7 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize().
 //                       display_name getSpanSize
 //                       signature_documentation java @Override\npublic int getSpanSize(int totalSpanCount, int position, int itemCount)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getSpanSize().
 //                           ^^^^^^^^^^^^^^ definition local 5
 //                                          display_name totalSpanCount
@@ -187,6 +198,7 @@ public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
 //                      display_name equals
 //                      signature_documentation java @Override\npublic boolean equals(Object o)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
@@ -248,6 +260,7 @@ public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#hashCode().
 //                    display_name hashCode
 //                    signature_documentation java @Override\npublic int hashCode()
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = super.hashCode();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
index b025aa7fe..bad334f8d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
@@ -27,21 +27,25 @@ public class StringAttributeData {
 //           ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
 //                               display_name StringAttributeData
 //                               signature_documentation java public class StringAttributeData
+//                               kind Class
   private final boolean hasDefault;
 //                      ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
 //                                 display_name hasDefault
 //                                 signature_documentation java private final boolean hasDefault
+//                                 kind Field
   @Nullable private final CharSequence defaultString;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                     ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#defaultString.
 //                                                   display_name defaultString
 //                                                   signature_documentation java @Nullable\nprivate final CharSequence defaultString
+//                                                   kind Field
   @StringRes private final int defaultStringRes;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#defaultStringRes.
 //                                              display_name defaultStringRes
 //                                              signature_documentation java @StringRes\nprivate final int defaultStringRes
+//                                              kind Field
 
   @Nullable private CharSequence string;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
@@ -49,31 +53,37 @@ public class StringAttributeData {
 //                               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                      display_name string
 //                                      signature_documentation java @Nullable\nprivate CharSequence string
+//                                      kind Field
   @StringRes private int stringRes;
 // ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                       ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#stringRes.
 //                                 display_name stringRes
 //                                 signature_documentation java @StringRes\nprivate int stringRes
+//                                 kind Field
   @PluralsRes private int pluralRes;
 // ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                        ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#pluralRes.
 //                                  display_name pluralRes
 //                                  signature_documentation java @PluralsRes\nprivate int pluralRes
+//                                  kind Field
   private int quantity;
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#quantity.
 //                     display_name quantity
 //                     signature_documentation java private int quantity
+//                     kind Field
   @Nullable private Object[] formatArgs;
 // ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                           ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#formatArgs.
 //                                      display_name formatArgs
 //                                      signature_documentation java @Nullable\nprivate Object[] formatArgs
+//                                      kind Field
 
   public StringAttributeData() {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`().
 //                           display_name <init>
 //                           signature_documentation java public StringAttributeData()
+//                           kind Constructor
     hasDefault = false;
 //  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
     defaultString = null;
@@ -86,6 +96,7 @@ public StringAttributeData(@Nullable CharSequence defaultString) {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`(+1).
 //                           display_name <init>
 //                           signature_documentation java public StringAttributeData(CharSequence defaultString)
+//                           kind Constructor
 //                            ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                  ^^^^^^^^^^^^^ definition local 0
@@ -108,6 +119,7 @@ public StringAttributeData(@StringRes int defaultStringRes) {
 //       ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#`<init>`(+2).
 //                           display_name <init>
 //                           signature_documentation java public StringAttributeData(int defaultStringRes)
+//                           kind Constructor
 //                            ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                          ^^^^^^^^^^^^^^^^ definition local 1
 //                                                           display_name defaultStringRes
@@ -129,6 +141,7 @@ public void setValue(@Nullable CharSequence string) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue().
 //                     display_name setValue
 //                     signature_documentation java public void setValue(CharSequence string)
+//                     kind Method
 //                      ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                            ^^^^^^ definition local 2
@@ -148,6 +161,7 @@ public void setValue(@StringRes int stringRes) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+1).
 //                     display_name setValue
 //                     signature_documentation java public void setValue(int stringRes)
+//                     kind Method
 //                      ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                    ^^^^^^^^^ definition local 3
 //                                              display_name stringRes
@@ -162,6 +176,7 @@ public void setValue(@StringRes int stringRes, @Nullable Object[] formatArgs) {
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+2).
 //                     display_name setValue
 //                     signature_documentation java public void setValue(int stringRes, Object[] formatArgs)
+//                     kind Method
 //                      ^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/StringRes#
 //                                    ^^^^^^^^^ definition local 4
 //                                              display_name stringRes
@@ -195,6 +210,7 @@ private void handleInvalidStringRes() {
 //             ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#handleInvalidStringRes().
 //                                    display_name handleInvalidStringRes
 //                                    signature_documentation java private void handleInvalidStringRes()
+//                                    kind Method
     if (hasDefault) {
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hasDefault.
       if (defaultStringRes != 0) {
@@ -217,6 +233,7 @@ public void setValue(@PluralsRes int pluralRes, int quantity, @Nullable Object[]
 //            ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#setValue(+3).
 //                     display_name setValue
 //                     signature_documentation java public void setValue(int pluralRes, int quantity, Object[] formatArgs)
+//                     kind Method
 //                      ^^^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/PluralsRes#
 //                                     ^^^^^^^^^ definition local 6
 //                                               display_name pluralRes
@@ -258,6 +275,7 @@ public CharSequence toString(Context context) {
 //                    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#toString().
 //                             display_name toString
 //                             signature_documentation java public CharSequence toString(unresolved_type context)
+//                             kind Method
 //                             ^^^^^^^ reference semanticdb maven . . Context#
 //                                     ^^^^^^^ definition local 9
 //                                             display_name context
@@ -311,6 +329,7 @@ public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#equals().
 //                      display_name equals
 //                      signature_documentation java @Override\npublic boolean equals(Object o)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 10
@@ -379,6 +398,7 @@ public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hashCode().
 //                    display_name hashCode
 //                    signature_documentation java @Override\npublic int hashCode()
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     int result = string != null ? string.hashCode() : 0;
 //      ^^^^^^ definition local 12
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
index 48123c56f..04ca7a981 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java
@@ -8,14 +8,17 @@ public interface StyleBuilderCallback<T> {
 //               ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#
 //                                    display_name StyleBuilderCallback
 //                                    signature_documentation java public interface StyleBuilderCallback<T>
+//                                    kind Interface
 //                                    documentation  Used for specifying dynamic styling for a view when creating a model. This is only used if the\n view is set up to be styled with the Paris library.\n
 //                                    ^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#[T]
 //                                      display_name T
 //                                      signature_documentation java T
+//                                      kind TypeParameter
   void buildStyle(T builder);
 //     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#buildStyle().
 //                display_name buildStyle
 //                signature_documentation java public abstract void buildStyle(T builder)
+//                kind AbstractMethod
 //                ^ reference semanticdb maven . . com/airbnb/epoxy/StyleBuilderCallback#[T]
 //                  ^^^^^^^ definition local 0
 //                          display_name builder
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
index 952954602..c5bbabe28 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java
@@ -4,10 +4,12 @@ interface Timer {
 //        ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#
 //              display_name Timer
 //              signature_documentation java interface Timer
+//              kind Interface
   void start(String sectionName);
 //     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#start().
 //           display_name start
 //           signature_documentation java public abstract void start(String sectionName)
+//           kind AbstractMethod
 //           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/DebugTimer#start().
 //           relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpTimer#start().
 //           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
@@ -19,6 +21,7 @@ interface Timer {
 //     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/Timer#stop().
 //          display_name stop
 //          signature_documentation java public abstract void stop()
+//          kind AbstractMethod
 //          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/DebugTimer#stop().
 //          relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/NoOpTimer#stop().
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
index ea742f0fc..a2aa6ca00 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java
@@ -23,6 +23,7 @@ public abstract class Typed2EpoxyController<T, U> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#
 //                                          display_name Typed2EpoxyController
 //                                          signature_documentation java public abstract class Typed2EpoxyController<T, U>
+//                                          kind Class
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by two objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed3EpoxyController\n @see Typed4EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -30,9 +31,11 @@ public abstract class Typed2EpoxyController<T, U> extends EpoxyController {
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //                                            display_name T
 //                                            signature_documentation java T
+//                                            kind TypeParameter
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //                                               display_name U
 //                                               signature_documentation java U
+//                                               kind TypeParameter
 //                                                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
@@ -40,26 +43,31 @@ public abstract class Typed2EpoxyController<T, U> extends EpoxyController {
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data1.
 //                display_name data1
 //                signature_documentation java private T data1
+//                kind Field
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#data2.
 //                display_name data2
 //                signature_documentation java private U data2
+//                kind Field
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
 //                                        display_name allowModelBuildRequests
 //                                        signature_documentation java private boolean allowModelBuildRequests
+//                                        kind Field
 
   public Typed2EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#`<init>`().
 //                             display_name <init>
 //                             signature_documentation java public Typed2EpoxyController()
+//                             kind Constructor
   }
 
   public Typed2EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#`<init>`(+1).
 //                             display_name <init>
 //                             signature_documentation java public Typed2EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
+//                             kind Constructor
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
@@ -84,6 +92,7 @@ public void setData(T data1, U data2) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#setData().
 //                    display_name setData
 //                    signature_documentation java public void setData(T data1, U data2)
+//                    kind Method
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //                      ^^^^^ definition local 2
@@ -115,6 +124,7 @@ public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
 //                                    signature_documentation java @Override\npublic final void requestModelBuild()
+//                                    kind Method
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests.
@@ -134,6 +144,7 @@ public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#moveModel().
 //                      display_name moveModel
 //                      signature_documentation java @Override\npublic void moveModel(int fromPosition, int toPosition)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 4
 //                                       display_name fromPosition
@@ -160,6 +171,7 @@ public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild().
 //                                     display_name requestDelayedModelBuild
 //                                     signature_documentation java @Override\npublic void requestDelayedModelBuild(int delayMs)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 6
 //                                                 display_name delayMs
@@ -184,6 +196,7 @@ protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels().
 //                                 display_name buildModels
 //                                 signature_documentation java @Override\nprotected final void buildModels()
+//                                 kind Method
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -202,6 +215,7 @@ protected final void buildModels() {
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#buildModels(+1).
 //                                    display_name buildModels
 //                                    signature_documentation java protected abstract void buildModels(T data1, U data2)
+//                                    kind AbstractMethod
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed2EpoxyController#[T]
 //                                      ^^^^^ definition local 7
 //                                            display_name data1
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
index 68e39d6fc..dab0d8f5c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java
@@ -23,6 +23,7 @@ public abstract class Typed3EpoxyController<T, U, V> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#
 //                                          display_name Typed3EpoxyController
 //                                          signature_documentation java public abstract class Typed3EpoxyController<T, U, V>
+//                                          kind Class
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by three objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed2EpoxyController\n @see Typed4EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -30,12 +31,15 @@ public abstract class Typed3EpoxyController<T, U, V> extends EpoxyController {
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //                                            display_name T
 //                                            signature_documentation java T
+//                                            kind TypeParameter
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //                                               display_name U
 //                                               signature_documentation java U
+//                                               kind TypeParameter
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //                                                  display_name V
 //                                                  signature_documentation java V
+//                                                  kind TypeParameter
 //                                                           ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
@@ -43,31 +47,37 @@ public abstract class Typed3EpoxyController<T, U, V> extends EpoxyController {
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data1.
 //                display_name data1
 //                signature_documentation java private T data1
+//                kind Field
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data2.
 //                display_name data2
 //                signature_documentation java private U data2
+//                kind Field
   private V data3;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[V]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#data3.
 //                display_name data3
 //                signature_documentation java private V data3
+//                kind Field
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
 //                                        display_name allowModelBuildRequests
 //                                        signature_documentation java private boolean allowModelBuildRequests
+//                                        kind Field
 
   public Typed3EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#`<init>`().
 //                             display_name <init>
 //                             signature_documentation java public Typed3EpoxyController()
+//                             kind Constructor
   }
 
   public Typed3EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#`<init>`(+1).
 //                             display_name <init>
 //                             signature_documentation java public Typed3EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
+//                             kind Constructor
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
@@ -92,6 +102,7 @@ public void setData(T data1, U data2, V data3) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#setData().
 //                    display_name setData
 //                    signature_documentation java public void setData(T data1, U data2, V data3)
+//                    kind Method
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //                      ^^^^^ definition local 2
@@ -131,6 +142,7 @@ public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
 //                                    signature_documentation java @Override\npublic final void requestModelBuild()
+//                                    kind Method
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests.
@@ -150,6 +162,7 @@ public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#moveModel().
 //                      display_name moveModel
 //                      signature_documentation java @Override\npublic void moveModel(int fromPosition, int toPosition)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 5
 //                                       display_name fromPosition
@@ -176,6 +189,7 @@ public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#requestDelayedModelBuild().
 //                                     display_name requestDelayedModelBuild
 //                                     signature_documentation java @Override\npublic void requestDelayedModelBuild(int delayMs)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 7
 //                                                 display_name delayMs
@@ -200,6 +214,7 @@ protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels().
 //                                 display_name buildModels
 //                                 signature_documentation java @Override\nprotected final void buildModels()
+//                                 kind Method
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -219,6 +234,7 @@ protected final void buildModels() {
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#buildModels(+1).
 //                                    display_name buildModels
 //                                    signature_documentation java protected abstract void buildModels(T data1, U data2, V data3)
+//                                    kind AbstractMethod
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed3EpoxyController#[T]
 //                                      ^^^^^ definition local 8
 //                                            display_name data1
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
index 26a4f66c9..de41e110d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java
@@ -23,6 +23,7 @@ public abstract class Typed4EpoxyController<T, U, V, W> extends EpoxyController
 //                    ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#
 //                                          display_name Typed4EpoxyController
 //                                          signature_documentation java public abstract class Typed4EpoxyController<T, U, V, W>
+//                                          kind Class
 //                                          documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by four objects.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData}\n whenever that data changes. This class will handle calling {@link #buildModels} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see TypedEpoxyController\n @see Typed2EpoxyController\n @see Typed3EpoxyController\n
 //                                          relationship is_implementation semanticdb maven . . ModelCollector#
 //                                          relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -30,15 +31,19 @@ public abstract class Typed4EpoxyController<T, U, V, W> extends EpoxyController
 //                                          ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //                                            display_name T
 //                                            signature_documentation java T
+//                                            kind TypeParameter
 //                                             ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //                                               display_name U
 //                                               signature_documentation java U
+//                                               kind TypeParameter
 //                                                ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //                                                  display_name V
 //                                                  signature_documentation java V
+//                                                  kind TypeParameter
 //                                                   ^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //                                                     display_name W
 //                                                     signature_documentation java W
+//                                                     kind TypeParameter
 //                                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
 
   private T data1;
@@ -46,36 +51,43 @@ public abstract class Typed4EpoxyController<T, U, V, W> extends EpoxyController
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data1.
 //                display_name data1
 //                signature_documentation java private T data1
+//                kind Field
   private U data2;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[U]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data2.
 //                display_name data2
 //                signature_documentation java private U data2
+//                kind Field
   private V data3;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[V]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data3.
 //                display_name data3
 //                signature_documentation java private V data3
+//                kind Field
   private W data4;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[W]
 //          ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#data4.
 //                display_name data4
 //                signature_documentation java private W data4
+//                kind Field
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
 //                                        display_name allowModelBuildRequests
 //                                        signature_documentation java private boolean allowModelBuildRequests
+//                                        kind Field
 
   public Typed4EpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#`<init>`().
 //                             display_name <init>
 //                             signature_documentation java public Typed4EpoxyController()
+//                             kind Constructor
   }
 
   public Typed4EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#`<init>`(+1).
 //                             display_name <init>
 //                             signature_documentation java public Typed4EpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
+//                             kind Constructor
 //                             ^^^^^^^ reference semanticdb maven . . Handler#
 //                                     ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                          display_name modelBuildingHandler
@@ -100,6 +112,7 @@ public void setData(T data1, U data2, V data3, W data4) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#setData().
 //                    display_name setData
 //                    signature_documentation java public void setData(T data1, U data2, V data3, W data4)
+//                    kind Method
 //                    documentation  Call this with the latest data when you want models to be rebuilt. The data will be passed on\n to {@link #buildModels(Object, Object, Object, Object)}\n
 //                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //                      ^^^^^ definition local 2
@@ -147,6 +160,7 @@ public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
 //                                    signature_documentation java @Override\npublic final void requestModelBuild()
+//                                    kind Method
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests.
@@ -166,6 +180,7 @@ public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#moveModel().
 //                      display_name moveModel
 //                      signature_documentation java @Override\npublic void moveModel(int fromPosition, int toPosition)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 6
 //                                       display_name fromPosition
@@ -192,6 +207,7 @@ public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#requestDelayedModelBuild().
 //                                     display_name requestDelayedModelBuild
 //                                     signature_documentation java @Override\npublic void requestDelayedModelBuild(int delayMs)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 8
 //                                                 display_name delayMs
@@ -216,6 +232,7 @@ protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels().
 //                                 display_name buildModels
 //                                 signature_documentation java @Override\nprotected final void buildModels()
+//                                 kind Method
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -236,6 +253,7 @@ protected final void buildModels() {
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#buildModels(+1).
 //                                    display_name buildModels
 //                                    signature_documentation java protected abstract void buildModels(T data1, U data2, V data3, W data4)
+//                                    kind AbstractMethod
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/Typed4EpoxyController#[T]
 //                                      ^^^^^ definition local 9
 //                                            display_name data1
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
index ef54e31f4..60710ab40 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java
@@ -27,6 +27,7 @@ public abstract class TypedEpoxyController<T> extends EpoxyController {
 //                    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#
 //                                         display_name TypedEpoxyController
 //                                         signature_documentation java public abstract class TypedEpoxyController<T>
+//                                         kind Class
 //                                         documentation  This is a wrapper around {@link com.airbnb.epoxy.EpoxyController} to simplify how data is\n accessed. Use this if the data required to build your models is represented by a single object.\n <p>\n To use this, create a subclass typed with your data object. Then, call {@link #setData(Object)}\n whenever that data changes. This class will handle calling {@link #buildModels(Object)} with the\n latest data.\n <p>\n You should NOT call {@link #requestModelBuild()} directly.\n\n @see Typed2EpoxyController\n @see Typed3EpoxyController\n @see Typed4EpoxyController\n
 //                                         relationship is_implementation semanticdb maven . . ModelCollector#
 //                                         relationship is_implementation semanticdb maven . . StickyHeaderCallbacks#
@@ -34,27 +35,32 @@ public abstract class TypedEpoxyController<T> extends EpoxyController {
 //                                         ^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //                                           display_name T
 //                                           signature_documentation java T
+//                                           kind TypeParameter
 //                                                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#
   private T currentData;
 //        ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //          ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
 //                      display_name currentData
 //                      signature_documentation java private T currentData
+//                      kind Field
   private boolean allowModelBuildRequests;
 //                ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
 //                                        display_name allowModelBuildRequests
 //                                        signature_documentation java private boolean allowModelBuildRequests
+//                                        kind Field
 
   public TypedEpoxyController() {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#`<init>`().
 //                            display_name <init>
 //                            signature_documentation java public TypedEpoxyController()
+//                            kind Constructor
   }
 
   public TypedEpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //       ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#`<init>`(+1).
 //                            display_name <init>
 //                            signature_documentation java public TypedEpoxyController(unresolved_type modelBuildingHandler, unresolved_type diffingHandler)
+//                            kind Constructor
 //                            ^^^^^^^ reference semanticdb maven . . Handler#
 //                                    ^^^^^^^^^^^^^^^^^^^^ definition local 0
 //                                                         display_name modelBuildingHandler
@@ -75,6 +81,7 @@ public final void setData(T data) {
 //                  ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#setData().
 //                          display_name setData
 //                          signature_documentation java public final void setData(T data)
+//                          kind Method
 //                          ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //                            ^^^^ definition local 2
 //                                 display_name data
@@ -97,6 +104,7 @@ public final void requestModelBuild() {
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestModelBuild().
 //                                    display_name requestModelBuild
 //                                    signature_documentation java @Override\npublic final void requestModelBuild()
+//                                    kind Method
 //                                    relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestModelBuild().
     if (!allowModelBuildRequests) {
 //       ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests.
@@ -116,6 +124,7 @@ public void moveModel(int fromPosition, int toPosition) {
 //            ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#moveModel().
 //                      display_name moveModel
 //                      signature_documentation java @Override\npublic void moveModel(int fromPosition, int toPosition)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#moveModel().
 //                          ^^^^^^^^^^^^ definition local 3
 //                                       display_name fromPosition
@@ -142,6 +151,7 @@ public void requestDelayedModelBuild(int delayMs) {
 //            ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#requestDelayedModelBuild().
 //                                     display_name requestDelayedModelBuild
 //                                     signature_documentation java @Override\npublic void requestDelayedModelBuild(int delayMs)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#requestDelayedModelBuild().
 //                                         ^^^^^^^ definition local 5
 //                                                 display_name delayMs
@@ -167,6 +177,7 @@ public final T getCurrentData() {
 //               ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#getCurrentData().
 //                              display_name getCurrentData
 //                              signature_documentation java @Nullable\npublic final T getCurrentData()
+//                              kind Method
     return currentData;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#currentData.
   }
@@ -177,6 +188,7 @@ protected final void buildModels() {
 //                     ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#buildModels().
 //                                 display_name buildModels
 //                                 signature_documentation java @Override\nprotected final void buildModels()
+//                                 kind Method
 //                                 relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyController#buildModels().
     if (!isBuildingModels()) {
 //       ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#isBuildingModels().
@@ -194,6 +206,7 @@ protected final void buildModels() {
 //                        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#buildModels(+1).
 //                                    display_name buildModels
 //                                    signature_documentation java protected abstract void buildModels(T data)
+//                                    kind AbstractMethod
 //                                    ^ reference semanticdb maven . . com/airbnb/epoxy/TypedEpoxyController#[T]
 //                                      ^^^^ definition local 6
 //                                           display_name data
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
index 2e9860d1b..b28f2ebfb 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
@@ -30,6 +30,7 @@ class UpdateOp {
 //    ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //             display_name UpdateOp
 //             signature_documentation java class UpdateOp
+//             kind Class
 //             documentation Defines an operation that makes a change to the epoxy model list. 
 
   @IntDef({ADD, REMOVE, UPDATE, MOVE})
@@ -46,6 +47,7 @@ class UpdateOp {
 //           ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                display_name Type
 //                signature_documentation java @IntDef({ADD, REMOVE, UPDATE, MOVE})\n@Retention(RetentionPolicy.SOURCE)\n@interface Type
+//                kind Interface
 //                relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
   }
 
@@ -53,33 +55,40 @@ class UpdateOp {
 //                 ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#ADD.
 //                     display_name ADD
 //                     signature_documentation java static final int ADD
+//                     kind StaticField
   static final int REMOVE = 1;
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#REMOVE.
 //                        display_name REMOVE
 //                        signature_documentation java static final int REMOVE
+//                        kind StaticField
   static final int UPDATE = 2;
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#UPDATE.
 //                        display_name UPDATE
 //                        signature_documentation java static final int UPDATE
+//                        kind StaticField
   static final int MOVE = 3;
 //                 ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#MOVE.
 //                      display_name MOVE
 //                      signature_documentation java static final int MOVE
+//                      kind StaticField
 
   @Type int type;
 // ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //          ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#type.
 //               display_name type
 //               signature_documentation java @Type\nint type
+//               kind Field
   int positionStart;
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
 //                  display_name positionStart
 //                  signature_documentation java int positionStart
+//                  kind Field
   /** Holds the target position if this is a MOVE */
   int itemCount;
 //    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
 //              display_name itemCount
 //              signature_documentation java int itemCount
+//              kind Field
 //              documentation Holds the target position if this is a MOVE 
   ArrayList<EpoxyModel<?>> payloads;
 //^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#
@@ -87,11 +96,13 @@ class UpdateOp {
 //                         ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#payloads.
 //                                  display_name payloads
 //                                  signature_documentation java ArrayList<EpoxyModel<?>> payloads
+//                                  kind Field
 
   private UpdateOp() {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#`<init>`().
 //                 display_name <init>
 //                 signature_documentation java private UpdateOp()
+//                 kind Constructor
   }
 
   static UpdateOp instance(@Type int type, int positionStart, int itemCount,
@@ -99,6 +110,7 @@ static UpdateOp instance(@Type int type, int positionStart, int itemCount,
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
 //                         display_name instance
 //                         signature_documentation java static UpdateOp instance(int type, int positionStart, int itemCount, EpoxyModel<?> payload)
+//                         kind StaticMethod
 //                          ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                   ^^^^ definition local 0
 //                                        display_name type
@@ -154,6 +166,7 @@ int positionEnd() {
 //    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionEnd().
 //                display_name positionEnd
 //                signature_documentation java int positionEnd()
+//                kind Method
 //                documentation Returns the index one past the last item in the affected range. 
     return positionStart + itemCount;
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
@@ -164,6 +177,7 @@ boolean isAfter(int position) {
 //        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#isAfter().
 //                display_name isAfter
 //                signature_documentation java boolean isAfter(int position)
+//                kind Method
 //                    ^^^^^^^^ definition local 5
 //                             display_name position
 //                             signature_documentation java int position
@@ -177,6 +191,7 @@ boolean isBefore(int position) {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#isBefore().
 //                 display_name isBefore
 //                 signature_documentation java boolean isBefore(int position)
+//                 kind Method
 //                     ^^^^^^^^ definition local 6
 //                              display_name position
 //                              signature_documentation java int position
@@ -190,6 +205,7 @@ boolean contains(int position) {
 //        ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#contains().
 //                 display_name contains
 //                 signature_documentation java boolean contains(int position)
+//                 kind Method
 //                     ^^^^^^^^ definition local 7
 //                              display_name position
 //                              signature_documentation java int position
@@ -205,6 +221,7 @@ void addPayload(@Nullable EpoxyModel<?> payload) {
 //     ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#addPayload().
 //                display_name addPayload
 //                signature_documentation java void addPayload(EpoxyModel<?> payload)
+//                kind Method
 //                 ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                          ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                        ^^^^^^^ definition local 8
@@ -245,6 +262,7 @@ public String toString() {
 //              ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOp#toString().
 //                       display_name toString
 //                       signature_documentation java @Override\npublic String toString()
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
     return "UpdateOp{"
         + "type=" + type
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
index 615fcc85e..bbe733a9f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
@@ -47,16 +47,19 @@ class UpdateOpHelper {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#
 //                   display_name UpdateOpHelper
 //                   signature_documentation java class UpdateOpHelper
+//                   kind Class
 //                   documentation Helper class to collect changes in a diff, batching when possible. 
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#`<init>`().
 //                   display_name <init>
 //                   signature_documentation java UpdateOpHelper()
+//                   kind Constructor
   final List<UpdateOp> opList = new ArrayList<>();
 //      ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //           ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
 //                            display_name opList
 //                            signature_documentation java final List<UpdateOp> opList
+//                            kind Field
 //                                  ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   // We have to be careful to update all item positions in the list when we
   // do a MOVE. This adds some complexity.
@@ -68,33 +71,40 @@ class UpdateOpHelper {
 //                     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#moves.
 //                           display_name moves
 //                           signature_documentation java final List<UpdateOp> moves
+//                           kind Field
 //                                 ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+1).
   private UpdateOp lastOp;
 //        ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                 ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#lastOp.
 //                        display_name lastOp
 //                        signature_documentation java private UpdateOp lastOp
+//                        kind Field
   private int numInsertions;
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
 //                          display_name numInsertions
 //                          signature_documentation java private int numInsertions
+//                          kind Field
   private int numInsertionBatches;
 //            ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertionBatches.
 //                                display_name numInsertionBatches
 //                                signature_documentation java private int numInsertionBatches
+//                                kind Field
   private int numRemovals;
 //            ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
 //                        display_name numRemovals
 //                        signature_documentation java private int numRemovals
+//                        kind Field
   private int numRemovalBatches;
 //            ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovalBatches.
 //                              display_name numRemovalBatches
 //                              signature_documentation java private int numRemovalBatches
+//                              kind Field
 
   void reset() {
 //     ^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#reset().
 //           display_name reset
 //           signature_documentation java void reset()
+//           kind Method
     opList.clear();
 //  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
 //         ^^^^^ reference semanticdb maven jdk 11 java/util/List#clear().
@@ -117,6 +127,7 @@ void add(int indexToInsert) {
 //     ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add().
 //         display_name add
 //         signature_documentation java void add(int indexToInsert)
+//         kind Method
 //             ^^^^^^^^^^^^^ definition local 0
 //                           display_name indexToInsert
 //                           signature_documentation java int indexToInsert
@@ -130,6 +141,7 @@ void add(int startPosition, int itemCount) {
 //     ^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
 //         display_name add
 //         signature_documentation java void add(int startPosition, int itemCount)
+//         kind Method
 //             ^^^^^^^^^^^^^ definition local 1
 //                           display_name startPosition
 //                           signature_documentation java int startPosition
@@ -179,6 +191,7 @@ void update(int indexToChange) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update().
 //            display_name update
 //            signature_documentation java void update(int indexToChange)
+//            kind Method
 //                ^^^^^^^^^^^^^ definition local 4
 //                              display_name indexToChange
 //                              signature_documentation java int indexToChange
@@ -192,6 +205,7 @@ void update(final int indexToChange, EpoxyModel<?> payload) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#update(+1).
 //            display_name update
 //            signature_documentation java void update(int indexToChange, EpoxyModel<?> payload)
+//            kind Method
 //                      ^^^^^^^^^^^^^ definition local 5
 //                                    display_name indexToChange
 //                                    signature_documentation java final int indexToChange
@@ -254,6 +268,7 @@ void remove(int indexToRemove) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove().
 //            display_name remove
 //            signature_documentation java void remove(int indexToRemove)
+//            kind Method
 //                ^^^^^^^^^^^^^ definition local 7
 //                              display_name indexToRemove
 //                              signature_documentation java int indexToRemove
@@ -267,6 +282,7 @@ void remove(int startPosition, int itemCount) {
 //     ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
 //            display_name remove
 //            signature_documentation java void remove(int startPosition, int itemCount)
+//            kind Method
 //                ^^^^^^^^^^^^^ definition local 8
 //                              display_name startPosition
 //                              signature_documentation java int startPosition
@@ -333,6 +349,7 @@ private boolean isLastOp(@UpdateOp.Type int updateType) {
 //                ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //                         display_name isLastOp
 //                         signature_documentation java private boolean isLastOp(int updateType)
+//                         kind Method
 //                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                                   ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                            ^^^^^^^^^^ definition local 11
@@ -350,6 +367,7 @@ private void addNewOperation(@Type int type, int position, int itemCount) {
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation().
 //                             display_name addNewOperation
 //                             signature_documentation java private void addNewOperation(int type, int position, int itemCount)
+//                             kind Method
 //                              ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                       ^^^^ definition local 12
 //                                            display_name type
@@ -374,6 +392,7 @@ private void addNewOperation(@Type int type, int position, int itemCount,
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1).
 //                             display_name addNewOperation
 //                             signature_documentation java private void addNewOperation(int type, int position, int itemCount, EpoxyModel<?> payload)
+//                             kind Method
 //                              ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#Type#
 //                                       ^^^^ definition local 15
 //                                            display_name type
@@ -412,6 +431,7 @@ private void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload) {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#addItemsToLastOperation().
 //                                     display_name addItemsToLastOperation
 //                                     signature_documentation java private void addItemsToLastOperation(int numItemsToAdd, EpoxyModel<?> payload)
+//                                     kind Method
 //                                         ^^^^^^^^^^^^^ definition local 19
 //                                                       display_name numItemsToAdd
 //                                                       signature_documentation java int numItemsToAdd
@@ -435,6 +455,7 @@ void move(int from, int to) {
 //     ^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#move().
 //          display_name move
 //          signature_documentation java void move(int from, int to)
+//          kind Method
 //              ^^^^ definition local 21
 //                   display_name from
 //                   signature_documentation java int from
@@ -471,6 +492,7 @@ int getNumRemovals() {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumRemovals().
 //                   display_name getNumRemovals
 //                   signature_documentation java int getNumRemovals()
+//                   kind Method
     return numRemovals;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
   }
@@ -479,6 +501,7 @@ boolean hasRemovals() {
 //        ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#hasRemovals().
 //                    display_name hasRemovals
 //                    signature_documentation java boolean hasRemovals()
+//                    kind Method
     return numRemovals > 0;
 //         ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovals.
   }
@@ -487,6 +510,7 @@ int getNumInsertions() {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumInsertions().
 //                     display_name getNumInsertions
 //                     signature_documentation java int getNumInsertions()
+//                     kind Method
     return numInsertions;
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
   }
@@ -495,6 +519,7 @@ boolean hasInsertions() {
 //        ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#hasInsertions().
 //                      display_name hasInsertions
 //                      signature_documentation java boolean hasInsertions()
+//                      kind Method
     return numInsertions > 0;
 //         ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertions.
   }
@@ -503,6 +528,7 @@ int getNumMoves() {
 //    ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumMoves().
 //                display_name getNumMoves
 //                signature_documentation java int getNumMoves()
+//                kind Method
     return moves.size();
 //         ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#moves.
 //               ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -512,6 +538,7 @@ int getNumInsertionBatches() {
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumInsertionBatches().
 //                           display_name getNumInsertionBatches
 //                           signature_documentation java int getNumInsertionBatches()
+//                           kind Method
     return numInsertionBatches;
 //         ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numInsertionBatches.
   }
@@ -520,6 +547,7 @@ int getNumRemovalBatches() {
 //    ^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#getNumRemovalBatches().
 //                         display_name getNumRemovalBatches
 //                         signature_documentation java int getNumRemovalBatches()
+//                         kind Method
     return numRemovalBatches;
 //         ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#numRemovalBatches.
   }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
index 90b07b486..cd3d000c1 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
@@ -62,6 +62,7 @@ class ViewHolderState extends LongSparseArray<ViewState> implements Parcelable {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 //                    display_name ViewHolderState
 //                    signature_documentation java @SuppressWarnings("WeakerAccess")\nclass ViewHolderState
+//                    kind Class
 //                    documentation  Helper for {@link EpoxyAdapter} to store the state of Views in the adapter. This is useful for\n saving changes due to user input, such as text input or selection, when a view is scrolled off\n screen or if the adapter needs to be recreated.\n <p/>\n This saved state is separate from the state represented by a {@link EpoxyModel}, which should\n represent the more permanent state of the data shown in the view. This class stores transient\n state that is added to the View after it is bound to a {@link EpoxyModel}. For example, a {@link\n EpoxyModel} may inflate and bind an EditText and then be responsible for styling it and attaching\n listeners. If the user then inputs text, scrolls the view offscreen and then scrolls back, this\n class will preserve the inputted text without the {@link EpoxyModel} needing to be aware of its\n existence.\n <p/>\n This class relies on the adapter having stable ids, as the state of a view is mapped to the id of\n the {@link EpoxyModel}.\n
 //                    relationship is_implementation semanticdb maven . . Parcelable#
 //                    relationship is_implementation semanticdb maven jdk 11 java/lang/Cloneable#
@@ -73,12 +74,14 @@ class ViewHolderState extends LongSparseArray<ViewState> implements Parcelable {
 //^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`().
 //                display_name <init>
 //                signature_documentation java ViewHolderState()
+//                kind Constructor
   }
 
   private ViewHolderState(int size) {
 //        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#`<init>`(+1).
 //                        display_name <init>
 //                        signature_documentation java private ViewHolderState(int size)
+//                        kind Constructor
 //                            ^^^^ definition local 0
 //                                 display_name size
 //                                 signature_documentation java int size
@@ -94,6 +97,7 @@ public int describeContents() {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#describeContents().
 //                            display_name describeContents
 //                            signature_documentation java @Override\npublic int describeContents()
+//                            kind Method
     return 0;
   }
 
@@ -103,6 +107,7 @@ public void writeToParcel(Parcel dest, int flags) {
 //            ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
 //                          display_name writeToParcel
 //                          signature_documentation java @Override\npublic void writeToParcel(unresolved_type dest, int flags)
+//                          kind Method
 //                          ^^^^^^ reference semanticdb maven . . Parcel#
 //                                 ^^^^ definition local 1
 //                                      display_name dest
@@ -149,6 +154,7 @@ public void writeToParcel(Parcel dest, int flags) {
 //                                             ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#CREATOR.
 //                                                     display_name CREATOR
 //                                                     signature_documentation java public static final unresolved_type CREATOR
+//                                                     kind StaticField
 //                                                           ^^^^^^^ reference semanticdb maven . . Creator#
 //                                                                   ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#
 
@@ -174,6 +180,7 @@ public boolean hasStateForHolder(EpoxyViewHolder holder) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#hasStateForHolder().
 //                                 display_name hasStateForHolder
 //                                 signature_documentation java public boolean hasStateForHolder(EpoxyViewHolder holder)
+//                                 kind Method
 //                                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                                 ^^^^^^ definition local 5
 //                                                        display_name holder
@@ -189,6 +196,7 @@ public void save(Collection<EpoxyViewHolder> holders) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save().
 //                 display_name save
 //                 signature_documentation java public void save(Collection<EpoxyViewHolder> holders)
+//                 kind Method
 //                 ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collection#
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                             ^^^^^^^ definition local 6
@@ -213,6 +221,7 @@ public void save(EpoxyViewHolder holder) {
 //            ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
 //                 display_name save
 //                 signature_documentation java public void save(EpoxyViewHolder holder)
+//                 kind Method
 //                 documentation Save the state of the view bound to the given holder. 
 //                 ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                 ^^^^^^ definition local 8
@@ -265,6 +274,7 @@ public void restore(EpoxyViewHolder holder) {
 //            ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#restore().
 //                    display_name restore
 //                    signature_documentation java public void restore(EpoxyViewHolder holder)
+//                    kind Method
 //                    documentation  If a state was previously saved for this view holder via {@link #save} it will be restored\n here.\n
 //                    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#
 //                                    ^^^^^^ definition local 10
@@ -311,6 +321,7 @@ public static class ViewState extends SparseArray<Parcelable> implements Parcela
 //                    ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#
 //                              display_name ViewState
 //                              signature_documentation java public static class ViewState
+//                              kind Class
 //                              documentation  A wrapper around a sparse array as a helper to save the state of a view. This also adds\n parcelable support.\n
 //                              relationship is_implementation semanticdb maven . . Parcelable#
 //                              relationship is_implementation semanticdb maven . . SparseArray#
@@ -322,12 +333,14 @@ public static class ViewState extends SparseArray<Parcelable> implements Parcela
 //  ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`().
 //            display_name <init>
 //            signature_documentation java ViewState()
+//            kind Constructor
     }
 
     private ViewState(int size, int[] keys, Parcelable[] values) {
 //          ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`(+1).
 //                    display_name <init>
 //                    signature_documentation java private ViewState(int size, int[] keys, unresolved_type[] values)
+//                    kind Constructor
 //                        ^^^^ definition local 12
 //                             display_name size
 //                             signature_documentation java int size
@@ -364,6 +377,7 @@ public void save(View view) {
 //              ^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#save().
 //                   display_name save
 //                   signature_documentation java public void save(unresolved_type view)
+//                   kind Method
 //                   ^^^^ reference semanticdb maven . . View#
 //                        ^^^^ definition local 16
 //                             display_name view
@@ -393,6 +407,7 @@ public void restore(View view) {
 //              ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#restore().
 //                      display_name restore
 //                      signature_documentation java public void restore(unresolved_type view)
+//                      kind Method
 //                      ^^^^ reference semanticdb maven . . View#
 //                           ^^^^ definition local 18
 //                                display_name view
@@ -428,6 +443,7 @@ private void setIdIfNoneExists(View view) {
 //               ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#setIdIfNoneExists().
 //                                 display_name setIdIfNoneExists
 //                                 signature_documentation java private void setIdIfNoneExists(unresolved_type view)
+//                                 kind Method
 //                                 documentation  If a view hasn't had an id set we need to set a temporary one in order to save state, since a\n view won't save its state unless it has an id. The view's id is also the key into the sparse\n array for its saved state, so the temporary one we choose just needs to be consistent between\n saving and restoring state.\n
 //                                 ^^^^ reference semanticdb maven . . View#
 //                                      ^^^^ definition local 20
@@ -454,6 +470,7 @@ public int describeContents() {
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#describeContents().
 //                              display_name describeContents
 //                              signature_documentation java @Override\npublic int describeContents()
+//                              kind Method
       return 0;
     }
 
@@ -463,6 +480,7 @@ public void writeToParcel(Parcel parcel, int flags) {
 //              ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
 //                            display_name writeToParcel
 //                            signature_documentation java @Override\npublic void writeToParcel(unresolved_type parcel, int flags)
+//                            kind Method
 //                            ^^^^^^ reference semanticdb maven . . Parcel#
 //                                   ^^^^^^ definition local 21
 //                                          display_name parcel
@@ -532,6 +550,7 @@ public void writeToParcel(Parcel parcel, int flags) {
 //                                         ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#CREATOR.
 //                                                 display_name CREATOR
 //                                                 signature_documentation java public static final unresolved_type CREATOR
+//                                                 kind StaticField
         new Parcelable.ClassLoaderCreator<ViewState>() {
 //          ^^^^^^^^^^ reference semanticdb maven . . Parcelable/
 //                     ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . Parcelable/ClassLoaderCreator#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
index 8545437a2..a5e4f4c3b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
@@ -22,9 +22,11 @@ class ViewTypeManager {
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#
 //                    display_name ViewTypeManager
 //                    signature_documentation java class ViewTypeManager
+//                    kind Class
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#`<init>`().
 //                    display_name <init>
 //                    signature_documentation java ViewTypeManager()
+//                    kind Constructor
   private static final Map<Class, Integer> VIEW_TYPE_MAP = new HashMap<>();
 //                     ^^^ reference semanticdb maven jdk 11 java/util/Map#
 //                         ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
@@ -32,6 +34,7 @@ class ViewTypeManager {
 //                                         ^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
 //                                                       display_name VIEW_TYPE_MAP
 //                                                       signature_documentation java private static final Map<Class, Integer> VIEW_TYPE_MAP
+//                                                       kind StaticField
 //                                                             ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashMap#`<init>`(+2).
   /**
    * The last model that had its view type looked up. This is stored so in most cases we can quickly
@@ -44,6 +47,7 @@ class ViewTypeManager {
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup.
 //                                         display_name lastModelForViewTypeLookup
 //                                         signature_documentation java @Nullable\nEpoxyModel<?> lastModelForViewTypeLookup
+//                                         kind Field
 //                                         documentation  The last model that had its view type looked up. This is stored so in most cases we can quickly\n look up what view type belongs to which model.\n
 
   /**
@@ -58,6 +62,7 @@ void resetMapForTesting() {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#resetMapForTesting().
 //                        display_name resetMapForTesting
 //                        signature_documentation java @VisibleForTesting\nvoid resetMapForTesting()
+//                        kind Method
 //                        documentation  The type map is static so that models of the same class share the same views across different\n adapters. This is useful for view recycling when the adapter instance changes, or when there\n are multiple adapters. For testing purposes though it is good to be able to clear the map so we\n don't carry over values across tests.\n
     VIEW_TYPE_MAP.clear();
 //  ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
@@ -68,6 +73,7 @@ int getViewTypeAndRememberModel(EpoxyModel<?> model) {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewTypeAndRememberModel().
 //                                display_name getViewTypeAndRememberModel
 //                                signature_documentation java int getViewTypeAndRememberModel(EpoxyModel<?> model)
+//                                kind Method
 //                                ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                              ^^^^^ definition local 0
 //                                                    display_name model
@@ -85,6 +91,7 @@ static int getViewType(EpoxyModel<?> model) {
 //           ^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
 //                       display_name getViewType
 //                       signature_documentation java static int getViewType(EpoxyModel<?> model)
+//                       kind StaticMethod
 //                       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                     ^^^^^ definition local 1
 //                                           display_name model
@@ -161,6 +168,7 @@ EpoxyModel<?> getModelForViewType(BaseEpoxyAdapter adapter, int viewType) {
 //              ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
 //                                  display_name getModelForViewType
 //                                  signature_documentation java EpoxyModel<?> getModelForViewType(BaseEpoxyAdapter adapter, int viewType)
+//                                  kind Method
 //                                  documentation  Find the model that has the given view type so we can create a view for that model. In most\n cases this value is a layout resource and we could simply inflate it, but to support {@link\n EpoxyModelWithView} we can't assume the view type is a layout. In that case we need to lookup\n the model so we can ask it to create a new view for itself.\n <p>\n To make this efficient, we rely on the RecyclerView implementation detail that {@link\n BaseEpoxyAdapter#getItemViewType(int)} is called immediately before {@link\n BaseEpoxyAdapter#onCreateViewHolder(android.view.ViewGroup, int)} . We cache the last model\n that had its view type looked up, and unless that implementation changes we expect to have a\n very fast lookup for the correct model.\n <p>\n To be safe, we fallback to searching through all models for a view type match. This is slow and\n shouldn't be needed, but is a guard against recyclerview behavior changing.\n
 //                                  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#
 //                                                   ^^^^^^^ definition local 5
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
index cc38dd742..f7510761a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
@@ -20,9 +20,11 @@ public final class VisibilityState {
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#
 //                                 display_name VisibilityState
 //                                 signature_documentation java public final class VisibilityState
+//                                 kind Class
 //                 ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#`<init>`().
 //                                 display_name <init>
 //                                 signature_documentation java public VisibilityState()
+//                                 kind Constructor
 
   @Retention(RetentionPolicy.SOURCE)
 // ^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/annotation/Retention#
@@ -47,6 +49,7 @@ public final class VisibilityState {
 //                  ^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#Visibility#
 //                             display_name Visibility
 //                             signature_documentation java @Retention(RetentionPolicy.SOURCE)\n@IntDef({VISIBLE, INVISIBLE, FOCUSED_VISIBLE, UNFOCUSED_VISIBLE, FULL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_INVISIBLE})\npublic @interface Visibility
+//                             kind Interface
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
   }
 
@@ -58,6 +61,7 @@ public final class VisibilityState {
 //                        ^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#VISIBLE.
 //                                display_name VISIBLE
 //                                signature_documentation java public static final int VISIBLE
+//                                kind StaticField
 //                                documentation  Event triggered when a Component enters the Visible Range. This happens when at least a pixel\n of the Component is visible.\n
 
   /**
@@ -69,6 +73,7 @@ public final class VisibilityState {
 //                        ^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#INVISIBLE.
 //                                  display_name INVISIBLE
 //                                  signature_documentation java public static final int INVISIBLE
+//                                  kind StaticField
 //                                  documentation  Event triggered when a Component becomes invisible. This is the same with exiting the Visible\n Range, the Focused Range and the Full Impression Range. All the code that needs to be executed\n when a component leaves any of these ranges should be written in the handler for this event.\n
 
   /**
@@ -80,6 +85,7 @@ public final class VisibilityState {
 //                        ^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#FOCUSED_VISIBLE.
 //                                        display_name FOCUSED_VISIBLE
 //                                        signature_documentation java public static final int FOCUSED_VISIBLE
+//                                        kind StaticField
 //                                        documentation  Event triggered when a Component enters the Focused Range. This happens when either the\n Component occupies at least half of the viewport or, if the Component is smaller than half of\n the viewport, when the it is fully visible.\n
 
   /**
@@ -91,6 +97,7 @@ public final class VisibilityState {
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#UNFOCUSED_VISIBLE.
 //                                          display_name UNFOCUSED_VISIBLE
 //                                          signature_documentation java public static final int UNFOCUSED_VISIBLE
+//                                          kind StaticField
 //                                          documentation  Event triggered when a Component exits the Focused Range. The Focused Range is defined as at\n least half of the viewport or, if the Component is smaller than half of the viewport, when the\n it is fully visible.\n
 
   /**
@@ -102,6 +109,7 @@ public final class VisibilityState {
 //                        ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#FULL_IMPRESSION_VISIBLE.
 //                                                display_name FULL_IMPRESSION_VISIBLE
 //                                                signature_documentation java public static final int FULL_IMPRESSION_VISIBLE
+//                                                kind StaticField
 //                                                documentation  Event triggered when a Component enters the Full Impression Range. This happens, for instance\n in the case of a vertical RecyclerView, when both the top and bottom edges of the component\n become visible.\n
 
   /**
@@ -114,6 +122,7 @@ public final class VisibilityState {
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_VISIBLE.
 //                                                   display_name PARTIAL_IMPRESSION_VISIBLE
 //                                                   signature_documentation java public static final int PARTIAL_IMPRESSION_VISIBLE
+//                                                   kind StaticField
 //                                                   documentation  Event triggered when a Component enters the Partial Impression Range. This happens, for\n instance in the case of a vertical RecyclerView, when the percentage of the visible area is\n at least the specified threshold. The threshold can be set in\n {@link EpoxyVisibilityTracker#setPartialImpressionThresholdPercentage(int)}.\n
 
   /**
@@ -126,5 +135,6 @@ public final class VisibilityState {
 //                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_INVISIBLE.
 //                                                     display_name PARTIAL_IMPRESSION_INVISIBLE
 //                                                     signature_documentation java public static final int PARTIAL_IMPRESSION_INVISIBLE
+//                                                     kind StaticField
 //                                                     documentation  Event triggered when a Component exits the Partial Impression Range. This happens, for\n instance in the case of a vertical RecyclerView, when the percentage of the visible area is\n less than a specified threshold. The threshold can be set in\n {@link EpoxyVisibilityTracker#setPartialImpressionThresholdPercentage(int)}.\n
 }
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
index c14e02419..44fa60ef9 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
@@ -24,15 +24,18 @@ public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
 //           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#
 //                                                  display_name WrappedEpoxyModelCheckedChangeListener
 //                                                  signature_documentation java public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
+//                                                  kind Class
 //                                                  documentation  Used in the generated models to transform normal checked change listener to model\n checked change.\n
 //                                                  relationship is_implementation semanticdb maven . . OnCheckedChangeListener#
 //                                                  ^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[T]
 //                                                    display_name T
 //                                                    signature_documentation java T extends EpoxyModel<?>
+//                                                    kind TypeParameter
 //                                                            ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                                                           ^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[V]
 //                                                                             display_name V
 //                                                                             signature_documentation java V
+//                                                                             kind TypeParameter
     implements OnCheckedChangeListener {
 //             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . OnCheckedChangeListener#
 
@@ -43,11 +46,13 @@ public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
 //                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#originalCheckedChangeListener.
 //                                                                               display_name originalCheckedChangeListener
 //                                                                               signature_documentation java private final OnModelCheckedChangeListener<T, V> originalCheckedChangeListener
+//                                                                               kind Field
 
   public WrappedEpoxyModelCheckedChangeListener(
 //       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#`<init>`().
 //                                              display_name <init>
 //                                              signature_documentation java public WrappedEpoxyModelCheckedChangeListener(OnModelCheckedChangeListener<T, V> checkedListener)
+//                                              kind Constructor
       OnModelCheckedChangeListener<T, V> checkedListener
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/OnModelCheckedChangeListener#
 //                                 ^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[T]
@@ -74,6 +79,7 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 //            ^^^^^^^^^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
 //                             display_name onCheckedChanged
 //                             signature_documentation java @Override\npublic void onCheckedChanged(unresolved_type button, boolean isChecked)
+//                             kind Method
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven . . CompoundButton#
 //                                            ^^^^^^ definition local 1
 //                                                   display_name button
@@ -137,6 +143,7 @@ public boolean equals(Object o) {
 //               ^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#equals().
 //                      display_name equals
 //                      signature_documentation java @Override\npublic boolean equals(Object o)
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                             ^ definition local 5
@@ -176,6 +183,7 @@ public int hashCode() {
 //           ^^^^^^^^ definition semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#hashCode().
 //                    display_name hashCode
 //                    signature_documentation java @Override\npublic int hashCode()
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
     return originalCheckedChangeListener.hashCode();
 //         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#originalCheckedChangeListener.
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
index 98b9417ee..3e14844f4 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue396.scala
@@ -5,59 +5,70 @@ case class Issue396(a: Int)
 //         ^^^^^^^^ definition semanticdb maven . . minimized/Issue396#
 //                  display_name Issue396
 //                  signature_documentation scala case class Issue396(a: Int)
+//                  kind Class
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#copy().
 //                  display_name copy
 //                  signature_documentation scala def copy(a: Int): Issue396
+//                  kind Method
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#productElement().
 //                  display_name productElement
 //                  signature_documentation scala def productElement(x$1: Int): Any
+//                  kind Method
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396.
 //                  display_name Issue396
 //                  signature_documentation scala object Issue396
+//                  kind Object
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396.apply().
 //                  display_name apply
 //                  signature_documentation scala def apply(a: Int): Issue396
+//                  kind Method
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Function1#apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue396#productElementName().
 //                  display_name productElementName
 //                  signature_documentation scala def productElementName(x$1: Int): String
+//                  kind Method
 //                  relationship is_definition semanticdb maven . . minimized/Issue396#
 //                  relationship is_reference semanticdb maven . . minimized/Issue396.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //                 ^ definition semanticdb maven . . minimized/Issue396#`<init>`().
 //                   display_name <init>
 //                   signature_documentation scala def this(a: Int)
+//                   kind Constructor
 //                  ^ definition semanticdb maven . . minimized/Issue396#a.
 //                    display_name a
 //                    signature_documentation scala val a: Int
+//                    kind Method
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396.apply().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396.apply().(a)
 //                    display_name a
 //                    signature_documentation scala a: Int 
+//                    kind Parameter
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    display_name a
 //                    signature_documentation scala a: Int 
+//                    kind Parameter
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#copy().(a)
 //                    relationship is_reference semanticdb maven . . minimized/Issue396.apply().(a)
 //                  _ synthetic_definition semanticdb maven . . minimized/Issue396#copy().(a)
 //                    display_name a
 //                    signature_documentation scala default a: Int 
+//                    kind Parameter
 //                    relationship is_reference semanticdb maven . . minimized/Issue396#`<init>`().(a)
 //                    relationship is_reference is_definition semanticdb maven . . minimized/Issue396#a.
 //                    relationship is_reference semanticdb maven . . minimized/Issue396.apply().(a)
@@ -66,6 +77,7 @@ object Issue396App {
 //     ^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue396App.
 //                 display_name Issue396App
 //                 signature_documentation scala object Issue396App
+//                 kind Object
   println(Issue396)
 //^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
 //        ^^^^^^^^ reference semanticdb maven . . minimized/Issue396.
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
index cf8cdb6ac..c2e24a5cb 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue397.scala
@@ -5,16 +5,20 @@ class Issue397 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue397#
 //             display_name Issue397
 //             signature_documentation scala class Issue397
+//             kind Class
 //             ^ definition semanticdb maven . . minimized/Issue397#`<init>`().
 //               display_name <init>
 //               signature_documentation scala def this()
+//               kind Constructor
   var blah = Set("abc")
 //    ^^^^ definition semanticdb maven . . minimized/Issue397#blah().
 //         display_name blah
 //         signature_documentation scala var blah: Set[String]
+//         kind Method
 //    ____ synthetic_definition semanticdb maven . . minimized/Issue397#`blah_=`().
 //         display_name blah_=
 //         signature_documentation scala var blah_=(x$1: Set[String]): Unit
+//         kind Method
 //         relationship is_definition semanticdb maven . . minimized/Issue397#blah().
 //           ^^^ reference semanticdb maven . . scala/Predef.Set.
 //              ^ reference semanticdb maven . . scala/collection/IterableFactory#apply().
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
index 33f421274..ef1f327da 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue403.scala
@@ -5,59 +5,70 @@ case class Issue403(value: String)
 //         ^^^^^^^^ definition semanticdb maven . . minimized/Issue403#
 //                  display_name Issue403
 //                  signature_documentation scala case class Issue403(value: String)
+//                  kind Class
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#productElementName().
 //                  display_name productElementName
 //                  signature_documentation scala def productElementName(x$1: Int): String
+//                  kind Method
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403.apply().
 //                  display_name apply
 //                  signature_documentation scala def apply(value: String): Issue403
+//                  kind Method
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Function1#apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403.
 //                  display_name Issue403
 //                  signature_documentation scala object Issue403
+//                  kind Object
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#productElement().
 //                  display_name productElement
 //                  signature_documentation scala def productElement(x$1: Int): Any
+//                  kind Method
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                  relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         ________ synthetic_definition semanticdb maven . . minimized/Issue403#copy().
 //                  display_name copy
 //                  signature_documentation scala def copy(value: String): Issue403
+//                  kind Method
 //                  relationship is_definition semanticdb maven . . minimized/Issue403#
 //                  relationship is_reference semanticdb maven . . minimized/Issue403.apply().
 //                 ^ definition semanticdb maven . . minimized/Issue403#`<init>`().
 //                   display_name <init>
 //                   signature_documentation scala def this(value: String)
+//                   kind Constructor
 //                  ^^^^^ definition semanticdb maven . . minimized/Issue403#value.
 //                        display_name value
 //                        signature_documentation scala val value: String
+//                        kind Method
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403.apply().(value)
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403#copy().(value)
 //                        display_name value
 //                        signature_documentation scala default value: String 
+//                        kind Parameter
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
 //                        relationship is_reference semanticdb maven . . minimized/Issue403.apply().(value)
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403.apply().(value)
 //                        display_name value
 //                        signature_documentation scala value: String 
+//                        kind Parameter
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
 //                  _____ synthetic_definition semanticdb maven . . minimized/Issue403#`<init>`().(value)
 //                        display_name value
 //                        signature_documentation scala value: String 
+//                        kind Parameter
 //                        relationship is_reference semanticdb maven . . minimized/Issue403#copy().(value)
 //                        relationship is_reference is_definition semanticdb maven . . minimized/Issue403#value.
 //                        relationship is_reference semanticdb maven . . minimized/Issue403.apply().(value)
@@ -67,10 +78,12 @@ object Issue403App {
 //     ^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue403App.
 //                 display_name Issue403App
 //                 signature_documentation scala object Issue403App
+//                 kind Object
   def instantiations(): Unit = {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue403App.instantiations().
 //                   display_name instantiations
 //                   signature_documentation scala def instantiations(): Unit
+//                   kind Method
 //                      ^^^^ reference semanticdb maven . . scala/Unit#
     println(Issue403("a").value)
 //  ^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
@@ -96,6 +109,7 @@ object Issue403App {
 //                  ^^^^^ definition local 1
 //                        display_name value
 //                        signature_documentation scala value: String 
+//                        kind Variable
         println(value)
 //      ^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
 //              ^^^^^ reference local 1
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
index 12cb7628c..94b33f130 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue412.scala
@@ -5,18 +5,22 @@ class Issue412 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue412#
 //             display_name Issue412
 //             signature_documentation scala class Issue412
+//             kind Class
 //             ^ definition semanticdb maven . . minimized/Issue412#`<init>`().
 //               display_name <init>
 //               signature_documentation scala def this()
+//               kind Constructor
   val a: Int = 5
 //    ^ definition semanticdb maven . . minimized/Issue412#a.
 //      display_name a
 //      signature_documentation scala val a: Int
+//      kind Method
 //       ^^^ reference semanticdb maven . . scala/Int#
   val b: Long = a
 //    ^ definition semanticdb maven . . minimized/Issue412#b.
 //      display_name b
 //      signature_documentation scala val b: Long
+//      kind Method
 //       ^^^^ reference semanticdb maven . . scala/Long#
 //              ^ reference semanticdb maven . . minimized/Issue412#a.
 
@@ -24,9 +28,11 @@ class Issue412 {
 //    ^ definition semanticdb maven . . minimized/Issue412#a().
 //      display_name a
 //      signature_documentation scala def a(b: Long): Unit
+//      kind Method
 //      ^ definition semanticdb maven . . minimized/Issue412#a().(b)
 //        display_name b
 //        signature_documentation scala b: Long 
+//        kind Parameter
 //         ^^^^ reference semanticdb maven . . scala/Long#
 //                ^^^^ reference semanticdb maven . . scala/Unit#
     println(b)
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
index 5a15723eb..eaec807d1 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue413.scala
@@ -5,16 +5,19 @@ trait Issue413 {
 //    ^^^^^^^^ definition semanticdb maven . . minimized/Issue413#
 //             display_name Issue413
 //             signature_documentation scala trait Issue413
+//             kind Trait
   val b: Int
 //    ^ definition semanticdb maven . . minimized/Issue413#b.
 //      display_name b
 //      signature_documentation scala val b: Int
+//      kind AbstractMethod
 //      relationship is_reference is_implementation semanticdb maven . . minimized/Issue413Subclass#b.
 //       ^^^ reference semanticdb maven . . scala/Int#
   val c: Int
 //    ^ definition semanticdb maven . . minimized/Issue413#c.
 //      display_name c
 //      signature_documentation scala val c: Int
+//      kind AbstractMethod
 //      relationship is_reference is_implementation semanticdb maven . . minimized/Issue413Subclass#c.
 //       ^^^ reference semanticdb maven . . scala/Int#
 }
@@ -22,21 +25,25 @@ object Issue413 {
 //     ^^^^^^^^ definition semanticdb maven . . minimized/Issue413.
 //              display_name Issue413
 //              signature_documentation scala object Issue413
+//              kind Object
   def main(): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/Issue413.main().
 //         display_name main
 //         signature_documentation scala def main(): Unit
+//         kind Method
 //            ^^^^ reference semanticdb maven . . scala/Unit#
     val a = new Issue413Subclass()
 //      ^ definition local 0
 //        display_name a
 //        signature_documentation scala a: Issue413Subclass 
+//        kind Variable
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Issue413Subclass#
 //                              ^ reference semanticdb maven . . minimized/Issue413Subclass#`<init>`().
     val b: Issue413 = a
 //      ^ definition local 1
 //        display_name b
 //        signature_documentation scala b: Issue413 
+//        kind Variable
 //         ^^^^^^^^ reference semanticdb maven . . minimized/Issue413#
 //                    ^ reference local 0
     println(a.b + b.b)
@@ -53,19 +60,23 @@ class Issue413Subclass extends Issue413 {
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue413Subclass#
 //                     display_name Issue413Subclass
 //                     signature_documentation scala class Issue413Subclass
+//                     kind Class
 //                     ^ definition semanticdb maven . . minimized/Issue413Subclass#`<init>`().
 //                       display_name <init>
 //                       signature_documentation scala def this()
+//                       kind Constructor
 //                             ^^^^^^^^ reference semanticdb maven . . minimized/Issue413#
 //                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   override val b = 10
 //             ^ definition semanticdb maven . . minimized/Issue413Subclass#b.
 //               display_name b
 //               signature_documentation scala val b: Int
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven . . minimized/Issue413#b.
   override val c = 10
 //             ^ definition semanticdb maven . . minimized/Issue413Subclass#c.
 //               display_name c
 //               signature_documentation scala val c: Int
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven . . minimized/Issue413#c.
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
index 1c1bddfa5..945458a24 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414.scala
@@ -5,30 +5,36 @@ object Issue414 {
 //     ^^^^^^^^ definition semanticdb maven . . minimized/Issue414.
 //              display_name Issue414
 //              signature_documentation scala object Issue414
+//              kind Object
   trait A {
 //      ^ definition semanticdb maven . . minimized/Issue414.A#
 //        display_name A
 //        signature_documentation scala trait A
+//        kind Trait
     def b(): Unit
 //      ^ definition semanticdb maven . . minimized/Issue414.A#b().
 //        display_name b
 //        signature_documentation scala def b(): Unit
+//        kind AbstractMethod
 //           ^^^^ reference semanticdb maven . . scala/Unit#
   }
   val a1 =
 //    ^^ definition semanticdb maven . . minimized/Issue414.a1.
 //       display_name a1
 //       signature_documentation scala val a1: {}
+//       kind Method
     new A {
 //      ^ definition local 0
 //        display_name $anon
 //        signature_documentation scala final class $anon
+//        kind Class
 //      ^ reference semanticdb maven . . minimized/Issue414.A#
 //        ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       override def b(): Unit = {
 //                 ^ definition local 1
 //                   display_name b
 //                   signature_documentation scala def b(): Unit
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven . . minimized/Issue414.A#b().
 //                      ^^^^ reference semanticdb maven . . scala/Unit#
         print("Hello")
@@ -39,6 +45,7 @@ object Issue414 {
 //    ^^ definition semanticdb maven . . minimized/Issue414.a2.
 //       display_name a2
 //       signature_documentation scala val a2: A
+//       kind Method
 //        ^ reference semanticdb maven . . minimized/Issue414.A#
 //            ^^ reference semanticdb maven . . minimized/Issue414.a1.
   println(a1.b())
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
index 170a9035e..961b4d16c 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/Issue414Reference.scala
@@ -5,6 +5,7 @@ object Issue414Reference {
 //     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Issue414Reference.
 //                       display_name Issue414Reference
 //                       signature_documentation scala object Issue414Reference
+//                       kind Object
   println(Issue414.a1.b())
 //^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
 //        ^^^^^^^^ reference semanticdb maven . . minimized/Issue414.
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
index c2452ece1..9750761a8 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaMain.scala
@@ -6,13 +6,16 @@ object MinimizedScalaMain {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.
 //                        display_name MinimizedScalaMain
 //                        signature_documentation scala object MinimizedScalaMain
+//                        kind Object
   def main(args: Array[String]): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.main().
 //         display_name main
 //         signature_documentation scala def main(args: Array[String]): Unit
+//         kind Method
 //         ^^^^ definition semanticdb maven . . minimized/MinimizedScalaMain.main().(args)
 //              display_name args
 //              signature_documentation scala args: Array[String] 
+//              kind Parameter
 //               ^^^^^ reference semanticdb maven . . scala/Array#
 //                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                               ^^^^ reference semanticdb maven . . scala/Unit#
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
index 998a567fb..aed34f742 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSignatures.scala
@@ -8,44 +8,53 @@ case class MinimizedCaseClass(value: String) {
 //         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                            display_name MinimizedCaseClass
 //                            signature_documentation scala case class MinimizedCaseClass(value: String)
+//                            kind Class
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#productElement().
 //                            display_name productElement
 //                            signature_documentation scala def productElement(x$1: Int): Any
+//                            kind Method
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                            relationship is_reference is_implementation semanticdb maven . . scala/Product#productElement().
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#productElementName().
 //                            display_name productElementName
 //                            signature_documentation scala def productElementName(x$1: Int): String
+//                            kind Method
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                            relationship is_reference is_implementation semanticdb maven . . scala/Product#productElementName().
 //         __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#copy().
 //                            display_name copy
 //                            signature_documentation scala def copy(value: String): MinimizedCaseClass
+//                            kind Method
 //                            relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass#
 //                           ^ definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().
 //                             display_name <init>
 //                             signature_documentation scala def this(value: String)
+//                             kind Constructor
 //                            ^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#value.
 //                                  display_name value
 //                                  signature_documentation scala val value: String
+//                                  kind Method
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  display_name value
 //                                  signature_documentation scala default value: String 
+//                                  kind Parameter
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference is_definition semanticdb maven . . minimized/MinimizedCaseClass#value.
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  display_name value
 //                                  signature_documentation scala value: String 
+//                                  kind Parameter
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  relationship is_reference is_definition semanticdb maven . . minimized/MinimizedCaseClass#value.
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                            _____ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass.apply().(value)
 //                                  display_name value
 //                                  signature_documentation scala value: String 
+//                                  kind Parameter
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 //                                  relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass#copy().(value)
 //                                  relationship is_reference is_definition semanticdb maven . . minimized/MinimizedCaseClass#value.
@@ -54,6 +63,7 @@ case class MinimizedCaseClass(value: String) {
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass#`<init>`(+1).
 //         display_name <init>
 //         signature_documentation scala def this()
+//         kind Constructor
 //                 ^ reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().
 //                  ^^^^^ reference semanticdb maven . . minimized/MinimizedCaseClass#`<init>`().(value)
 }
@@ -61,15 +71,18 @@ object MinimizedCaseClass {
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass.
 //                        display_name MinimizedCaseClass
 //                        signature_documentation scala object MinimizedCaseClass
+//                        kind Object
 //                        relationship is_reference semanticdb maven . . minimized/MinimizedCaseClass.apply().
 //     __________________ synthetic_definition semanticdb maven . . minimized/MinimizedCaseClass.apply().
 //                        display_name apply
 //                        signature_documentation scala def apply(value: String): MinimizedCaseClass
+//                        kind Method
 //                        relationship is_definition semanticdb maven . . minimized/MinimizedCaseClass.
   def main(): Unit = {
 //    ^^^^ definition semanticdb maven . . minimized/MinimizedCaseClass.main().
 //         display_name main
 //         signature_documentation scala def main(): Unit
+//         kind Method
 //            ^^^^ reference semanticdb maven . . scala/Unit#
     println(MinimizedCaseClass.apply(value = "value1").copy(value = "value2").value)
 //  ^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
@@ -86,26 +99,32 @@ trait MinimizedTrait[T] extends AutoCloseable {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedTrait#
 //                   display_name MinimizedTrait
 //                   signature_documentation scala trait MinimizedTrait[T]
+//                   kind Trait
 //                   ^ definition semanticdb maven . . minimized/MinimizedTrait#[T]
 //                     display_name T
 //                     signature_documentation scala T
+//                     kind TypeParameter
 //                              ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/AutoCloseable#
   def add(e: T): T
 //    ^^^ definition semanticdb maven . . minimized/MinimizedTrait#add().
 //        display_name add
 //        signature_documentation scala def add(e: T): T
+//        kind AbstractMethod
 //        ^ definition semanticdb maven . . minimized/MinimizedTrait#add().(e)
 //          display_name e
 //          signature_documentation scala e: T 
+//          kind Parameter
 //           ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
 //               ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
   final def +(e: T): T = add(e)
 //          ^ definition semanticdb maven . . minimized/MinimizedTrait#`+`().
 //            display_name +
 //            signature_documentation scala final def +(e: T): T
+//            kind Method
 //            ^ definition semanticdb maven . . minimized/MinimizedTrait#`+`().(e)
 //              display_name e
 //              signature_documentation scala e: T 
+//              kind Parameter
 //               ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
 //                   ^ reference semanticdb maven . . minimized/MinimizedTrait#[T]
 //                       ^^^ reference semanticdb maven . . minimized/MinimizedTrait#add().
@@ -116,9 +135,11 @@ class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#
 //                             display_name MinimizedScalaSignatures
 //                             signature_documentation scala class MinimizedScalaSignatures
+//                             kind Class
 //                             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#`<init>`().
 //                               display_name <init>
 //                               signature_documentation scala def this()
+//                               kind Constructor
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/AutoCloseable#
 //                                                   ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 //                                                        ^^^^ reference semanticdb maven . . java/
@@ -128,6 +149,7 @@ class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
 //    ^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures#close().
 //          display_name close
 //          signature_documentation scala def close(): Unit
+//          kind Method
 //          relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/AutoCloseable#close().
 //             ^^^^ reference semanticdb maven . . scala/Unit#
 }
@@ -136,6 +158,7 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //     ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.
 //                              display_name MinimizedScalaSignatures
 //                              signature_documentation scala object MinimizedScalaSignatures
+//                              kind Object
 //                                      ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/MinimizedScalaSignatures#
 //                                                               ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures#`<init>`().
 //                                                                    ^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Comparable#
@@ -146,9 +169,11 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //            ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotation().
 //                       display_name annotation
 //                       signature_documentation scala @inline\ndef annotation(x: Int): Int
+//                       kind Method
 //                       ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotation().(x)
 //                         display_name x
 //                         signature_documentation scala x: Int 
+//                         kind Parameter
 //                          ^^^ reference semanticdb maven . . scala/Int#
 //                                ^^^ reference semanticdb maven . . scala/Int#
 //                                      ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.annotation().(x)
@@ -159,9 +184,11 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //                              ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotationMessage().
 //                                                display_name annotationMessage
 //                                                signature_documentation scala @deprecated\ndef annotationMessage(x: Int): Int
+//                                                kind Method
 //                                                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.annotationMessage().(x)
 //                                                  display_name x
 //                                                  signature_documentation scala x: Int 
+//                                                  kind Parameter
 //                                                   ^^^ reference semanticdb maven . . scala/Int#
 //                                                         ^^^ reference semanticdb maven . . scala/Int#
 //                                                               ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.annotationMessage().(x)
@@ -170,10 +197,12 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.compareTo().
 //              display_name compareTo
 //              signature_documentation scala def compareTo(x: Int): Int
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Comparable#compareTo().
 //              ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.compareTo().(x)
 //                display_name x
 //                signature_documentation scala x: Int 
+//                kind Parameter
 //                 ^^^ reference semanticdb maven . . scala/Int#
 //                       ^^^ reference semanticdb maven . . scala/Int#
 //                             ^^^ reference semanticdb maven . . scala/Predef.`???`().
@@ -181,12 +210,15 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //    ^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().
 //             display_name identity
 //             signature_documentation scala def identity(e: T): T
+//             kind Method
 //             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
 //               display_name T
 //               signature_documentation scala T
+//               kind TypeParameter
 //                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.identity().(e)
 //                  display_name e
 //                  signature_documentation scala e: T 
+//                  kind Parameter
 //                   ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
 //                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().[T]
 //                           ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.identity().(e)
@@ -194,23 +226,27 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //    ^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.tuple().
 //          display_name tuple
 //          signature_documentation scala def tuple(): (Int, String)
+//          kind Method
 //              ^^^ reference semanticdb maven . . scala/Int#
 //                   ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function0(): () => String = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function0().
 //              display_name function0
 //              signature_documentation scala def function0(): String=> String
+//              kind Method
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function1(): Int => String = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function1().
 //              display_name function1
 //              signature_documentation scala def function1(): (Int) => String
+//              kind Method
 //                 ^^^ reference semanticdb maven . . scala/Int#
 //                        ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def function2(): (Int, String) => Unit = null
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.function2().
 //              display_name function2
 //              signature_documentation scala def function2(): (Int, String) => Unit
+//              kind Method
 //                  ^^^ reference semanticdb maven . . scala/Int#
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                  ^^^^ reference semanticdb maven . . scala/Unit#
@@ -218,6 +254,7 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.typeParameter().
 //                  display_name typeParameter
 //                  signature_documentation scala def typeParameter(): Map[Int, String]
+//                  kind Method
 //                     ^^^ reference semanticdb maven . . scala/Predef.Map#
 //                         ^^^ reference semanticdb maven . . scala/Int#
 //                              ^^^^^^ reference semanticdb maven . . scala/Predef.String#
@@ -225,22 +262,27 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().
 //                  display_name termParameter
 //                  signature_documentation scala def termParameter(a: Int, b: String): String
+//                  kind Method
 //                  ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().(a)
 //                    display_name a
 //                    signature_documentation scala a: Int 
+//                    kind Parameter
 //                     ^^^ reference semanticdb maven . . scala/Int#
 //                          ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.termParameter().(b)
 //                            display_name b
 //                            signature_documentation scala b: String 
+//                            kind Parameter
 //                             ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                      ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def singletonType(e: String): e.type = e
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().
 //                  display_name singletonType
 //                  signature_documentation scala def singletonType(e: String): e.type
+//                  kind Method
 //                  ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
 //                    display_name e
 //                    signature_documentation scala e: String 
+//                    kind Parameter
 //                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                              ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
 //                                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.singletonType().(e)
@@ -248,58 +290,72 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //    ^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.thisType().
 //             display_name thisType
 //             signature_documentation scala def thisType(): this.type
+//             kind Method
   def constantInt(): 1 = 1
 //    ^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantInt().
 //                display_name constantInt
 //                signature_documentation scala def constantInt(): 1
+//                kind Method
   def constantString(): "string" = "string"
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantString().
 //                   display_name constantString
 //                   signature_documentation scala def constantString(): "string"
+//                   kind Method
   def constantBoolean(): true = true
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantBoolean().
 //                    display_name constantBoolean
 //                    signature_documentation scala def constantBoolean(): true
+//                    kind Method
   def constantFloat(): 1.2f = 1.2f
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantFloat().
 //                  display_name constantFloat
 //                  signature_documentation scala def constantFloat(): 1.2f
+//                  kind Method
   def constantChar(): 'a' = 'a'
 //    ^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.constantChar().
 //                 display_name constantChar
 //                 signature_documentation scala def constantChar(): 'a'
+//                 kind Method
   def structuralType(): { val x: Int; def foo(a: Int): String } = null
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.structuralType().
 //                   display_name structuralType
 //                   signature_documentation scala def structuralType(): { val x: Int; def foo(a: Int): String }
+//                   kind Method
 //                            ^ definition local 1
 //                              display_name x
 //                              signature_documentation scala val x: Int
+//                              kind AbstractMethod
 //                               ^^^ reference semanticdb maven . . scala/Int#
 //                                        ^^^ definition local 2
 //                                            display_name foo
 //                                            signature_documentation scala def foo(a: Int): String
+//                                            kind AbstractMethod
 //                                            ^ definition local 3
 //                                              display_name a
 //                                              signature_documentation scala a: Int 
+//                                              kind Parameter
 //                                               ^^^ reference semanticdb maven . . scala/Int#
 //                                                     ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   def byNameType(a: => Int): Unit = ()
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.byNameType().
 //               display_name byNameType
 //               signature_documentation scala def byNameType(a: => Int): Unit
+//               kind Method
 //               ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.byNameType().(a)
 //                 display_name a
 //                 signature_documentation scala a: => Int 
+//                 kind Parameter
 //                     ^^^ reference semanticdb maven . . scala/Int#
 //                           ^^^^ reference semanticdb maven . . scala/Unit#
   def repeatedType(a: Int*): Unit = ()
 //    ^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.repeatedType().
 //                 display_name repeatedType
 //                 signature_documentation scala def repeatedType(a: Int*): Unit
+//                 kind Method
 //                 ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.repeatedType().(a)
 //                   display_name a
 //                   signature_documentation scala a: Int* 
+//                   kind Parameter
 //                    ^^^ reference semanticdb maven . . scala/Int#
 //                           ^^^^ reference semanticdb maven . . scala/Unit#
 
@@ -307,45 +363,55 @@ object MinimizedScalaSignatures extends MinimizedScalaSignatures with Comparable
 //     ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeAlias#
 //               display_name TypeAlias
 //               signature_documentation scala type TypeAlias >: Int <: Int
+//               kind Type
 //                 ^^^ reference semanticdb maven . . scala/Int#
   type ParameterizedTypeAlias[A] = () => A
 //     ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#
 //                            display_name ParameterizedTypeAlias
 //                            signature_documentation scala type ParameterizedTypeAlias >: A=> A <: A=> A
+//                            kind Type
 //                            ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#[A]
 //                              display_name A
 //                              signature_documentation scala A
+//                              kind TypeParameter
 //                                       ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias#[A]
   type ParameterizedTypeAlias2[A, B] = A => B
 //     ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#
 //                             display_name ParameterizedTypeAlias2
 //                             signature_documentation scala type ParameterizedTypeAlias2 >: (A) => B <: (A) => B
+//                             kind Type
 //                             ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[A]
 //                               display_name A
 //                               signature_documentation scala A
+//                               kind TypeParameter
 //                                ^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[B]
 //                                  display_name B
 //                                  signature_documentation scala B
+//                                  kind TypeParameter
 //                                     ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[A]
 //                                          ^ reference semanticdb maven . . minimized/MinimizedScalaSignatures.ParameterizedTypeAlias2#[B]
   type TypeBound
 //     ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeBound#
 //               display_name TypeBound
 //               signature_documentation scala type TypeBound
+//               kind Type
   type TypeUpperBound <: String
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeUpperBound#
 //                    display_name TypeUpperBound
 //                    signature_documentation scala type TypeUpperBound <: String
+//                    kind Type
 //                       ^^^^^^ reference semanticdb maven . . scala/Predef.String#
   type TypeLowerBound >: CharSequence
 //     ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeLowerBound#
 //                    display_name TypeLowerBound
 //                    signature_documentation scala type TypeLowerBound >: CharSequence
+//                    kind Type
 //                       ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
   type TypeLowerUpperBound >: String <: CharSequence 
 //     ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSignatures.TypeLowerUpperBound#
 //                         display_name TypeLowerUpperBound
 //                         signature_documentation scala type TypeLowerUpperBound >: String <: CharSequence
+//                         kind Type
 //                            ^^^^^^ reference semanticdb maven . . scala/Predef.String#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
index 2bcdbca98..bd8c7cd1b 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/MinimizedScalaSynthetic.scala
@@ -17,13 +17,16 @@ class MinimizedScalaSynthetic {
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#
 //                            display_name MinimizedScalaSynthetic
 //                            signature_documentation scala class MinimizedScalaSynthetic
+//                            kind Class
 //                            ^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#`<init>`().
 //                              display_name <init>
 //                              signature_documentation scala def this()
+//                              kind Constructor
   def everything(): Unit = Future(1)
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#everything().
 //               display_name everything
 //               signature_documentation scala def everything(): Unit
+//               kind Method
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                               ^ reference semanticdb maven . . scala/concurrent/Future.apply().
@@ -32,6 +35,7 @@ class MinimizedScalaSynthetic {
 //    ^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#applyTree().
 //              display_name applyTree
 //              signature_documentation scala def applyTree(): Unit
+//              kind Method
 //                 ^^^^ reference semanticdb maven . . scala/Unit#
 //                        ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                               ^^^^^ reference semanticdb maven . . scala/concurrent/Future.apply().
@@ -41,6 +45,7 @@ class MinimizedScalaSynthetic {
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#applyTree2().
 //               display_name applyTree2
 //               signature_documentation scala def applyTree2(): Unit
+//               kind Method
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^ reference semanticdb maven . . scala/package.List.
 //                              ^^^^^ reference semanticdb maven . . scala/collection/IterableFactory#apply().
@@ -51,6 +56,7 @@ class MinimizedScalaSynthetic {
 //    ^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#selectTree().
 //               display_name selectTree
 //               signature_documentation scala def selectTree(): Unit
+//               kind Method
 //                  ^^^^ reference semanticdb maven . . scala/Unit#
 //                         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                               ^ reference semanticdb maven . . scala/concurrent/Future.apply().
@@ -60,6 +66,7 @@ class MinimizedScalaSynthetic {
 //    ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#typeApplyTree().
 //                  display_name typeApplyTree
 //                  signature_documentation scala def typeApplyTree(): Unit
+//                  kind Method
 //                     ^^^^ reference semanticdb maven . . scala/Unit#
 //                            ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                                   ^^^^^ reference semanticdb maven . . scala/concurrent/Future.apply().
@@ -68,18 +75,21 @@ class MinimizedScalaSynthetic {
 //    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedScalaSynthetic#forComprehensions().
 //                      display_name forComprehensions
 //                      signature_documentation scala def forComprehensions(): Unit
+//                      kind Method
 //                         ^^^^ reference semanticdb maven . . scala/Unit#
     for {
       x <- Future(1)
 //    ^ definition local 0
 //      display_name x
 //      signature_documentation scala x: Int 
+//      kind Parameter
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //               ^ reference semanticdb maven . . scala/concurrent/Future.apply().
       y <- Future.successful(1)
 //    ^ definition local 1
 //      display_name y
 //      signature_documentation scala y: Int 
+//      kind Parameter
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                ^^^^^^^^^^ reference semanticdb maven . . scala/concurrent/Future.successful().
       if y < 2
@@ -89,6 +99,7 @@ class MinimizedScalaSynthetic {
 //    ^ definition local 2
 //      display_name z
 //      signature_documentation scala z: Int 
+//      kind Parameter
 //         ^^^^^^ reference semanticdb maven . . scala/concurrent/Future.
 //                ^^^^^ reference semanticdb maven . . scala/concurrent/Future.apply().
 //                      ^^^ reference semanticdb maven . . scala/Int#
diff --git a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
index cd9fdcbc9..882f5f7a6 100644
--- a/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
+++ b/tests/snapshots/src/main/generated/tests/minimized-scala/src/main/scala/minimized/ReflectiveCall.scala
@@ -10,22 +10,27 @@ class ReflectiveCall {
 //    ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ReflectiveCall#
 //                   display_name ReflectiveCall
 //                   signature_documentation scala class ReflectiveCall
+//                   kind Class
 //                   ^ definition semanticdb maven . . minimized/ReflectiveCall#`<init>`().
 //                     display_name <init>
 //                     signature_documentation scala def this()
+//                     kind Constructor
   // Reproduction for https://github.com/scalameta/scalameta/issues/2788
   val a =
 //    ^ definition semanticdb maven . . minimized/ReflectiveCall#a.
 //      display_name a
 //      signature_documentation scala val a: { val b: Int }
+//      kind Method
     new {
 //      ^ definition local 0
 //        display_name $anon
 //        signature_documentation scala final class $anon
+//        kind Class
       val b = 1
 //        ^ definition local 1
 //          display_name b
 //          signature_documentation scala val b: Int
+//          kind Method
     }
   println(a.b)
 //^^^^^^^ reference semanticdb maven . . scala/Predef.println(+1).
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
index b6e23d2ae..221e9b617 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AbstractClasses.java
@@ -4,14 +4,17 @@ public abstract class AbstractClasses {
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#
 //                                    display_name AbstractClasses
 //                                    signature_documentation java public abstract class AbstractClasses
+//                                    kind Class
 //                    ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#`<init>`().
 //                                    display_name <init>
 //                                    signature_documentation java public AbstractClasses()
+//                                    kind Constructor
   public String defaultImplementation() {
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //              ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#defaultImplementation().
 //                                    display_name defaultImplementation
 //                                    signature_documentation java public String defaultImplementation()
+//                                    kind Method
     return "";
   }
 
@@ -20,5 +23,6 @@ public String defaultImplementation() {
 //                       ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AbstractClasses#abstractImplementation().
 //                                              display_name abstractImplementation
 //                                              signature_documentation java public abstract String abstractImplementation()
+//                                              kind AbstractMethod
 //                                              relationship is_reference is_implementation semanticdb maven . . minimized/SubClasses#abstractImplementation().
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
index a0d4b3649..411a1920d 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
@@ -54,6 +54,7 @@
 //                ^^^^^^^^^^^ definition semanticdb maven . . minimized/Annotations#
 //                            display_name Annotations
 //                            signature_documentation java @Documented\n@Retention(RetentionPolicy.RUNTIME)\n@Target({CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})\npublic @interface Annotations
+//                            kind Interface
 //                            relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 
   String value() default "";
@@ -61,10 +62,12 @@
 //       ^^^^^ definition semanticdb maven . . minimized/Annotations#value().
 //             display_name value
 //             signature_documentation java public abstract String value()
+//             kind AbstractMethod
 
   String format() default "";
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //       ^^^^^^ definition semanticdb maven . . minimized/Annotations#format().
 //              display_name format
 //              signature_documentation java public abstract String format()
+//              kind AbstractMethod
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
index fa19800c8..bd6c5d9c8 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
@@ -12,13 +12,16 @@ public class AnonymousClasses {
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnonymousClasses#
 //                            display_name AnonymousClasses
 //                            signature_documentation java @SuppressWarnings("ALL")\npublic class AnonymousClasses
+//                            kind Class
 //           ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnonymousClasses#`<init>`().
 //                            display_name <init>
 //                            signature_documentation java public AnonymousClasses()
+//                            kind Constructor
   public static int app(int n) {
 //                  ^^^ definition semanticdb maven . . minimized/AnonymousClasses#app().
 //                      display_name app
 //                      signature_documentation java public static int app(int n)
+//                      kind StaticMethod
 //                          ^ definition local 0
 //                            display_name n
 //                            signature_documentation java int n
@@ -43,6 +46,7 @@ public Integer apply(Integer integer) {
 //                             display_name apply
 //                             signature_documentation java @Override\npublic Integer apply(Integer integer)
 //                             enclosing_symbol local 2
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven jdk 11 java/util/function/Function#apply().
 //                             ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                                     ^^^^^^^ definition local 4
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
index 4729c71a8..1c562c29a 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
@@ -4,14 +4,17 @@ public class Arrays {
 //           ^^^^^^ definition semanticdb maven . . minimized/Arrays#
 //                  display_name Arrays
 //                  signature_documentation java public class Arrays
+//                  kind Class
 //           ^^^^^^ definition semanticdb maven . . minimized/Arrays#`<init>`().
 //                  display_name <init>
 //                  signature_documentation java public Arrays()
+//                  kind Constructor
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Arrays#app().
 //                         display_name app
 //                         signature_documentation java public static String app()
+//                         kind StaticMethod
     int[] a = {1, 2, 3};
 //        ^ definition local 0
 //          display_name a
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
index d848ff8de..dab68b098 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ClassOf.java
@@ -4,14 +4,17 @@ public class ClassOf {
 //           ^^^^^^^ definition semanticdb maven . . minimized/ClassOf#
 //                   display_name ClassOf
 //                   signature_documentation java public class ClassOf
+//                   kind Class
 //           ^^^^^^^ definition semanticdb maven . . minimized/ClassOf#`<init>`().
 //                   display_name <init>
 //                   signature_documentation java public ClassOf()
+//                   kind Constructor
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/ClassOf#app().
 //                         display_name app
 //                         signature_documentation java public static String app()
+//                         kind StaticMethod
     return ClassOf.class.getName();
 //         ^^^^^^^ reference semanticdb maven . . minimized/ClassOf#
 //                 ^^^^^ reference semanticdb maven . . minimized/ClassOf#class.
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
index 2e55c1800..87d65a42d 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Docstrings.java
@@ -5,16 +5,19 @@ public class Docstrings {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#
 //                      display_name Docstrings
 //                      signature_documentation java public class Docstrings
+//                      kind Class
 //                      documentation Example class docstring. 
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#`<init>`().
 //                      display_name <init>
 //                      signature_documentation java public Docstrings()
+//                      kind Constructor
 
   /** Example field docstring. */
   public static int field = 42;
 //                  ^^^^^ definition semanticdb maven . . minimized/Docstrings#field.
 //                        display_name field
 //                        signature_documentation java public static int field
+//                        kind StaticField
 //                        documentation Example field docstring. 
 
   /**
@@ -26,6 +29,7 @@ public static int method() {
 //                  ^^^^^^ definition semanticdb maven . . minimized/Docstrings#method().
 //                         display_name method
 //                         signature_documentation java public static int method()
+//                         kind StaticMethod
 //                         documentation  Example method docstring.\n\n @return 42.\n
     return 42;
   }
@@ -40,6 +44,7 @@ public static int methodParameter(int n) {
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Docstrings#methodParameter().
 //                                  display_name methodParameter
 //                                  signature_documentation java public static int methodParameter(int n)
+//                                  kind StaticMethod
 //                                  documentation  Example method parameter docstring.\n\n @param n The parameter.\n @return The number + 42.\n
 //                                      ^ definition local 0
 //                                        display_name n
@@ -54,6 +59,7 @@ public static String app() {
 //                     ^^^ definition semanticdb maven . . minimized/Docstrings#app().
 //                         display_name app
 //                         signature_documentation java public static String app()
+//                         kind StaticMethod
     return String.format("%s%s%s", field, method(), methodParameter(42));
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#format().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
index a94eca703..a86cbeae2 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
@@ -14,6 +14,7 @@ enum Enums {
 //   ^^^^^ definition semanticdb maven . . minimized/Enums#
 //         display_name Enums
 //         signature_documentation java enum Enums
+//         kind Enum
 //         relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //         relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //         relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
@@ -37,11 +38,13 @@ enum Enums {
 //              ^^^^^ definition semanticdb maven . . minimized/Enums#value.
 //                    display_name value
 //                    signature_documentation java public String value
+//                    kind Field
 
   Enums(String value, int a) {
 //^^^^^ definition semanticdb maven . . minimized/Enums#`<init>`().
 //      display_name <init>
 //      signature_documentation java private Enums(String value, int a)
+//      kind Constructor
 //      ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //             ^^^^^ definition local 0
 //                   display_name value
@@ -61,6 +64,7 @@ public static String app() {
 //                     ^^^ definition semanticdb maven . . minimized/Enums#app().
 //                         display_name app
 //                         signature_documentation java public static String app()
+//                         kind StaticMethod
     String all = Arrays.stream(values()).map(e -> e.value).map(Enums::valueOf).collect(Collectors.toList()).toString();
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //         ^^^ definition local 2
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
index f8e762a58..d1d34b8fc 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
@@ -4,45 +4,56 @@ public class Fields {
 //           ^^^^^^ definition semanticdb maven . . minimized/Fields#
 //                  display_name Fields
 //                  signature_documentation java public class Fields
+//                  kind Class
 //           ^^^^^^ definition semanticdb maven . . minimized/Fields#`<init>`().
 //                  display_name <init>
 //                  signature_documentation java public Fields()
+//                  kind Constructor
   private final int privateField = 0;
 //                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#privateField.
 //                               display_name privateField
 //                               signature_documentation java private final int privateField
+//                               kind Field
   protected int protectedField = 0;
 //              ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#protectedField.
 //                             display_name protectedField
 //                             signature_documentation java protected int protectedField
+//                             kind Field
   public int publicField = 0;
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#publicField.
 //                       display_name publicField
 //                       signature_documentation java public int publicField
+//                       kind Field
   private static final int staticPrivateField = 0;
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticPrivateField.
 //                                            display_name staticPrivateField
 //                                            signature_documentation java private static final int staticPrivateField
+//                                            kind StaticField
   protected static int staticProtectedFields = 0;
 //                     ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticProtectedFields.
 //                                           display_name staticProtectedFields
 //                                           signature_documentation java protected static int staticProtectedFields
+//                                           kind StaticField
   public static int staticPublicField = 0;
 //                  ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#staticPublicField.
 //                                    display_name staticPublicField
 //                                    signature_documentation java public static int staticPublicField
+//                                    kind StaticField
 
   public class InnerFields {
 //             ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#
 //                         display_name InnerFields
 //                         signature_documentation java public class InnerFields
+//                         kind Class
 //             ^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#`<init>`().
 //                         display_name <init>
 //                         signature_documentation java public InnerFields()
+//                         kind Constructor
     public int publicInnerField = publicField;
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerFields#publicInnerField.
 //                              display_name publicInnerField
 //                              signature_documentation java public int publicInnerField
+//                              kind Field
 //                                ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#publicField.
   }
 
@@ -50,17 +61,21 @@ public static class InnerStaticFields {
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#
 //                                      display_name InnerStaticFields
 //                                      signature_documentation java public static class InnerStaticFields
+//                                      kind Class
 //                    ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#`<init>`().
 //                                      display_name <init>
 //                                      signature_documentation java public InnerStaticFields()
+//                                      kind Constructor
     public int publicNonStaticInnerField = 0;
 //             ^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#publicNonStaticInnerField.
 //                                       display_name publicNonStaticInnerField
 //                                       signature_documentation java public int publicNonStaticInnerField
+//                                       kind Field
     public static int publicStaticInnerField = 0;
 //                    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Fields#InnerStaticFields#publicStaticInnerField.
 //                                           display_name publicStaticInnerField
 //                                           signature_documentation java public static int publicStaticInnerField
+//                                           kind StaticField
   }
 
   public static String app() {
@@ -68,6 +83,7 @@ public static String app() {
 //                     ^^^ definition semanticdb maven . . minimized/Fields#app().
 //                         display_name app
 //                         signature_documentation java public static String app()
+//                         kind StaticMethod
     Fields fields = new Fields();
 //  ^^^^^^ reference semanticdb maven . . minimized/Fields#
 //         ^^^^^^ definition local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
index f534ecc4c..ca70ac31b 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
@@ -13,13 +13,16 @@ public class ForComprehensions {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ForComprehensions#
 //                             display_name ForComprehensions
 //                             signature_documentation java public class ForComprehensions
+//                             kind Class
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ForComprehensions#`<init>`().
 //                             display_name <init>
 //                             signature_documentation java public ForComprehensions()
+//                             kind Constructor
   public static int app(int n) {
 //                  ^^^ definition semanticdb maven . . minimized/ForComprehensions#app().
 //                      display_name app
 //                      signature_documentation java public static int app(int n)
+//                      kind StaticMethod
 //                          ^ definition local 0
 //                            display_name n
 //                            signature_documentation java int n
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
index 0dc6ca08c..24505c9e1 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
@@ -4,31 +4,37 @@ public class InnerClasses {
 //           ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#
 //                        display_name InnerClasses
 //                        signature_documentation java public class InnerClasses
+//                        kind Class
 
   private final int exampleField;
 //                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#exampleField.
 //                               display_name exampleField
 //                               signature_documentation java private final int exampleField
+//                               kind Field
 
   private static final String STRING = "asdf";
 //                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                            ^^^^^^ definition semanticdb maven . . minimized/InnerClasses#STRING.
 //                                   display_name STRING
 //                                   signature_documentation java private static final String STRING
+//                                   kind StaticField
 
   private static final int top = 5;
 //                         ^^^ definition semanticdb maven . . minimized/InnerClasses#top.
 //                             display_name top
 //                             signature_documentation java private static final int top
+//                             kind StaticField
   private static final int bottom = 10;
 //                         ^^^^^^ definition semanticdb maven . . minimized/InnerClasses#bottom.
 //                                display_name bottom
 //                                signature_documentation java private static final int bottom
+//                                kind StaticField
 
   public InnerClasses(int exampleField) {
 //       ^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#`<init>`().
 //                    display_name <init>
 //                    signature_documentation java public InnerClasses(int exampleField)
+//                    kind Constructor
 //                        ^^^^^^^^^^^^ definition local 0
 //                                     display_name exampleField
 //                                     signature_documentation java int exampleField
@@ -42,12 +48,14 @@ public enum InnerEnum {
 //            ^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#
 //                      display_name InnerEnum
 //                      signature_documentation java public enum InnerEnum
+//                      kind Enum
 //                      relationship is_implementation semanticdb maven jdk 11 java/io/Serializable#
 //                      relationship is_implementation semanticdb maven jdk 11 java/lang/Comparable#
 //                      relationship is_implementation semanticdb maven jdk 11 java/lang/Enum#
 //            ^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#`<init>`().
 //                      display_name <init>
 //                      signature_documentation java private InnerEnum()
+//                      kind Constructor
     A,
 //  ^ definition semanticdb maven . . minimized/InnerClasses#InnerEnum#A.
 //    display_name A
@@ -69,17 +77,21 @@ public interface InnerInterface<A, B> {
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                display_name InnerInterface
 //                                signature_documentation java public interface InnerInterface<A, B>
+//                                kind Interface
 //                                ^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#[A]
 //                                  display_name A
 //                                  signature_documentation java A
+//                                  kind TypeParameter
 //                                   ^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#[B]
 //                                     display_name B
 //                                     signature_documentation java B
+//                                     kind TypeParameter
     B apply(A a);
 //  ^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#[B]
 //    ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //          display_name apply
 //          signature_documentation java public abstract B apply(A a)
+//          kind AbstractMethod
 //          relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerClass#apply().
 //          ^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#[A]
 //            ^ definition local 1
@@ -92,11 +104,13 @@ public interface InnerInterface<A, B> {
 //                  ^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation#
 //                                  display_name InnerAnnotation
 //                                  signature_documentation java public @interface InnerAnnotation
+//                                  kind Interface
 //                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
     int value();
 //      ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation#value().
 //            display_name value
 //            signature_documentation java public abstract int value()
+//            kind AbstractMethod
   }
 
   @SuppressWarnings(STRING + " ")
@@ -110,20 +124,24 @@ public static class InnerStaticClass {
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#
 //                                     display_name InnerStaticClass
 //                                     signature_documentation java @SuppressWarnings(STRING + " ")\n@InnerAnnotation(top / bottom)\npublic static class InnerStaticClass
+//                                     kind Class
 //                    ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#`<init>`().
 //                                     display_name <init>
 //                                     signature_documentation java public InnerStaticClass()
+//                                     kind Constructor
 
     public static void innerStaticMethod() {}
 //                     ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod().
 //                                       display_name innerStaticMethod
 //                                       signature_documentation java public static void innerStaticMethod()
+//                                       kind StaticMethod
   }
 
   public class InnerClass implements InnerInterface<Integer, Integer> {
 //             ^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#
 //                        display_name InnerClass
 //                        signature_documentation java public class InnerClass
+//                        kind Class
 //                        relationship is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                   ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                                  ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
@@ -132,11 +150,13 @@ public class InnerClass implements InnerInterface<Integer, Integer> {
 //                    ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#field.
 //                          display_name field
 //                          signature_documentation java private final int field
+//                          kind Field
 
     public InnerClass(int field) {
 //         ^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#`<init>`().
 //                    display_name <init>
 //                    signature_documentation java public InnerClass(int field)
+//                    kind Constructor
 //                        ^^^^^ definition local 2
 //                              display_name field
 //                              signature_documentation java int field
@@ -150,6 +170,7 @@ public void innerMethod() {
 //              ^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#innerMethod().
 //                          display_name innerMethod
 //                          signature_documentation java public void innerMethod()
+//                          kind Method
       System.out.println(field + exampleField);
 //    ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //           ^^^ reference semanticdb maven jdk 11 java/lang/System#out.
@@ -165,6 +186,7 @@ public Integer apply(Integer integer) {
 //                 ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerClass#apply().
 //                       display_name apply
 //                       signature_documentation java @Override\npublic Integer apply(Integer integer)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //                       ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
 //                               ^^^^^^^ definition local 3
@@ -181,13 +203,16 @@ private static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a) {
 //                ^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
 //                  display_name A
 //                  signature_documentation java A
+//                  kind TypeParameter
 //                   ^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
 //                     display_name B
 //                     signature_documentation java B
+//                     kind TypeParameter
 //                      ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
 //                        ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#runInnerInterface().
 //                                          display_name runInnerInterface
 //                                          signature_documentation java private static <A, B> B runInnerInterface(InnerInterface<A, B> fn, A a)
+//                                          kind StaticMethod
 //                                          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                                                         ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[A]
 //                                                            ^ reference semanticdb maven . . minimized/InnerClasses#runInnerInterface().[B]
@@ -210,6 +235,7 @@ public static void testEnum(InnerEnum magicEnum) {
 //                   ^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#testEnum().
 //                            display_name testEnum
 //                            signature_documentation java public static void testEnum(InnerEnum magicEnum)
+//                            kind StaticMethod
 //                            ^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerEnum#
 //                                      ^^^^^^^^^ definition local 6
 //                                                display_name magicEnum
@@ -268,6 +294,7 @@ public static void testAnon() {
 //                   ^^^^^^^^ definition semanticdb maven . . minimized/InnerClasses#testAnon().
 //                            display_name testAnon
 //                            signature_documentation java public static void testAnon()
+//                            kind StaticMethod
     InnerInterface<String, String> fn =
 //  ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                 ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
@@ -288,6 +315,7 @@ public String apply(String s) {
 //                            display_name apply
 //                            signature_documentation java @Override\npublic String apply(String s)
 //                            enclosing_symbol local 8
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven . . minimized/InnerClasses#InnerInterface#apply().
 //                            ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                   ^ definition local 10
@@ -311,6 +339,7 @@ public static String app() {
 //                     ^^^ definition semanticdb maven . . minimized/InnerClasses#app().
 //                         display_name app
 //                         signature_documentation java public static String app()
+//                         kind StaticMethod
     int a = 42;
 //      ^ definition local 11
 //        display_name a
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
index 979b22f1f..ccab9b4ea 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Interfaces.java
@@ -4,16 +4,19 @@ public interface Interfaces {
 //               ^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#
 //                          display_name Interfaces
 //                          signature_documentation java public interface Interfaces
+//                          kind Interface
   static void staticInterfaceMethod() {}
 //            ^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#staticInterfaceMethod().
 //                                  display_name staticInterfaceMethod
 //                                  signature_documentation java public static void staticInterfaceMethod()
+//                                  kind StaticMethod
 
   String abstractInterfaceMethod();
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //       ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod().
 //                               display_name abstractInterfaceMethod
 //                               signature_documentation java public abstract String abstractInterfaceMethod()
+//                               kind AbstractMethod
 //                               relationship is_reference is_implementation semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod().
 
   default String defaultInterfaceMethod() {
@@ -21,6 +24,7 @@ default String defaultInterfaceMethod() {
 //               ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Interfaces#defaultInterfaceMethod().
 //                                      display_name defaultInterfaceMethod
 //                                      signature_documentation java public default String defaultInterfaceMethod()
+//                                      kind Method
     return "default";
   }
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
index 79e8497c5..01161039a 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/LombokBuilder.java
@@ -52,27 +52,34 @@
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#build(). 1:4
 //              display_name build
 //              signature_documentation java @SuppressWarnings("all")\npublic Hello build()
+//              kind Method
 //              definition semanticdb maven . . minimized/Hello#builder(). 1:6
 //              display_name builder
 //              signature_documentation java @SuppressWarnings("all")\npublic static HelloBuilder builder()
+//              kind StaticMethod
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#toString(). 1:7
 //              display_name toString
 //              signature_documentation java @Override\n@SuppressWarnings("all")\npublic String toString()
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder# 1:11
 //              display_name HelloBuilder
 //              signature_documentation java @SuppressWarnings("all")\npublic static class HelloBuilder
+//              kind Class
 //              definition semanticdb maven . . minimized/Hello#HelloBuilder#`<init>`(). 1:11
 //              display_name <init>
 //              signature_documentation java @SuppressWarnings("all")\nHelloBuilder()
+//              kind Constructor
 //              reference semanticdb maven . . minimized/Hello#HelloBuilder#`<init>`(). 1:11
 class Hello {
 //    ^^^^^ definition semanticdb maven . . minimized/Hello#
 //          display_name Hello
 //          signature_documentation java @Builder\nclass Hello
+//          kind Class
 //    ^^^^^ definition semanticdb maven . . minimized/Hello#`<init>`().
 //          display_name <init>
 //          signature_documentation java @SuppressWarnings("all")\nHello(String message)
+//          kind Constructor
 //    ^^^^^ reference semanticdb maven . . minimized/Hello#`<init>`().
 →private String message;
 //       ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
@@ -87,11 +94,14 @@ class Hello {
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message().
 //                      display_name message
 //                      signature_documentation java @SuppressWarnings("all")\npublic HelloBuilder message(String message)
+//                      kind Method
 //                      documentation @return {@code this}.
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#HelloBuilder#message.
 //                      display_name message
 //                      signature_documentation java @SuppressWarnings("all")\nprivate String message
+//                      kind Field
 //              ^^^^^^^ definition semanticdb maven . . minimized/Hello#message.
 //                      display_name message
 //                      signature_documentation java private String message
+//                      kind Field
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
index a8a01442a..7f52ca43b 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
@@ -4,13 +4,16 @@ public class Methods {
 //           ^^^^^^^ definition semanticdb maven . . minimized/Methods#
 //                   display_name Methods
 //                   signature_documentation java public class Methods
+//                   kind Class
 //           ^^^^^^^ definition semanticdb maven . . minimized/Methods#`<init>`().
 //                   display_name <init>
 //                   signature_documentation java public Methods()
+//                   kind Constructor
   private int overload(int value) {
 //            ^^^^^^^^ definition semanticdb maven . . minimized/Methods#overload().
 //                     display_name overload
 //                     signature_documentation java private int overload(int value)
+//                     kind Method
 //                         ^^^^^ definition local 0
 //                               display_name value
 //                               signature_documentation java int value
@@ -24,6 +27,7 @@ private String overload(String value) {
 //               ^^^^^^^^ definition semanticdb maven . . minimized/Methods#overload(+1).
 //                        display_name overload
 //                        signature_documentation java private String overload(String value)
+//                        kind Method
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                               ^^^^^ definition local 1
 //                                     display_name value
@@ -37,6 +41,7 @@ private static int staticOverload(int value) {
 //                   ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Methods#staticOverload().
 //                                  display_name staticOverload
 //                                  signature_documentation java private static int staticOverload(int value)
+//                                  kind StaticMethod
 //                                      ^^^^^ definition local 2
 //                                            display_name value
 //                                            signature_documentation java int value
@@ -50,6 +55,7 @@ private static String staticOverload(String value) {
 //                      ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/Methods#staticOverload(+1).
 //                                     display_name staticOverload
 //                                     signature_documentation java private static String staticOverload(String value)
+//                                     kind StaticMethod
 //                                     ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                            ^^^^^ definition local 3
 //                                                  display_name value
@@ -64,6 +70,7 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //                     ^^^ definition semanticdb maven . . minimized/Methods#app().
 //                         display_name app
 //                         signature_documentation java public static String app(int n, String m) throws RuntimeException, IndexOutOfBoundsException
+//                         kind StaticMethod
 //                             ^ definition local 4
 //                               display_name n
 //                               signature_documentation java int n
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
index 252391420..1b8476b29 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/MinimizedJavaMain.java
@@ -8,13 +8,16 @@ public class MinimizedJavaMain {
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#
 //                             display_name MinimizedJavaMain
 //                             signature_documentation java @Annotations(value = "value", format = "format")\npublic class MinimizedJavaMain
+//                             kind Class
 //           ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#`<init>`().
 //                             display_name <init>
 //                             signature_documentation java public MinimizedJavaMain()
+//                             kind Constructor
   public static void main(String[] args) {
 //                   ^^^^ definition semanticdb maven . . minimized/MinimizedJavaMain#main().
 //                        display_name main
 //                        signature_documentation java public static void main(String[] args)
+//                        kind StaticMethod
 //                        ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                                 ^^^^ definition local 0
 //                                      display_name args
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
index 4df6e8f95..081bf2e76 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ParameterizedTypes.java
@@ -21,20 +21,25 @@ public class ParameterizedTypes<A, B extends String> {
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#
 //                              display_name ParameterizedTypes
 //                              signature_documentation java public class ParameterizedTypes<A, B extends String>
+//                              kind Class
 //           ^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#`<init>`().
 //                              display_name <init>
 //                              signature_documentation java public ParameterizedTypes()
+//                              kind Constructor
 //                              ^ definition semanticdb maven . . minimized/ParameterizedTypes#[A]
 //                                display_name A
 //                                signature_documentation java A
+//                                kind TypeParameter
 //                                 ^ definition semanticdb maven . . minimized/ParameterizedTypes#[B]
 //                                   display_name B
 //                                   signature_documentation java B extends String
+//                                   kind TypeParameter
 //                                           ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
   public <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list) {}
 //        ^ definition semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T]
 //          display_name T
 //          signature_documentation java T extends Iterable<A> & Iterator<B>
+//          kind TypeParameter
 //                  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Iterable#
 //                           ^ reference semanticdb maven . . minimized/ParameterizedTypes#[A]
 //                                ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
@@ -42,6 +47,7 @@ public <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list) {}
 //                                                  ^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#iteratorable().
 //                                                               display_name iteratorable
 //                                                               signature_documentation java public <T extends Iterable<A> & Iterator<B>> void iteratorable(List<T> list)
+//                                                               kind Method
 //                                                               ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                                                                    ^ reference semanticdb maven . . minimized/ParameterizedTypes#iteratorable().[T]
 //                                                                       ^^^^ definition local 0
@@ -54,6 +60,7 @@ public String app(A a, B b) {
 //              ^^^ definition semanticdb maven . . minimized/ParameterizedTypes#app().
 //                  display_name app
 //                  signature_documentation java public String app(A a, B b)
+//                  kind Method
 //                  ^ reference semanticdb maven . . minimized/ParameterizedTypes#[A]
 //                    ^ definition local 1
 //                      display_name a
@@ -76,6 +83,7 @@ public String app(A a, B b) {
 //                                ^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#doStuff().
 //                                        display_name doStuff
 //                                        signature_documentation java public Map<? extends String, ?> doStuff()
+//                                        kind Method
 
   public Quadruplet<String, ?, Object, ? super Integer> createQuadruplet() { return null; }
 //       ^^^^^^^^^^ reference semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#
@@ -85,24 +93,31 @@ public String app(A a, B b) {
 //                                                      ^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#createQuadruplet().
 //                                                                       display_name createQuadruplet
 //                                                                       signature_documentation java public Quadruplet<String, ?, Object, ? super Integer> createQuadruplet()
+//                                                                       kind Method
 
   public static class Quadruplet<T, S, X, Y> {}
 //                    ^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#
 //                               display_name Quadruplet
 //                               signature_documentation java public static class Quadruplet<T, S, X, Y>
+//                               kind Class
 //                    ^^^^^^^^^^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#`<init>`().
 //                               display_name <init>
 //                               signature_documentation java public Quadruplet()
+//                               kind Constructor
 //                               ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[T]
 //                                 display_name T
 //                                 signature_documentation java T
+//                                 kind TypeParameter
 //                                  ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[S]
 //                                    display_name S
 //                                    signature_documentation java S
+//                                    kind TypeParameter
 //                                     ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[X]
 //                                       display_name X
 //                                       signature_documentation java X
+//                                       kind TypeParameter
 //                                        ^ definition semanticdb maven . . minimized/ParameterizedTypes#Quadruplet#[Y]
 //                                          display_name Y
 //                                          signature_documentation java Y
+//                                          kind TypeParameter
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
index 6b777b032..ff8723729 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
@@ -9,14 +9,17 @@ public class Primitives {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Primitives#
 //                      display_name Primitives
 //                      signature_documentation java public class Primitives
+//                      kind Class
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/Primitives#`<init>`().
 //                      display_name <init>
 //                      signature_documentation java public Primitives()
+//                      kind Constructor
   public static String app() {
 //              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //                     ^^^ definition semanticdb maven . . minimized/Primitives#app().
 //                         display_name app
 //                         signature_documentation java public static String app()
+//                         kind StaticMethod
     Random random = new Random();
 //  ^^^^^^ reference semanticdb maven jdk 11 java/util/Random#
 //         ^^^^^^ definition local 0
@@ -95,4 +98,5 @@ public static void test() {}
 //                   ^^^^ definition semanticdb maven . . minimized/Primitives#test().
 //                        display_name test
 //                        signature_documentation java public static void test()
+//                        kind StaticMethod
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
index 8cccae587..76c44028e 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/RawTypes.java
@@ -15,14 +15,17 @@ public class RawTypes {
 //           ^^^^^^^^ definition semanticdb maven . . minimized/RawTypes#
 //                    display_name RawTypes
 //                    signature_documentation java @SuppressWarnings("ALL")\npublic class RawTypes
+//                    kind Class
 //           ^^^^^^^^ definition semanticdb maven . . minimized/RawTypes#`<init>`().
 //                    display_name <init>
 //                    signature_documentation java public RawTypes()
+//                    kind Constructor
   public static final List x = Collections.singletonList(42);
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#
 //                         ^ definition semanticdb maven . . minimized/RawTypes#x.
 //                           display_name x
 //                           signature_documentation java public static final List x
+//                           kind StaticField
 //                             ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                         ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList().
 }
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
index 541aff9a2..7f97bb836 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
@@ -4,11 +4,13 @@ public class SubClasses extends AbstractClasses implements Interfaces {
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#
 //                      display_name SubClasses
 //                      signature_documentation java public class SubClasses
+//                      kind Class
 //                      relationship is_implementation semanticdb maven . . minimized/AbstractClasses#
 //                      relationship is_implementation semanticdb maven . . minimized/Interfaces#
 //           ^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#`<init>`().
 //                      display_name <init>
 //                      signature_documentation java public SubClasses()
+//                      kind Constructor
 //                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AbstractClasses#
 //                                                         ^^^^^^^^^^ reference semanticdb maven . . minimized/Interfaces#
 
@@ -19,6 +21,7 @@ public String abstractImplementation() {
 //              ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#abstractImplementation().
 //                                     display_name abstractImplementation
 //                                     signature_documentation java @Override\npublic String abstractImplementation()
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . minimized/AbstractClasses#abstractImplementation().
     return "abstract";
   }
@@ -30,6 +33,7 @@ public String abstractInterfaceMethod() {
 //              ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/SubClasses#abstractInterfaceMethod().
 //                                      display_name abstractInterfaceMethod
 //                                      signature_documentation java @Override\npublic String abstractInterfaceMethod()
+//                                      kind Method
 //                                      relationship is_reference is_implementation semanticdb maven . . minimized/Interfaces#abstractInterfaceMethod().
     return "abstractInterface";
   }
@@ -39,6 +43,7 @@ public static String app() {
 //                     ^^^ definition semanticdb maven . . minimized/SubClasses#app().
 //                         display_name app
 //                         signature_documentation java public static String app()
+//                         kind StaticMethod
     SubClasses s = new SubClasses();
 //  ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#
 //             ^ definition local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
index 3b80f4674..ec438c768 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
@@ -4,13 +4,16 @@ public class TabIndented {
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/TabIndented#
 //                       display_name TabIndented
 //                       signature_documentation java public class TabIndented
+//                       kind Class
 //           ^^^^^^^^^^^ definition semanticdb maven . . minimized/TabIndented#`<init>`().
 //                       display_name <init>
 //                       signature_documentation java public TabIndented()
+//                       kind Constructor
 →public void app() {
 //           ^^^ definition semanticdb maven . . minimized/TabIndented#app().
 //               display_name app
 //               signature_documentation java public void app()
+//               kind Method
 →→Object o = new Object() {
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //       ^ definition local 0
@@ -25,6 +28,7 @@ public class TabIndented {
 //                       display_name equals
 //                       signature_documentation java @Override\npublic boolean equals(Object other)
 //                       enclosing_symbol local 1
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#equals().
 //                       ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 //                              ^^^^^ definition local 3
@@ -41,6 +45,7 @@ public class TabIndented {
 //                     display_name hashCode
 //                     signature_documentation java @Override\npublic int hashCode()
 //                     enclosing_symbol local 1
+//                     kind Method
 //                     relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#hashCode().
 →→→→return System.identityHashCode(this);
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
@@ -55,6 +60,7 @@ public class TabIndented {
 //                        display_name toString
 //                        signature_documentation java @Override\npublic String toString()
 //                        enclosing_symbol local 1
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 →→→→return "";
 →→→}
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
index 36ceee38a..ba2aa79c3 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TypeVariables.java
@@ -5,41 +5,50 @@ public class TypeVariables {
 //           ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#
 //                         display_name TypeVariables
 //                         signature_documentation java public class TypeVariables
+//                         kind Class
 //                         documentation Example from https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4 
 //           ^^^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#`<init>`().
 //                         display_name <init>
 //                         signature_documentation java public TypeVariables()
+//                         kind Constructor
   static class C {
 //             ^ definition semanticdb maven . . minimized/TypeVariables#C#
 //               display_name C
 //               signature_documentation java static class C
+//               kind Class
 //             ^ definition semanticdb maven . . minimized/TypeVariables#C#`<init>`().
 //               display_name <init>
 //               signature_documentation java C()
+//               kind Constructor
     public void mCPublic() {}
 //              ^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCPublic().
 //                       display_name mCPublic
 //                       signature_documentation java public void mCPublic()
+//                       kind Method
 
     protected void mCProtected() {}
 //                 ^^^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCProtected().
 //                             display_name mCProtected
 //                             signature_documentation java protected void mCProtected()
+//                             kind Method
 
     void mCPackage() {}
 //       ^^^^^^^^^ definition semanticdb maven . . minimized/TypeVariables#C#mCPackage().
 //                 display_name mCPackage
 //                 signature_documentation java void mCPackage()
+//                 kind Method
   }
 
   interface I {
 //          ^ definition semanticdb maven . . minimized/TypeVariables#I#
 //            display_name I
 //            signature_documentation java interface I
+//            kind Interface
     void mI();
 //       ^^ definition semanticdb maven . . minimized/TypeVariables#I#mI().
 //          display_name mI
 //          signature_documentation java public abstract void mI()
+//          kind AbstractMethod
 //          relationship is_reference is_implementation semanticdb maven . . minimized/TypeVariables#CT#mI().
   }
 
@@ -47,17 +56,20 @@ static class CT extends C implements I {
 //             ^^ definition semanticdb maven . . minimized/TypeVariables#CT#
 //                display_name CT
 //                signature_documentation java static class CT
+//                kind Class
 //                relationship is_implementation semanticdb maven . . minimized/TypeVariables#C#
 //                relationship is_implementation semanticdb maven . . minimized/TypeVariables#I#
 //             ^^ definition semanticdb maven . . minimized/TypeVariables#CT#`<init>`().
 //                display_name <init>
 //                signature_documentation java CT()
+//                kind Constructor
 //                        ^ reference semanticdb maven . . minimized/TypeVariables#C#
 //                                     ^ reference semanticdb maven . . minimized/TypeVariables#I#
     public void mI() {}
 //              ^^ definition semanticdb maven . . minimized/TypeVariables#CT#mI().
 //                 display_name mI
 //                 signature_documentation java public void mI()
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven . . minimized/TypeVariables#I#mI().
   }
 
@@ -65,11 +77,13 @@ public static <T extends C & I> void app(T t) {
 //               ^ definition semanticdb maven . . minimized/TypeVariables#app().[T]
 //                 display_name T
 //                 signature_documentation java T extends C & I
+//                 kind TypeParameter
 //                         ^ reference semanticdb maven . . minimized/TypeVariables#C#
 //                             ^ reference semanticdb maven . . minimized/TypeVariables#I#
 //                                     ^^^ definition semanticdb maven . . minimized/TypeVariables#app().
 //                                         display_name app
 //                                         signature_documentation java public static <T extends C & I> void app(T t)
+//                                         kind StaticMethod
 //                                         ^ reference semanticdb maven . . minimized/TypeVariables#app().[T]
 //                                           ^ definition local 0
 //                                             display_name t
diff --git a/tests/snapshots/src/main/generated/ujson/AstTransformer.scala b/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
index 33ea195b5..2b10aae49 100644
--- a/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
+++ b/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
@@ -13,9 +13,11 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
 //                   display_name AstTransformer
 //                   signature_documentation scala trait AstTransformer[I]
+//                   kind Trait
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                     display_name I
 //                     signature_documentation scala I
+//                     kind TypeParameter
 //                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
@@ -25,9 +27,11 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#apply().
 //          display_name apply
 //          signature_documentation scala def apply(t: Readable): I
+//          kind Method
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#apply().(t)
 //            display_name t
 //            signature_documentation scala t: Readable 
+//            kind Parameter
 //             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#apply().(t)
@@ -37,23 +41,28 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().
 //                   display_name transformArray
 //                   signature_documentation scala def transformArray(f: Visitor[local0, T[, items: Iterable[I]): T
+//                   kind Method
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().[T]
 //                     display_name T
 //                     signature_documentation scala T
+//                     kind TypeParameter
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(f)
 //                        display_name f
 //                        signature_documentation scala f: Visitor[local0, T[ 
+//                        kind Parameter
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().[T]
 //                                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
 //                                              display_name items
 //                                              signature_documentation scala items: Iterable[I] 
+//                                              kind Parameter
 //                                               ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Iterable#
 //                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
     val ctx = f.visitArray(items.size, -1).narrow
 //      ^^^ definition local 1
 //          display_name ctx
 //          signature_documentation scala ctx: ArrVisitor[Any, T] 
+//          kind Variable
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(f)
 //              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
@@ -63,6 +72,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^^ definition local 2
 //           display_name item
 //           signature_documentation scala item: I 
+//           kind Parameter
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
 //                     ^^^ reference local 1
 //                         ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
@@ -78,17 +88,21 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //    ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().
 //                    display_name transformObject
 //                    signature_documentation scala def transformObject(f: Visitor[local3, T[, items: Iterable[(String, I)]): T
+//                    kind Method
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().[T]
 //                      display_name T
 //                      signature_documentation scala T
+//                      kind TypeParameter
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(f)
 //                         display_name f
 //                         signature_documentation scala f: Visitor[local3, T[ 
+//                         kind Parameter
 //                          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().[T]
 //                                         ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
 //                                               display_name items
 //                                               signature_documentation scala items: Iterable[(String, I)] 
+//                                               kind Parameter
 //                                                ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Iterable#
 //                                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
@@ -96,6 +110,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^ definition local 4
 //          display_name ctx
 //          signature_documentation scala ctx: ObjVisitor[Any, T] 
+//          kind Variable
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(f)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
@@ -105,11 +120,13 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^ definition local 5
 //         display_name kv
 //         signature_documentation scala kv: (String, I) 
+//         kind Parameter
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
       val keyVisitor = ctx.visitKey(-1)
 //        ^^^^^^^^^^ definition local 6
 //                   display_name keyVisitor
 //                   signature_documentation scala keyVisitor: Visitor[local7, Any[ 
+//                   kind Variable
 //                     ^^^ reference local 4
 //                         ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
       ctx.visitKeyValue(keyVisitor.visitString(kv._1, -1))
@@ -137,19 +154,24 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#
 //                    display_name AstObjVisitor
 //                    signature_documentation scala class AstObjVisitor[T]
+//                    kind Class
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#[T]
 //                      display_name T
 //                      signature_documentation scala T
+//                      kind TypeParameter
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().
 //                        display_name <init>
 //                        signature_documentation scala def this(build: (T) => I)(factory: Factory[(String, I), T])
+//                        kind Constructor
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
 //                             display_name build
 //                             signature_documentation scala private[this] val build: (T) => I
+//                             kind Method
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(build)
 //                       _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(build)
 //                             display_name build
 //                             signature_documentation scala build: (T) => I 
+//                             kind Parameter
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
 //                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#[T]
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
@@ -157,10 +179,12 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
 //                                        display_name factory
 //                                        signature_documentation scala private[this] implicit val factory: Factory[(String, I), T]
+//                                        kind Method
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(factory)
 //                                _______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().(factory)
 //                                        display_name factory
 //                                        signature_documentation scala implicit factory: Factory[(String, I), T] 
+//                                        kind Parameter
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/compat/package.Factory#
 //                                                  ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
@@ -175,31 +199,37 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
 //                        display_name key
 //                        signature_documentation scala private[this] var key: String
+//                        kind Method
 //                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`key_=`().
 //                        display_name key_=
 //                        signature_documentation scala private[this] var key_=(x$1: String): Unit
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
 //                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
     private[this] val vs = factory.newBuilder
 //                    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
 //                       display_name vs
 //                       signature_documentation scala private[this] val vs: Builder[(String, I), T]
+//                       kind Method
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
 //                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/Factory#newBuilder().
     def subVisitor = AstTransformer.this
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#subVisitor().
 //                 display_name subVisitor
 //                 signature_documentation scala def subVisitor: AstTransformer[I]
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
     def visitKey(index: Int) = upickle.core.StringVisitor
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKey().
 //               display_name visitKey
 //               signature_documentation scala def visitKey(index: Int): StringVisitor
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKey().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^^^ reference semanticdb maven . . upickle/
 //                                     ^^^^ reference semanticdb maven . . upickle/core/
@@ -208,10 +238,12 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKeyValue().
 //                    display_name visitKeyValue
 //                    signature_documentation scala def visitKeyValue(s: Any): Unit
+//                    kind Method
 //                    relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKeyValue().(s)
 //                      display_name s
 //                      signature_documentation scala s: Any 
+//                      kind Parameter
 //                       ^^^ reference semanticdb maven . . scala/Any#
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
@@ -222,14 +254,17 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().
 //                 display_name visitValue
 //                 signature_documentation scala def visitValue(v: I, index: Int): Unit
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().(v)
 //                   display_name v
 //                   signature_documentation scala v: I 
+//                   kind Parameter
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().(index)
 //                             display_name index
 //                             signature_documentation scala index: Int 
+//                             kind Parameter
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                           ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
@@ -242,10 +277,12 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitEnd().
 //               display_name visitEnd
 //               signature_documentation scala def visitEnd(index: Int): I
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitEnd().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
 //                                   ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
@@ -255,19 +292,24 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#
 //                    display_name AstArrVisitor
 //                    signature_documentation scala class AstArrVisitor[T]
+//                    kind Class
 //                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#[T]
 //                      display_name T
 //                      signature_documentation scala T
+//                      kind TypeParameter
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().
 //                           display_name <init>
 //                           signature_documentation scala def this(build: (T[I]) => I)(factory: Factory[I, T[I]])
+//                           kind Constructor
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
 //                                display_name build
 //                                signature_documentation scala private[this] val build: (T[I]) => I
+//                                kind Method
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(build)
 //                          _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(build)
 //                                display_name build
 //                                signature_documentation scala build: (T[I]) => I 
+//                                kind Parameter
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#[T]
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
@@ -276,10 +318,12 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                   ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
 //                                           display_name factory
 //                                           signature_documentation scala private[this] implicit val factory: Factory[I, T[I]]
+//                                           kind Method
 //                                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(factory)
 //                                   _______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().(factory)
 //                                           display_name factory
 //                                           signature_documentation scala implicit factory: Factory[I, T[I]] 
+//                                           kind Parameter
 //                                           relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/compat/package.Factory#
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
@@ -293,26 +337,31 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#subVisitor().
 //                 display_name subVisitor
 //                 signature_documentation scala def subVisitor: AstTransformer[I]
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
     private[this] val vs = factory.newBuilder
 //                    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
 //                       display_name vs
 //                       signature_documentation scala private[this] val vs: Builder[I, T[I]]
+//                       kind Method
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
 //                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/Factory#newBuilder().
     def visitValue(v: I, index: Int): Unit = vs += v
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().
 //                 display_name visitValue
 //                 signature_documentation scala def visitValue(v: I, index: Int): Unit
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().(v)
 //                   display_name v
 //                   signature_documentation scala v: I 
+//                   kind Parameter
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().(index)
 //                             display_name index
 //                             signature_documentation scala index: Int 
+//                             kind Parameter
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                           ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
@@ -323,10 +372,12 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitEnd().
 //               display_name visitEnd
 //               signature_documentation scala def visitEnd(index: Int): I
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitEnd().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
 //                                   ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
diff --git a/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala b/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
index cf8e68916..22e54c817 100644
--- a/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
@@ -36,19 +36,24 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //          ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#
 //                          display_name ByteArrayParser
 //                          signature_documentation scala final class ByteArrayParser[J]
+//                          kind Class
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#[J]
 //                            display_name J
 //                            signature_documentation scala J
+//                            kind TypeParameter
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().
 //                              display_name <init>
 //                              signature_documentation scala def this(src: Array[Byte])
+//                              kind Constructor
 //                             ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
 //                                 display_name src
 //                                 signature_documentation scala private[this] val src: Array[Byte]
+//                                 kind Method
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().(src)
 //                             ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#`<init>`().(src)
 //                                 display_name src
 //                                 signature_documentation scala src: Array[Byte] 
+//                                 kind Parameter
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
 //                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                                        ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
@@ -60,12 +65,14 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
 //              display_name srcLength
 //              signature_documentation scala val srcLength: Int
+//              kind Method
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#length().
   protected[this] final def close() = {}
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
 //                                display_name close
 //                                signature_documentation scala final def close(): Unit
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 
   // Never grow the buffer since it's a directly using the original
@@ -73,10 +80,12 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#growBuffer().
 //                        display_name growBuffer
 //                        signature_documentation scala def growBuffer(until: Int): Unit
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#growBuffer().(until)
 //                              display_name until
 //                              signature_documentation scala until: Int 
+//                              kind Parameter
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 
@@ -84,15 +93,18 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
 //                       signature_documentation scala def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(buffer)
 //                              display_name buffer
 //                              signature_documentation scala buffer: Array[Byte] 
+//                              kind Parameter
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
 //                                                         signature_documentation scala bufferOffset: Int 
+//                                                         kind Parameter
 //                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if(buffer == null) (src, srcLength == 0, srcLength)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(buffer)
@@ -110,6 +122,7 @@ object ByteArrayParser extends Transformer[Array[Byte]]{
 //     ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.
 //                     display_name ByteArrayParser
 //                     signature_documentation scala object ByteArrayParser
+//                     kind Object
 //                             ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
@@ -118,18 +131,22 @@ object ByteArrayParser extends Transformer[Array[Byte]]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().
 //              display_name transform
 //              signature_documentation scala def transform(j: Array[Byte], f: Visitor[local0, T[): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(j)
 //                   display_name j
 //                   signature_documentation scala j: Array[Byte] 
+//                   kind Parameter
 //                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(f)
 //                                   display_name f
 //                                   signature_documentation scala f: Visitor[local0, T[ 
+//                                   kind Parameter
 //                                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().[T]
 //                                                         ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#
diff --git a/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala b/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
index 51e5d8e31..1d996bb33 100644
--- a/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
@@ -36,19 +36,24 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //          ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#
 //                           display_name ByteBufferParser
 //                           signature_documentation scala final class ByteBufferParser[J]
+//                           kind Class
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#[J]
 //                             display_name J
 //                             signature_documentation scala J
+//                             kind TypeParameter
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().
 //                               display_name <init>
 //                               signature_documentation scala def this(src: ByteBuffer)
+//                               kind Constructor
 //                              ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                  display_name src
 //                                  signature_documentation scala private[this] val src: ByteBuffer
+//                                  kind Method
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().(src)
 //                              ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#`<init>`().(src)
 //                                  display_name src
 //                                  signature_documentation scala src: ByteBuffer 
+//                                  kind Parameter
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                   ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                                       ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#
@@ -58,12 +63,14 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#start.
 //                              display_name start
 //                              signature_documentation scala private[this] final val start: Int
+//                              kind Method
 //                                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                    ^^^^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#position().
   private[this] final val limit = src.limit() - start
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
 //                              display_name limit
 //                              signature_documentation scala private[this] final val limit: Int
+//                              kind Method
 //                                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                    ^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#limit().
 //                                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
@@ -74,6 +81,7 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#close().
 //                                display_name close
 //                                signature_documentation scala final def close(): Unit
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                          ^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#position().
@@ -82,25 +90,30 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#growBuffer().
 //                        display_name growBuffer
 //                        signature_documentation scala def growBuffer(until: Int): Unit
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#growBuffer().(until)
 //                              display_name until
 //                              signature_documentation scala until: Int 
+//                              kind Parameter
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
 //                       signature_documentation scala def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int): (Array[Byte], Boolean, Int)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(buffer)
 //                              display_name buffer
 //                              signature_documentation scala buffer: Array[Byte] 
+//                              kind Parameter
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
 //                                                         signature_documentation scala bufferOffset: Int 
+//                                                         kind Parameter
 //                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 
     if(buffer == null) (java.util.Arrays.copyOfRange(src.array(), start, src.limit()), limit == 0, limit)
@@ -128,6 +141,7 @@ object ByteBufferParser extends Transformer[ByteBuffer]{
 //     ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.
 //                      display_name ByteBufferParser
 //                      signature_documentation scala object ByteBufferParser
+//                      kind Object
 //                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                          ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
@@ -135,17 +149,21 @@ object ByteBufferParser extends Transformer[ByteBuffer]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().
 //              display_name transform
 //              signature_documentation scala def transform(j: ByteBuffer, f: Visitor[local0, T[): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().(j)
 //                   display_name j
 //                   signature_documentation scala j: ByteBuffer 
+//                   kind Parameter
 //                    ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().(f)
 //                                  display_name f
 //                                  signature_documentation scala f: Visitor[local0, T[ 
+//                                  kind Parameter
 //                                   ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().[T]
 //                                                        ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#
diff --git a/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala b/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
index efcec6d2a..0d7bf8486 100644
--- a/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
@@ -17,19 +17,24 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //                         ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#
 //                                            display_name CharSequenceParser
 //                                            signature_documentation scala protected[ujson] final class CharSequenceParser[J]
+//                                            kind Class
 //                                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#[J]
 //                                              display_name J
 //                                              signature_documentation scala J
+//                                              kind TypeParameter
 //                                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().
 //                                                display_name <init>
 //                                                signature_documentation scala def this(cs: CharSequence)
+//                                                kind Constructor
 //                                               ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                  display_name cs
 //                                                  signature_documentation scala private[this] val cs: CharSequence
+//                                                  kind Method
 //                                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().(cs)
 //                                               __ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#`<init>`().(cs)
 //                                                  display_name cs
 //                                                  signature_documentation scala cs: CharSequence 
+//                                                  kind Parameter
 //                                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                                         ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#
@@ -39,25 +44,30 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#growBuffer().
 //                        display_name growBuffer
 //                        signature_documentation scala def growBuffer(until: Int): Unit
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#growBuffer().(until)
 //                              display_name until
 //                              signature_documentation scala until: Int 
+//                              kind Parameter
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
 //                       signature_documentation scala def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int): (Array[Char], Boolean, Int)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(buffer)
 //                              display_name buffer
 //                              signature_documentation scala buffer: Array[Char] 
+//                              kind Parameter
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
 //                                                         signature_documentation scala bufferOffset: Int 
+//                                                         kind Parameter
 //                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if(buffer == null) (cs.toString.toCharArray, cs.length == 0, cs.length)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(buffer)
@@ -77,6 +87,7 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#close().
 //                display_name close
 //                signature_documentation scala final def close(): Unit
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
 }
 
@@ -84,6 +95,7 @@ object CharSequenceParser extends Transformer[CharSequence]{
 //     ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.
 //                        display_name CharSequenceParser
 //                        signature_documentation scala object CharSequenceParser
+//                        kind Object
 //                                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                            ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
@@ -91,17 +103,21 @@ object CharSequenceParser extends Transformer[CharSequence]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().
 //              display_name transform
 //              signature_documentation scala def transform(j: CharSequence, f: Visitor[local0, T[): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().(j)
 //                   display_name j
 //                   signature_documentation scala j: CharSequence 
+//                   kind Parameter
 //                    ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().(f)
 //                                    display_name f
 //                                    signature_documentation scala f: Visitor[local0, T[ 
+//                                    kind Parameter
 //                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().[T]
 //                                                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#
diff --git a/tests/snapshots/src/main/generated/ujson/Exceptions.scala b/tests/snapshots/src/main/generated/ujson/Exceptions.scala
index 3072e0513..ed3d08998 100644
--- a/tests/snapshots/src/main/generated/ujson/Exceptions.scala
+++ b/tests/snapshots/src/main/generated/ujson/Exceptions.scala
@@ -6,65 +6,77 @@ sealed trait ParsingFailedException extends Exception
 //           ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParsingFailedException#
 //                                  display_name ParsingFailedException
 //                                  signature_documentation scala sealed trait ParsingFailedException
+//                                  kind Trait
 //                                          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
 
 case class ParseException(clue: String, index: Int)
 //         ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        display_name ParseException
 //                        signature_documentation scala case class ParseException(clue: String, index: Int) extends Exception with ParsingFailedException
+//                        kind Class
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#productElementName().
 //                        display_name productElementName
 //                        signature_documentation scala def productElementName(x$1: Int): String
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //                        display_name apply
 //                        signature_documentation scala def apply(clue: String, index: Int): ParseException
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.
 //                        display_name ParseException
 //                        signature_documentation scala object ParseException
+//                        kind Object
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().
 //                        display_name copy
 //                        signature_documentation scala def copy(clue: String, index: Int): ParseException
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#productElement().
 //                        display_name productElement
 //                        signature_documentation scala def productElement(x$1: Int): Any
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().
 //                         display_name <init>
 //                         signature_documentation scala def this(clue: String, index: Int)
+//                         kind Constructor
 //                        ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             display_name clue
 //                             signature_documentation scala val clue: String
+//                             kind Method
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                             display_name clue
 //                             signature_documentation scala clue: String 
+//                             kind Parameter
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             display_name clue
 //                             signature_documentation scala clue: String 
+//                             kind Parameter
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
 //                        ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(clue)
 //                             display_name clue
 //                             signature_documentation scala default clue: String 
+//                             kind Parameter
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
@@ -72,24 +84,28 @@ case class ParseException(clue: String, index: Int)
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            display_name index
 //                                            signature_documentation scala val index: Int
+//                                            kind Method
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            display_name index
 //                                            signature_documentation scala index: Int 
+//                                            kind Parameter
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
 //                                            display_name index
 //                                            signature_documentation scala index: Int 
+//                                            kind Parameter
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                      _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#copy().(index)
 //                                            display_name index
 //                                            signature_documentation scala default index: Int 
+//                                            kind Parameter
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
@@ -107,59 +123,70 @@ case class IncompleteParseException(msg: String)
 //         ^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  display_name IncompleteParseException
 //                                  signature_documentation scala case class IncompleteParseException(msg: String) extends Exception with ParsingFailedException
+//                                  kind Class
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#productElement().
 //                                  display_name productElement
 //                                  signature_documentation scala def productElement(x$1: Int): Any
+//                                  kind Method
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                  display_name apply
 //                                  signature_documentation scala def apply(msg: String): IncompleteParseException
+//                                  kind Method
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().
 //                                  display_name copy
 //                                  signature_documentation scala def copy(msg: String): IncompleteParseException
+//                                  kind Method
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#productElementName().
 //                                  display_name productElementName
 //                                  signature_documentation scala def productElementName(x$1: Int): String
+//                                  kind Method
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.
 //                                  display_name IncompleteParseException
 //                                  signature_documentation scala object IncompleteParseException
+//                                  kind Object
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().
 //                                   display_name <init>
 //                                   signature_documentation scala def this(msg: String)
+//                                   kind Constructor
 //                                  ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                      display_name msg
 //                                      signature_documentation scala val msg: String
+//                                      kind Method
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
 //                                      display_name msg
 //                                      signature_documentation scala msg: String 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      display_name msg
 //                                      signature_documentation scala default msg: String 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
 //                                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                                      display_name msg
 //                                      signature_documentation scala msg: String 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
diff --git a/tests/snapshots/src/main/generated/ujson/IndexedValue.scala b/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
index ed80f4158..12f210a34 100644
--- a/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
+++ b/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
@@ -32,10 +32,12 @@ sealed trait IndexedValue {
 //           ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                        display_name IndexedValue
 //                        signature_documentation scala sealed trait IndexedValue
+//                        kind Trait
   def index: Int
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //          display_name index
 //          signature_documentation scala def index: Int
+//          kind AbstractMethod
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
@@ -51,6 +53,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //     ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                  display_name IndexedValue
 //                  signature_documentation scala object IndexedValue
+//                  kind Object
 //                          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                   ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
@@ -59,41 +62,49 @@ object IndexedValue extends Transformer[IndexedValue]{
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               display_name Str
 //               signature_documentation scala case class Str(index: Int, value0: CharSequence) extends IndexedValue
+//               kind Class
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().
 //               display_name copy
 //               signature_documentation scala def copy(index: Int, value0: CharSequence): Str
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //               display_name apply
 //               signature_documentation scala def apply(index: Int, value0: CharSequence): Str
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //               display_name Str
 //               signature_documentation scala object Str
+//               kind Object
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#productElement().
 //               display_name productElement
 //               signature_documentation scala def productElement(x$1: Int): Any
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#productElementName().
 //               display_name productElementName
 //               signature_documentation scala def productElementName(x$1: Int): String
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().
 //                display_name <init>
 //                signature_documentation scala def this(index: Int, value0: CharSequence)
+//                kind Constructor
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                     display_name index
 //                     signature_documentation scala val index: Int
+//                     kind Method
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
@@ -101,18 +112,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     display_name index
 //                     signature_documentation scala default index: Int 
+//                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
@@ -120,24 +134,28 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                                  display_name value0
 //                                  signature_documentation scala val value0: CharSequence
+//                                  kind Method
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  display_name value0
 //                                  signature_documentation scala value0: CharSequence 
+//                                  kind Parameter
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
 //                                  display_name value0
 //                                  signature_documentation scala value0: CharSequence 
+//                                  kind Parameter
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(value0)
 //                                  display_name value0
 //                                  signature_documentation scala default value0: CharSequence 
+//                                  kind Parameter
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().(value0)
@@ -150,63 +168,75 @@ object IndexedValue extends Transformer[IndexedValue]{
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               display_name Obj
 //               signature_documentation scala case class Obj(index: Int, value0: (CharSequence, IndexedValue)*) extends IndexedValue
+//               kind Class
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //               display_name apply
 //               signature_documentation scala def apply(index: Int, value0: (CharSequence, IndexedValue)*): Obj
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#productElement().
 //               display_name productElement
 //               signature_documentation scala def productElement(x$1: Int): Any
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //               display_name Obj
 //               signature_documentation scala object Obj
+//               kind Object
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#productElementName().
 //               display_name productElementName
 //               signature_documentation scala def productElementName(x$1: Int): String
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().
 //                display_name <init>
 //                signature_documentation scala def this(index: Int, value0: (CharSequence, IndexedValue)*)
+//                kind Constructor
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //                     display_name index
 //                     signature_documentation scala val index: Int
+//                     kind Method
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                                  display_name value0
 //                                  signature_documentation scala val value0: (CharSequence, IndexedValue)*
+//                                  kind Method
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
 //                                  display_name value0
 //                                  signature_documentation scala value0: (CharSequence, IndexedValue)* 
+//                                  kind Parameter
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(value0)
 //                                  display_name value0
 //                                  signature_documentation scala value0: (CharSequence, IndexedValue)* 
+//                                  kind Parameter
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().(value0)
 //                                    ^^^^ reference semanticdb maven . . java/
@@ -219,63 +249,75 @@ object IndexedValue extends Transformer[IndexedValue]{
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               display_name Arr
 //               signature_documentation scala case class Arr(index: Int, value: IndexedValue*) extends IndexedValue
+//               kind Class
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#productElementName().
 //               display_name productElementName
 //               signature_documentation scala def productElementName(x$1: Int): String
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#productElement().
 //               display_name productElement
 //               signature_documentation scala def productElement(x$1: Int): Any
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //               display_name Arr
 //               signature_documentation scala object Arr
+//               kind Object
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
 //               display_name apply
 //               signature_documentation scala def apply(index: Int, value: IndexedValue*): Arr
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().
 //                display_name <init>
 //                signature_documentation scala def this(index: Int, value: IndexedValue*)
+//                kind Constructor
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //                     display_name index
 //                     signature_documentation scala val index: Int
+//                     kind Method
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
 //                                 display_name value
 //                                 signature_documentation scala val value: IndexedValue*
+//                                 kind Method
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
 //                           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
 //                                 display_name value
 //                                 signature_documentation scala value: IndexedValue* 
+//                                 kind Parameter
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
 //                           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(value)
 //                                 display_name value
 //                                 signature_documentation scala value: IndexedValue* 
+//                                 kind Parameter
 //                                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().(value)
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
 //                                  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
@@ -285,41 +327,49 @@ object IndexedValue extends Transformer[IndexedValue]{
 //           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               display_name Num
 //               signature_documentation scala case class Num(index: Int, s: CharSequence, decIndex: Int, expIndex: Int) extends IndexedValue
+//               kind Class
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //               display_name Num
 //               signature_documentation scala object Num
+//               kind Object
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().
 //               display_name copy
 //               signature_documentation scala def copy(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#productElement().
 //               display_name productElement
 //               signature_documentation scala def productElement(x$1: Int): Any
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#productElementName().
 //               display_name productElementName
 //               signature_documentation scala def productElementName(x$1: Int): String
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //               display_name apply
 //               signature_documentation scala def apply(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function4#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().
 //                display_name <init>
 //                signature_documentation scala def this(index: Int, s: CharSequence, decIndex: Int, expIndex: Int)
+//                kind Constructor
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                     display_name index
 //                     signature_documentation scala val index: Int
+//                     kind Method
 //                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
@@ -327,18 +377,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     display_name index
 //                     signature_documentation scala default index: Int 
+//                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //               _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
@@ -346,24 +399,28 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             display_name s
 //                             signature_documentation scala val s: CharSequence
+//                             kind Method
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                             display_name s
 //                             signature_documentation scala s: CharSequence 
+//                             kind Parameter
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             display_name s
 //                             signature_documentation scala s: CharSequence 
+//                             kind Parameter
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
 //                           _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(s)
 //                             display_name s
 //                             signature_documentation scala default s: CharSequence 
+//                             kind Parameter
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(s)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(s)
@@ -371,24 +428,28 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     display_name decIndex
 //                                                     signature_documentation scala val decIndex: Int
+//                                                     kind Method
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     display_name decIndex
 //                                                     signature_documentation scala default decIndex: Int 
+//                                                     kind Parameter
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
 //                                                     display_name decIndex
 //                                                     signature_documentation scala decIndex: Int 
+//                                                     kind Parameter
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                            ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(decIndex)
 //                                                     display_name decIndex
 //                                                     signature_documentation scala decIndex: Int 
+//                                                     kind Parameter
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
@@ -396,24 +457,28 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                           ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    display_name expIndex
 //                                                                    signature_documentation scala val expIndex: Int
+//                                                                    kind Method
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    display_name expIndex
 //                                                                    signature_documentation scala expIndex: Int 
+//                                                                    kind Parameter
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
 //                                                                    display_name expIndex
 //                                                                    signature_documentation scala expIndex: Int 
+//                                                                    kind Parameter
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                           ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(expIndex)
 //                                                                    display_name expIndex
 //                                                                    signature_documentation scala default expIndex: Int 
+//                                                                    kind Parameter
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
@@ -424,41 +489,49 @@ object IndexedValue extends Transformer[IndexedValue]{
 //           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  display_name NumRaw
 //                  signature_documentation scala case class NumRaw(index: Int, d: Double) extends IndexedValue
+//                  kind Class
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().
 //                  display_name copy
 //                  signature_documentation scala def copy(index: Int, d: Double): NumRaw
+//                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                  display_name NumRaw
 //                  signature_documentation scala object NumRaw
+//                  kind Object
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#productElement().
 //                  display_name productElement
 //                  signature_documentation scala def productElement(x$1: Int): Any
+//                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //                  display_name apply
 //                  signature_documentation scala def apply(index: Int, d: Double): NumRaw
+//                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#productElementName().
 //                  display_name productElementName
 //                  signature_documentation scala def productElementName(x$1: Int): String
+//                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().
 //                   display_name <init>
 //                   signature_documentation scala def this(index: Int, d: Double)
+//                   kind Constructor
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        display_name index
 //                        signature_documentation scala val index: Int
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
@@ -466,18 +539,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
 //                        display_name index
 //                        signature_documentation scala index: Int 
+//                        kind Parameter
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        display_name index
 //                        signature_documentation scala index: Int 
+//                        kind Parameter
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
 //                  _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(index)
 //                        display_name index
 //                        signature_documentation scala default index: Int 
+//                        kind Parameter
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
@@ -485,24 +561,28 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                display_name d
 //                                signature_documentation scala val d: Double
+//                                kind Method
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                display_name d
 //                                signature_documentation scala default d: Double 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
 //                                display_name d
 //                                signature_documentation scala d: Double 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(d)
 //                                display_name d
 //                                signature_documentation scala d: Double 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
@@ -513,41 +593,49 @@ object IndexedValue extends Transformer[IndexedValue]{
 //           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 display_name False
 //                 signature_documentation scala case class False(index: Int) extends IndexedValue
+//                 kind Class
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                 display_name False
 //                 signature_documentation scala object False
+//                 kind Object
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#productElementName().
 //                 display_name productElementName
 //                 signature_documentation scala def productElementName(x$1: Int): String
+//                 kind Method
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                 display_name apply
 //                 signature_documentation scala def apply(index: Int): False
+//                 kind Method
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#productElement().
 //                 display_name productElement
 //                 signature_documentation scala def productElement(x$1: Int): Any
+//                 kind Method
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().
 //                 display_name copy
 //                 signature_documentation scala def copy(index: Int): False
+//                 kind Method
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().
 //                  display_name <init>
 //                  signature_documentation scala def this(index: Int)
+//                  kind Constructor
 //                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                       display_name index
 //                       signature_documentation scala val index: Int
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
@@ -555,18 +643,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
 //                       display_name index
 //                       signature_documentation scala index: Int 
+//                       kind Parameter
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       display_name index
 //                       signature_documentation scala default index: Int 
+//                       kind Parameter
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
 //                 _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#`<init>`().(index)
 //                       display_name index
 //                       signature_documentation scala index: Int 
+//                       kind Parameter
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
@@ -577,46 +668,55 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#value().
 //            display_name value
 //            signature_documentation scala def value: Boolean
+//            kind Method
   }
   case class True(index: Int) extends IndexedValue{
 //           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                display_name True
 //                signature_documentation scala case class True(index: Int) extends IndexedValue
+//                kind Class
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#productElement().
 //                display_name productElement
 //                signature_documentation scala def productElement(x$1: Int): Any
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                display_name True
 //                signature_documentation scala object True
+//                kind Object
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().
 //                display_name copy
 //                signature_documentation scala def copy(index: Int): True
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //                display_name apply
 //                signature_documentation scala def apply(index: Int): True
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#productElementName().
 //                display_name productElementName
 //                signature_documentation scala def productElementName(x$1: Int): String
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().
 //                 display_name <init>
 //                 signature_documentation scala def this(index: Int)
+//                 kind Constructor
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                      display_name index
 //                      signature_documentation scala val index: Int
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
@@ -624,18 +724,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
 //                      display_name index
 //                      signature_documentation scala index: Int 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      display_name index
 //                      signature_documentation scala index: Int 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#copy().(index)
 //                      display_name index
 //                      signature_documentation scala default index: Int 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
@@ -646,46 +749,55 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#value().
 //            display_name value
 //            signature_documentation scala def value: Boolean
+//            kind Method
   }
   case class Null(index: Int) extends IndexedValue{
 //           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                display_name Null
 //                signature_documentation scala case class Null(index: Int) extends IndexedValue
+//                kind Class
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().
 //                display_name copy
 //                signature_documentation scala def copy(index: Int): Null
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#productElement().
 //                display_name productElement
 //                signature_documentation scala def productElement(x$1: Int): Any
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#productElementName().
 //                display_name productElementName
 //                signature_documentation scala def productElementName(x$1: Int): String
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //                display_name apply
 //                signature_documentation scala def apply(index: Int): Null
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                display_name Null
 //                signature_documentation scala object Null
+//                kind Object
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().
 //                 display_name <init>
 //                 signature_documentation scala def this(index: Int)
+//                 kind Constructor
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                      display_name index
 //                      signature_documentation scala val index: Int
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#index().
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
@@ -693,18 +805,21 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      display_name index
 //                      signature_documentation scala index: Int 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
 //                      display_name index
 //                      signature_documentation scala index: Int 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#copy().(index)
 //                      display_name index
 //                      signature_documentation scala default index: Int 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
@@ -715,23 +830,28 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#value().
 //            display_name value
 //            signature_documentation scala def value: Null
+//            kind Method
   }
 
   def transform[T](j: IndexedValue, f: Visitor[_, T]): T = try{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().
 //              display_name transform
 //              signature_documentation scala def transform(j: IndexedValue, f: Visitor[local16, T[): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(j)
 //                   display_name j
 //                   signature_documentation scala j: IndexedValue 
+//                   kind Parameter
 //                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                    display_name f
 //                                    signature_documentation scala f: Visitor[local16, T[ 
+//                                    kind Parameter
 //                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().[T]
 //                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().[T]
@@ -743,6 +863,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                           ^ definition local 17
 //                             display_name i
 //                             signature_documentation scala i: Int 
+//                             kind Variable
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //                                             ^ reference local 17
@@ -752,6 +873,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                           ^ definition local 18
 //                             display_name i
 //                             signature_documentation scala i: Int 
+//                             kind Variable
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //                                             ^ reference local 18
@@ -761,6 +883,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                            ^ definition local 19
 //                              display_name i
 //                              signature_documentation scala i: Int 
+//                              kind Variable
 //                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                    ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //                                               ^ reference local 19
@@ -770,9 +893,11 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                          ^ definition local 20
 //                            display_name i
 //                            signature_documentation scala i: Int 
+//                            kind Variable
 //                             ^ definition local 21
 //                               display_name s
 //                               signature_documentation scala s: CharSequence 
+//                               kind Variable
 //                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                 ^ reference local 21
@@ -783,15 +908,19 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                          ^ definition local 22
 //                            display_name i
 //                            signature_documentation scala i: Int 
+//                            kind Variable
 //                             ^ definition local 23
 //                               display_name s
 //                               signature_documentation scala s: CharSequence 
+//                               kind Variable
 //                                ^ definition local 24
 //                                  display_name d
 //                                  signature_documentation scala d: Int 
+//                                  kind Variable
 //                                   ^ definition local 25
 //                                     display_name e
 //                                     signature_documentation scala e: Int 
+//                                     kind Variable
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                           ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                                                   ^ reference local 23
@@ -804,9 +933,11 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                             ^ definition local 26
 //                               display_name i
 //                               signature_documentation scala i: Int 
+//                               kind Variable
 //                                ^ definition local 27
 //                                  display_name d
 //                                  signature_documentation scala d: Double 
+//                                  kind Variable
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                                                     ^ reference local 27
@@ -817,13 +948,16 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                          ^ definition local 28
 //                            display_name i
 //                            signature_documentation scala i: Int 
+//                            kind Variable
 //                             ^^^^^ definition local 29
 //                                   display_name items
 //                                   signature_documentation scala items: Seq[IndexedValue] 
+//                                   kind Variable
         val ctx = f.visitArray(-1, -1).narrow
 //          ^^^ definition local 30
 //              display_name ctx
 //              signature_documentation scala ctx: ArrVisitor[Any, T] 
+//              kind Variable
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                                     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#narrow().
@@ -831,6 +965,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //          ^^^^ definition local 31
 //               display_name item
 //               signature_documentation scala item: IndexedValue 
+//               kind Parameter
 //                  ^^^^^ reference local 29
 //                             ^^^ reference local 30
 //                                 ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
@@ -853,13 +988,16 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                          ^ definition local 34
 //                            display_name i
 //                            signature_documentation scala i: Int 
+//                            kind Variable
 //                             ^^^^^ definition local 35
 //                                   display_name items
 //                                   signature_documentation scala items: Seq[(CharSequence, IndexedValue)] 
+//                                   kind Variable
         val ctx = f.visitObject(-1, -1).narrow
 //          ^^^ definition local 36
 //              display_name ctx
 //              signature_documentation scala ctx: ObjVisitor[Any, T] 
+//              kind Variable
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.transform().(f)
 //                  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                                      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#narrow().
@@ -867,14 +1005,17 @@ object IndexedValue extends Transformer[IndexedValue]{
 //           ^ definition local 37
 //             display_name k
 //             signature_documentation scala k: CharSequence 
+//             kind Variable
 //              ^^^^ definition local 38
 //                   display_name item
 //                   signature_documentation scala item: IndexedValue 
+//                   kind Variable
 //                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#withFilter().
           val keyVisitor = try ctx.visitKey(i) catch reject(i)
 //            ^^^^^^^^^^ definition local 40
 //                       display_name keyVisitor
 //                       signature_documentation scala keyVisitor: Visitor[local41, Any[ 
+//                       kind Variable
 //                             ^^^ reference local 36
 //                                 ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                                          ^ reference local 34
@@ -916,6 +1057,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //       ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
 //               display_name Builder
 //               signature_documentation scala object Builder
+//               kind Object
 //                       ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                               ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
@@ -924,18 +1066,22 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().
 //                 display_name visitArray
 //                 signature_documentation scala def visitArray(length: Int, i: Int): { def subVisitor: Builder }
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(length)
 //                        display_name length
 //                        signature_documentation scala length: Int 
+//                        kind Parameter
 //                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(i)
 //                                display_name i
 //                                signature_documentation scala i: Int 
+//                                kind Parameter
 //                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^ definition local 49
 //                                              display_name $anon
 //                                              signature_documentation scala final class $anon
+//                                              kind Class
 //                                            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#
 //                                                       ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                                     ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -945,6 +1091,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //        ^^^ definition local 50
 //            display_name out
 //            signature_documentation scala private val out: Buffer[IndexedValue]
+//            kind Method
 //              ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer.
 //                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/SeqFactory.Delegate#empty().
@@ -953,20 +1100,24 @@ object IndexedValue extends Transformer[IndexedValue]{
 //        ^^^^^^^^^^ definition local 48
 //                   display_name subVisitor
 //                   signature_documentation scala def subVisitor: Builder
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitValue(v: IndexedValue, index: Int): Unit = {
 //        ^^^^^^^^^^ definition local 51
 //                   display_name visitValue
 //                   signature_documentation scala def visitValue(v: IndexedValue, index: Int): Unit
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                   ^ definition local 53
 //                     display_name v
 //                     signature_documentation scala v: IndexedValue 
+//                     kind Parameter
 //                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                    ^^^^^ definition local 54
 //                                          display_name index
 //                                          signature_documentation scala index: Int 
+//                                          kind Parameter
 //                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
         out.append(v)
@@ -978,10 +1129,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //        ^^^^^^^^ definition local 52
 //                 display_name visitEnd
 //                 signature_documentation scala def visitEnd(index: Int): Arr
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                 ^^^^^ definition local 55
 //                       display_name index
 //                       signature_documentation scala index: Int 
+//                       kind Parameter
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
@@ -996,18 +1149,22 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().
 //                  display_name visitObject
 //                  signature_documentation scala def visitObject(length: Int, i: Int): { def subVisitor: Builder; def visitKey(index: Int): Builder }
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                  ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(length)
 //                         display_name length
 //                         signature_documentation scala length: Int 
+//                         kind Parameter
 //                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(i)
 //                                 display_name i
 //                                 signature_documentation scala i: Int 
+//                                 kind Parameter
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^ definition local 59
 //                                               display_name $anon
 //                                               signature_documentation scala final class $anon
+//                                               kind Class
 //                                             ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
 //                                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
@@ -1017,6 +1174,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //        ^^^ definition local 60
 //            display_name out
 //            signature_documentation scala private val out: Buffer[(String, IndexedValue)]
+//            kind Method
 //              ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer.
 //                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/SeqFactory.Delegate#empty().
@@ -1026,21 +1184,25 @@ object IndexedValue extends Transformer[IndexedValue]{
 //        ^^^^^^^^^^ definition local 61
 //                   display_name currentKey
 //                   signature_documentation scala private var currentKey: String
+//                   kind Method
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
       def subVisitor = Builder
 //        ^^^^^^^^^^ definition local 56
 //                   display_name subVisitor
 //                   signature_documentation scala def subVisitor: Builder
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
 //                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitKey(index: Int) = IndexedValue.Builder
 //        ^^^^^^^^ definition local 57
 //                 display_name visitKey
 //                 signature_documentation scala def visitKey(index: Int): Builder
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKey().
 //                 ^^^^^ definition local 58
 //                       display_name index
 //                       signature_documentation scala index: Int 
+//                       kind Parameter
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                               ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
@@ -1048,10 +1210,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //        ^^^^^^^^^^^^^ definition local 63
 //                      display_name visitKeyValue
 //                      signature_documentation scala def visitKeyValue(s: Any): Unit
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#visitKeyValue().
 //                      ^ definition local 67
 //                        display_name s
 //                        signature_documentation scala s: Any 
+//                        kind Parameter
 //                         ^^^ reference semanticdb maven . . scala/Any#
 //                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                      ^^^^^^^^^^ reference local 62
@@ -1065,14 +1229,17 @@ object IndexedValue extends Transformer[IndexedValue]{
 //        ^^^^^^^^^^ definition local 64
 //                   display_name visitValue
 //                   signature_documentation scala def visitValue(v: IndexedValue, index: Int): Unit
+//                   kind Method
 //                   relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                   ^ definition local 68
 //                     display_name v
 //                     signature_documentation scala v: IndexedValue 
+//                     kind Parameter
 //                      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                    ^^^^^ definition local 69
 //                                          display_name index
 //                                          signature_documentation scala index: Int 
+//                                          kind Parameter
 //                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
         out.append((currentKey, v))
@@ -1085,10 +1252,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //        ^^^^^^^^ definition local 65
 //                 display_name visitEnd
 //                 signature_documentation scala def visitEnd(index: Int): Obj
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                 ^^^^^ definition local 70
 //                       display_name index
 //                       signature_documentation scala index: Int 
+//                       kind Parameter
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                              ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
@@ -1103,10 +1272,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitNull().
 //                display_name visitNull
 //                signature_documentation scala def visitNull(i: Int): Null
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitNull().(i)
 //                  display_name i
 //                  signature_documentation scala i: Int 
+//                  kind Parameter
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                          ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
@@ -1116,10 +1287,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFalse().
 //                 display_name visitFalse
 //                 signature_documentation scala def visitFalse(i: Int): False
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFalse().(i)
 //                   display_name i
 //                   signature_documentation scala i: Int 
+//                   kind Parameter
 //                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                           ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
@@ -1129,10 +1302,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitTrue().
 //                display_name visitTrue
 //                signature_documentation scala def visitTrue(i: Int): True
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitTrue().(i)
 //                  display_name i
 //                  signature_documentation scala i: Int 
+//                  kind Parameter
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                          ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
@@ -1142,22 +1317,27 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().
 //                              display_name visitFloat64StringParts
 //                              signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, i: Int): Num
+//                              kind Method
 //                              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(s)
 //                                display_name s
 //                                signature_documentation scala s: CharSequence 
+//                                kind Parameter
 //                                 ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                               ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(decIndex)
 //                                                        display_name decIndex
 //                                                        signature_documentation scala decIndex: Int 
+//                                                        kind Parameter
 //                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                              ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(expIndex)
 //                                                                       display_name expIndex
 //                                                                       signature_documentation scala expIndex: Int 
+//                                                                       kind Parameter
 //                                                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(i)
 //                                                                               display_name i
 //                                                                               signature_documentation scala i: Int 
+//                                                                               kind Parameter
 //                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                                       ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                                                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
@@ -1169,15 +1349,18 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().
 //                            display_name visitFloat64
 //                            signature_documentation scala def visitFloat64(d: Double, i: Int): NumRaw
+//                            kind Method
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(d)
 //                              display_name d
 //                              signature_documentation scala d: Double 
+//                              kind Parameter
 //                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(i)
 //                                         display_name i
 //                                         signature_documentation scala i: Int 
+//                                         kind Parameter
 //                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
@@ -1188,14 +1371,17 @@ object IndexedValue extends Transformer[IndexedValue]{
 //      ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().
 //                  display_name visitString
 //                  signature_documentation scala def visitString(s: CharSequence, i: Int): Str
+//                  kind Method
 //                  relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().(s)
 //                    display_name s
 //                    signature_documentation scala s: CharSequence 
+//                    kind Parameter
 //                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().(i)
 //                                     display_name i
 //                                     signature_documentation scala i: Int 
+//                                     kind Parameter
 //                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
diff --git a/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala b/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
index 5ef31b3b6..9e4c6b354 100644
--- a/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/InputStreamParser.scala
@@ -32,20 +32,25 @@ final class InputStreamParser[J](val inputStream: java.io.InputStream,
 //          ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#
 //                            display_name InputStreamParser
 //                            signature_documentation scala final class InputStreamParser[J]
+//                            kind Class
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#[J]
 //                              display_name J
 //                              signature_documentation scala J
+//                              kind TypeParameter
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().
 //                                display_name <init>
 //                                signature_documentation scala def this(inputStream: InputStream, minBufferStartSize: Int, maxBufferStartSize: Int)
+//                                kind Constructor
 //                                   ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#inputStream.
 //                                               display_name inputStream
 //                                               signature_documentation scala val inputStream: InputStream
+//                                               kind Method
 //                                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(inputStream)
 //                                               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#inputStream().
 //                                   ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(inputStream)
 //                                               display_name inputStream
 //                                               signature_documentation scala inputStream: InputStream 
+//                                               kind Parameter
 //                                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#inputStream.
 //                                                ^^^^ reference semanticdb maven . . java/
 //                                                     ^^ reference semanticdb maven . . java/io/
@@ -54,11 +59,13 @@ final class InputStreamParser[J](val inputStream: java.io.InputStream,
 //                                   ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#minBufferStartSize.
 //                                                      display_name minBufferStartSize
 //                                                      signature_documentation scala val minBufferStartSize: Int
+//                                                      kind Method
 //                                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(minBufferStartSize)
 //                                                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#minBufferStartSize().
 //                                   __________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(minBufferStartSize)
 //                                                      display_name minBufferStartSize
 //                                                      signature_documentation scala default minBufferStartSize: Int 
+//                                                      kind Parameter
 //                                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#minBufferStartSize.
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser.
@@ -67,11 +74,13 @@ final class InputStreamParser[J](val inputStream: java.io.InputStream,
 //                                   ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#maxBufferStartSize.
 //                                                      display_name maxBufferStartSize
 //                                                      signature_documentation scala val maxBufferStartSize: Int
+//                                                      kind Method
 //                                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(maxBufferStartSize)
 //                                                      relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser#maxBufferStartSize().
 //                                   __________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().(maxBufferStartSize)
 //                                                      display_name maxBufferStartSize
 //                                                      signature_documentation scala default maxBufferStartSize: Int 
+//                                                      kind Parameter
 //                                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#maxBufferStartSize.
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingInputStreamParser.
@@ -87,6 +96,7 @@ extends ByteParser[J] with upickle.core.BufferingInputStreamParser{
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#close().
 //                                display_name close
 //                                signature_documentation scala final def close(): Unit
+//                                kind Method
 //                                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#close().
 }
 
@@ -94,6 +104,7 @@ object InputStreamParser extends Transformer[java.io.InputStream]{
 //     ^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.
 //                       display_name InputStreamParser
 //                       signature_documentation scala object InputStreamParser
+//                       kind Object
 //                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                           ^^^^ reference semanticdb maven . . java/
 //                                                ^^ reference semanticdb maven . . java/io/
@@ -103,25 +114,30 @@ object InputStreamParser extends Transformer[java.io.InputStream]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().
 //              display_name transform
 //              signature_documentation scala def transform(j: InputStream, f: Visitor[local0, T[): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().(j)
 //                   display_name j
 //                   signature_documentation scala j: InputStream 
+//                   kind Parameter
 //                    ^^^^ reference semanticdb maven . . java/
 //                         ^^ reference semanticdb maven . . java/io/
 //                            ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/InputStream#
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().(f)
 //                                           display_name f
 //                                           signature_documentation scala f: Visitor[local0, T[ 
+//                                           kind Parameter
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
     val p = new InputStreamParser[T](j)
 //      ^ definition local 1
 //        display_name p
 //        signature_documentation scala p: InputStreamParser[T] 
+//        kind Variable
 //              ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser.transform().[T]
 //                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#`<init>`().
diff --git a/tests/snapshots/src/main/generated/ujson/JsVisitor.scala b/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
index 894280cf6..854a9e16c 100644
--- a/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
+++ b/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
@@ -17,12 +17,15 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //              display_name JsVisitor
 //              signature_documentation scala trait JsVisitor[T, J]
+//              kind Trait
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[T]
 //                 display_name T
 //                 signature_documentation scala T
+//                 kind TypeParameter
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                     display_name J
 //                     signature_documentation scala J
+//                     kind TypeParameter
 //                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[T]
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
@@ -30,6 +33,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                 display_name visitFloat64
 //                 signature_documentation scala def visitFloat64(d: Double, index: Int): J
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().
@@ -38,16 +42,19 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
 //                   display_name d
 //                   signature_documentation scala d: Double 
+//                   kind Parameter
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(index)
 //                                  display_name index
 //                                  signature_documentation scala index: Int 
+//                                  kind Parameter
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val i = d.toLong
 //      ^ definition local 0
 //        display_name i
 //        signature_documentation scala i: Long 
+//        kind Variable
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
 //            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toLong().
     if(i == d) visitFloat64StringParts(i.toString, -1, -1, index)
@@ -70,14 +77,17 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().
 //                 display_name visitFloat32
 //                 signature_documentation scala def visitFloat32(d: Float, index: Int): J
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat32().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(d)
 //                   display_name d
 //                   signature_documentation scala d: Float 
+//                   kind Parameter
 //                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Float#
 //                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(index)
 //                                 display_name index
 //                                 signature_documentation scala index: Int 
+//                                 kind Parameter
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                            ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
@@ -87,14 +97,17 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().
 //               display_name visitInt32
 //               signature_documentation scala def visitInt32(i: Int, index: Int): J
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitInt32().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(i)
 //                 display_name i
 //                 signature_documentation scala i: Int 
+//                 kind Parameter
 //                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(index)
 //                             display_name index
 //                             signature_documentation scala index: Int 
+//                             kind Parameter
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
@@ -104,14 +117,17 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().
 //               display_name visitInt64
 //               signature_documentation scala def visitInt64(i: Long, index: Int): J
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitInt64().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
 //                 display_name i
 //                 signature_documentation scala i: Long 
+//                 kind Parameter
 //                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(index)
 //                              display_name index
 //                              signature_documentation scala index: Int 
+//                              kind Parameter
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     if (math.abs(i) > math.pow(2, 53) || i == -9223372036854775808L) visitString(i.toString, index)
@@ -137,14 +153,17 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().
 //                display_name visitUInt64
 //                signature_documentation scala def visitUInt64(i: Long, index: Int): J
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitUInt64().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(i)
 //                  display_name i
 //                  signature_documentation scala i: Long 
+//                  kind Parameter
 //                   ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
 //                         ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(index)
 //                               display_name index
 //                               signature_documentation scala index: Int 
+//                               kind Parameter
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     if (i > math.pow(2, 53) || i < 0) visitString(java.lang.Long.toUnsignedString(i), index)
@@ -172,14 +191,17 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().
 //                       display_name visitFloat64String
 //                       signature_documentation scala def visitFloat64String(s: String, index: Int): J
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64String().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().(s)
 //                         display_name s
 //                         signature_documentation scala s: String 
+//                         kind Parameter
 //                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().(index)
 //                                        display_name index
 //                                        signature_documentation scala index: Int 
+//                                        kind Parameter
 //                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     visitFloat64StringParts(
@@ -199,6 +221,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //           ^ definition local 1
 //             display_name n
 //             signature_documentation scala n: Int 
+//             kind Variable
 //                ^ reference local 1
       },
       -1
@@ -209,29 +232,35 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().
 //                display_name visitBinary
 //                signature_documentation scala def visitBinary(bytes: Array[Byte], offset: Int, len: Int, index: Int): J
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitBinary().
 //                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(bytes)
 //                      display_name bytes
 //                      signature_documentation scala bytes: Array[Byte] 
+//                      kind Parameter
 //                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(offset)
 //                                           display_name offset
 //                                           signature_documentation scala offset: Int 
+//                                           kind Parameter
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
 //                                                     display_name len
 //                                                     signature_documentation scala len: Int 
+//                                                     kind Parameter
 //                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
 //                                                                 display_name index
 //                                                                 signature_documentation scala index: Int 
+//                                                                 kind Parameter
 //                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val arr = visitArray(len, index)
 //      ^^^ definition local 2
 //          display_name arr
 //          signature_documentation scala arr: ArrVisitor[T, J] 
+//          kind Variable
 //            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
@@ -239,6 +268,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //      ^ definition local 3
 //        display_name i
 //        signature_documentation scala i: Int 
+//        kind Variable
     while (i < len){
 //         ^ reference local 3
 //           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+3).
@@ -271,17 +301,21 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().
 //                            display_name visitFloat64StringParts
 //                            signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int): J
+//                            kind Method
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(s)
 //                              display_name s
 //                              signature_documentation scala s: CharSequence 
+//                              kind Parameter
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(decIndex)
 //                                                      display_name decIndex
 //                                                      signature_documentation scala decIndex: Int 
+//                                                      kind Parameter
 //                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
 //                                                                     signature_documentation scala expIndex: Int 
+//                                                                     kind Parameter
 //                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                                                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
@@ -293,33 +327,40 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().
 //             display_name visitExt
 //             signature_documentation scala def visitExt(tag: Byte, bytes: Array[Byte], offset: Int, len: Int, index: Int): J
+//             kind Method
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitExt().
 //             ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(tag)
 //                 display_name tag
 //                 signature_documentation scala tag: Byte 
+//                 kind Parameter
 //                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(bytes)
 //                              display_name bytes
 //                              signature_documentation scala bytes: Array[Byte] 
+//                              kind Parameter
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(offset)
 //                                                   display_name offset
 //                                                   signature_documentation scala offset: Int 
+//                                                   kind Parameter
 //                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(len)
 //                                                             display_name len
 //                                                             signature_documentation scala len: Int 
+//                                                             kind Parameter
 //                                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                   ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(index)
 //                                                                         display_name index
 //                                                                         signature_documentation scala index: Int 
+//                                                                         kind Parameter
 //                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val arr = visitArray(-1, index)
 //      ^^^ definition local 5
 //          display_name arr
 //          signature_documentation scala arr: ArrVisitor[T, J] 
+//          kind Variable
 //            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(index)
     arr.visitValue(visitFloat64(tag, index).asInstanceOf[T], -1)
@@ -349,14 +390,17 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().
 //              display_name visitChar
 //              signature_documentation scala def visitChar(s: Char, index: Int): J
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitChar().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(s)
 //                display_name s
 //                signature_documentation scala s: Char 
+//                kind Parameter
 //                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(index)
 //                             display_name index
 //                             signature_documentation scala index: Int 
+//                             kind Parameter
 //                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(s)
diff --git a/tests/snapshots/src/main/generated/ujson/Readable.scala b/tests/snapshots/src/main/generated/ujson/Readable.scala
index a93858cb2..0e9f05d59 100644
--- a/tests/snapshots/src/main/generated/ujson/Readable.scala
+++ b/tests/snapshots/src/main/generated/ujson/Readable.scala
@@ -20,18 +20,22 @@ trait Readable {
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //             display_name Readable
 //             signature_documentation scala trait Readable
+//             kind Trait
   def transform[T](f: Visitor[_, T]): T
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //              display_name transform
 //              signature_documentation scala def transform(f: Visitor[local0, T[): T
+//              kind AbstractMethod
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().(f)
 //                   display_name f
 //                   signature_documentation scala f: Visitor[local0, T[ 
+//                   kind Parameter
 //                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().[T]
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().[T]
@@ -41,67 +45,80 @@ object Readable extends ReadableLowPri{
 //     ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.
 //              display_name Readable
 //              signature_documentation scala object Readable
+//              kind Object
 //                      ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#
 //                                    ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class fromTransformer[T](t: T, w: Transformer[T]) extends Readable{
 //           ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           display_name fromTransformer
 //                           signature_documentation scala case class fromTransformer(t: T, w: Transformer[T])[T] extends Readable
+//                           kind Class
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().
 //                           display_name copy
 //                           signature_documentation scala def copy(t: T, w: Transformer[T]): fromTransformer[T]
+//                           kind Method
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#productElement().
 //                           display_name productElement
 //                           signature_documentation scala def productElement(x$1: Int): Any
+//                           kind Method
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //                           display_name apply
 //                           signature_documentation scala def apply(t: T, w: Transformer[T]): fromTransformer[T]
+//                           kind Method
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.
 //                           display_name fromTransformer
 //                           signature_documentation scala object fromTransformer
+//                           kind Object
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#productElementName().
 //                           display_name productElementName
 //                           signature_documentation scala def productElementName(x$1: Int): String
+//                           kind Method
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#[T]
 //                             display_name T
 //                             signature_documentation scala T
+//                             kind TypeParameter
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().
 //                               display_name <init>
 //                               signature_documentation scala def this(t: T, w: Transformer[T])
+//                               kind Constructor
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                display_name t
 //                                signature_documentation scala val t: T
+//                                kind Method
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                display_name t
 //                                signature_documentation scala default t: T 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                display_name t
 //                                signature_documentation scala t: T 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                              _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(t)
 //                                display_name t
 //                                signature_documentation scala t: T 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(t)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(t)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#t.
@@ -109,24 +126,28 @@ object Readable extends ReadableLowPri{
 //                                    ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
 //                                      display_name w
 //                                      signature_documentation scala val w: Transformer[T]
+//                                      kind Method
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      display_name w
 //                                      signature_documentation scala default w: Transformer[T] 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      display_name w
 //                                      signature_documentation scala w: Transformer[T] 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                    _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().(w)
 //                                      display_name w
 //                                      signature_documentation scala w: Transformer[T] 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().(w)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#copy().(w)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#w.
@@ -138,13 +159,16 @@ object Readable extends ReadableLowPri{
 //      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().
 //                display_name transform
 //                signature_documentation scala def transform(f: Visitor[local1, T[): T
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().[T]
 //                  display_name T
 //                  signature_documentation scala T
+//                  kind TypeParameter
 //                   ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().(f)
 //                     display_name f
 //                     signature_documentation scala f: Visitor[local1, T[ 
+//                     kind Parameter
 //                      ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().[T]
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#transform().[T]
@@ -159,9 +183,11 @@ object Readable extends ReadableLowPri{
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromString().
 //                        display_name fromString
 //                        signature_documentation scala implicit def fromString(s: String): fromTransformer[String]
+//                        kind Method
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromString().(s)
 //                          display_name s
 //                          signature_documentation scala s: String 
+//                          kind Parameter
 //                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
@@ -173,9 +199,11 @@ object Readable extends ReadableLowPri{
 //             ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromCharSequence().
 //                              display_name fromCharSequence
 //                              signature_documentation scala implicit def fromCharSequence(s: CharSequence): fromTransformer[CharSequence]
+//                              kind Method
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromCharSequence().(s)
 //                                display_name s
 //                                signature_documentation scala s: CharSequence 
+//                                kind Parameter
 //                                 ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                                ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
@@ -187,9 +215,11 @@ object Readable extends ReadableLowPri{
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromPath().
 //                      display_name fromPath
 //                      signature_documentation scala implicit def fromPath(s: Path): Readable
+//                      kind Method
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromPath().(s)
 //                        display_name s
 //                        signature_documentation scala s: Path 
+//                        kind Parameter
 //                         ^^^^ reference semanticdb maven . . java/
 //                              ^^^ reference semanticdb maven . . java/nio/
 //                                  ^^^^ reference semanticdb maven . . java/nio/file/
@@ -198,25 +228,30 @@ object Readable extends ReadableLowPri{
 //                                                             ^ definition local 3
 //                                                               display_name $anon
 //                                                               signature_documentation scala final class $anon
+//                                                               kind Class
 //                                                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     override def transform[T](f: Visitor[_, T]) = {
 //               ^^^^^^^^^ definition local 4
 //                         display_name transform
 //                         signature_documentation scala def transform(f: Visitor[local7, local6[): local6
+//                         kind Method
 //                         relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                         ^ definition local 6
 //                           display_name T
 //                           signature_documentation scala T
+//                           kind TypeParameter
 //                            ^ definition local 5
 //                              display_name f
 //                              signature_documentation scala f: Visitor[local7, local6[ 
+//                              kind Parameter
 //                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                          ^ reference local 6
       val inputStream = java.nio.file.Files.newInputStream(s)
 //        ^^^^^^^^^^^ definition local 8
 //                    display_name inputStream
 //                    signature_documentation scala inputStream: InputStream 
+//                    kind Variable
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^^ reference semanticdb maven . . java/nio/
 //                               ^^^^ reference semanticdb maven . . java/nio/file/
@@ -237,9 +272,11 @@ object Readable extends ReadableLowPri{
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromFile().
 //                      display_name fromFile
 //                      signature_documentation scala implicit def fromFile(s: File): Readable
+//                      kind Method
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromFile().(s)
 //                        display_name s
 //                        signature_documentation scala s: File 
+//                        kind Parameter
 //                         ^^^^ reference semanticdb maven . . java/
 //                              ^^ reference semanticdb maven . . java/io/
 //                                 ^^^^ reference semanticdb maven jdk 11 java/io/File#
@@ -251,9 +288,11 @@ object Readable extends ReadableLowPri{
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteBuffer().
 //                            display_name fromByteBuffer
 //                            signature_documentation scala implicit def fromByteBuffer(s: ByteBuffer): fromTransformer[ByteBuffer]
+//                            kind Method
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteBuffer().(s)
 //                              display_name s
 //                              signature_documentation scala s: ByteBuffer 
+//                              kind Parameter
 //                               ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                            ^^^^^^^^^^ reference semanticdb maven jdk 11 java/nio/ByteBuffer#
@@ -265,9 +304,11 @@ object Readable extends ReadableLowPri{
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteArray().
 //                           display_name fromByteArray
 //                           signature_documentation scala implicit def fromByteArray(s: Array[Byte]): fromTransformer[Array[Byte]]
+//                           kind Method
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteArray().(s)
 //                             display_name s
 //                             signature_documentation scala s: Array[Byte] 
+//                             kind Parameter
 //                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
@@ -283,20 +324,25 @@ trait ReadableLowPri{
 //    ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#
 //                   display_name ReadableLowPri
 //                   signature_documentation scala trait ReadableLowPri
+//                   kind Trait
   implicit def fromReadable[T](s: T)(implicit conv: T => geny.Readable): Readable = new Readable{
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().
 //                          display_name fromReadable
 //                          signature_documentation scala implicit def fromReadable(s: T)(conv: (T) => Readable): Readable
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
 //                            display_name T
 //                            signature_documentation scala T
+//                            kind TypeParameter
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().(s)
 //                               display_name s
 //                               signature_documentation scala s: T 
+//                               kind Parameter
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
 //                                            ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().(conv)
 //                                                 display_name conv
 //                                                 signature_documentation scala implicit conv: (T) => Readable 
+//                                                 kind Parameter
 //                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ReadableLowPri#fromReadable().[T]
 //                                                       ^^^^ reference semanticdb maven . . geny/
 //                                                            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Readable#
@@ -304,19 +350,23 @@ trait ReadableLowPri{
 //                                                                                      ^ definition local 9
 //                                                                                        display_name $anon
 //                                                                                        signature_documentation scala final class $anon
+//                                                                                        kind Class
 //                                                                                      ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                                                                              ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def transform[T](f: Visitor[_, T]): T = conv(s).readBytesThrough(InputStreamParser.transform(_, f))
 //      ^^^^^^^^^ definition local 10
 //                display_name transform
 //                signature_documentation scala def transform(f: Visitor[local13, local12[): local12
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //                ^ definition local 12
 //                  display_name T
 //                  signature_documentation scala T
+//                  kind TypeParameter
 //                   ^ definition local 11
 //                     display_name f
 //                     signature_documentation scala f: Visitor[local13, local12[ 
+//                     kind Parameter
 //                      ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                 ^ reference local 12
 //                                      ^ reference local 12
diff --git a/tests/snapshots/src/main/generated/ujson/Renderer.scala b/tests/snapshots/src/main/generated/ujson/Renderer.scala
index 6447c2447..29fcc8bfe 100644
--- a/tests/snapshots/src/main/generated/ujson/Renderer.scala
+++ b/tests/snapshots/src/main/generated/ujson/Renderer.scala
@@ -23,59 +23,70 @@ case class BytesRenderer(indent: Int = -1, escapeUnicode: Boolean = false)
 //         ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       display_name BytesRenderer
 //                       signature_documentation scala case class BytesRenderer(indent: Int, escapeUnicode: Boolean) extends BaseByteRenderer[ByteArrayOutputStream]
+//                       kind Class
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#productElement().
 //                       display_name productElement
 //                       signature_documentation scala def productElement(x$1: Int): Any
+//                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#productElementName().
 //                       display_name productElementName
 //                       signature_documentation scala def productElementName(x$1: Int): String
+//                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.
 //                       display_name BytesRenderer
 //                       signature_documentation scala object BytesRenderer
+//                       kind Object
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().
 //                       display_name copy
 //                       signature_documentation scala def copy(indent: Int, escapeUnicode: Boolean): BytesRenderer
+//                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().
 //                       display_name apply
 //                       signature_documentation scala def apply(indent: Int, escapeUnicode: Boolean): BytesRenderer
+//                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().
 //                        display_name <init>
 //                        signature_documentation scala def this(indent: Int, escapeUnicode: Boolean)
+//                        kind Constructor
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                              display_name indent
 //                              signature_documentation scala val indent: Int
+//                              kind Method
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              display_name indent
 //                              signature_documentation scala default indent: Int 
+//                              kind Parameter
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              display_name indent
 //                              signature_documentation scala default indent: Int 
+//                              kind Parameter
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                       ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(indent)
 //                              display_name indent
 //                              signature_documentation scala default indent: Int 
+//                              kind Parameter
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(indent)
 //                              relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(indent)
 //                              relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#indent.
@@ -83,24 +94,28 @@ case class BytesRenderer(indent: Int = -1, escapeUnicode: Boolean = false)
 //                                         ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                                       display_name escapeUnicode
 //                                                       signature_documentation scala val escapeUnicode: Boolean
+//                                                       kind Method
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       display_name escapeUnicode
 //                                                       signature_documentation scala default escapeUnicode: Boolean 
+//                                                       kind Parameter
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
 //                                                       display_name escapeUnicode
 //                                                       signature_documentation scala default escapeUnicode: Boolean 
+//                                                       kind Parameter
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                         _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#`<init>`().(escapeUnicode)
 //                                                       display_name escapeUnicode
 //                                                       signature_documentation scala default escapeUnicode: Boolean 
+//                                                       kind Parameter
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#copy().(escapeUnicode)
 //                                                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer#escapeUnicode.
 //                                                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BytesRenderer.apply().(escapeUnicode)
@@ -119,59 +134,70 @@ case class StringRenderer(indent: Int = -1,
 //         ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        display_name StringRenderer
 //                        signature_documentation scala case class StringRenderer(indent: Int, escapeUnicode: Boolean) extends BaseCharRenderer[StringWriter]
+//                        kind Class
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
 //                        display_name StringRenderer
 //                        signature_documentation scala object StringRenderer
+//                        kind Object
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().
 //                        display_name copy
 //                        signature_documentation scala def copy(indent: Int, escapeUnicode: Boolean): StringRenderer
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //                        display_name apply
 //                        signature_documentation scala def apply(indent: Int, escapeUnicode: Boolean): StringRenderer
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#productElement().
 //                        display_name productElement
 //                        signature_documentation scala def productElement(x$1: Int): Any
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#productElementName().
 //                        display_name productElementName
 //                        signature_documentation scala def productElementName(x$1: Int): String
+//                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().
 //                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().
 //                         display_name <init>
 //                         signature_documentation scala def this(indent: Int, escapeUnicode: Boolean)
+//                         kind Constructor
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
 //                               display_name indent
 //                               signature_documentation scala val indent: Int
+//                               kind Method
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               display_name indent
 //                               signature_documentation scala default indent: Int 
+//                               kind Parameter
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               display_name indent
 //                               signature_documentation scala default indent: Int 
+//                               kind Parameter
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                        ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(indent)
 //                               display_name indent
 //                               signature_documentation scala default indent: Int 
+//                               kind Parameter
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(indent)
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(indent)
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#indent.
@@ -180,24 +206,28 @@ case class StringRenderer(indent: Int = -1,
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                                      display_name escapeUnicode
 //                                      signature_documentation scala val escapeUnicode: Boolean
+//                                      kind Method
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
 //                                      display_name escapeUnicode
 //                                      signature_documentation scala default escapeUnicode: Boolean 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      display_name escapeUnicode
 //                                      signature_documentation scala default escapeUnicode: Boolean 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
 //                        _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#`<init>`().(escapeUnicode)
 //                                      display_name escapeUnicode
 //                                      signature_documentation scala default escapeUnicode: Boolean 
+//                                      kind Parameter
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#copy().(escapeUnicode)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer#escapeUnicode.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.apply().(escapeUnicode)
@@ -216,59 +246,70 @@ case class Renderer(out: java.io.Writer,
 //         ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  display_name Renderer
 //                  signature_documentation scala case class Renderer(out: Writer, indent: Int, escapeUnicode: Boolean) extends BaseCharRenderer[Writer]
+//                  kind Class
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.
 //                  display_name Renderer
 //                  signature_documentation scala object Renderer
+//                  kind Object
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //                  display_name apply
 //                  signature_documentation scala def apply(out: Writer, indent: Int, escapeUnicode: Boolean): Renderer
+//                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function3#apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#productElementName().
 //                  display_name productElementName
 //                  signature_documentation scala def productElementName(x$1: Int): String
+//                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().
 //                  display_name copy
 //                  signature_documentation scala def copy(out: Writer, indent: Int, escapeUnicode: Boolean): Renderer
+//                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //         ________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#productElement().
 //                  display_name productElement
 //                  signature_documentation scala def productElement(x$1: Int): Any
+//                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().
 //                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().
 //                   display_name <init>
 //                   signature_documentation scala def this(out: Writer, indent: Int, escapeUnicode: Boolean)
+//                   kind Constructor
 //                  ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                      display_name out
 //                      signature_documentation scala val out: Writer
+//                      kind Method
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
 //                      display_name out
 //                      signature_documentation scala out: Writer 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      display_name out
 //                      signature_documentation scala default out: Writer 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
 //                  ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(out)
 //                      display_name out
 //                      signature_documentation scala out: Writer 
+//                      kind Parameter
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(out)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#out.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(out)
@@ -279,24 +320,28 @@ case class Renderer(out: java.io.Writer,
 //                  ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
 //                         display_name indent
 //                         signature_documentation scala val indent: Int
+//                         kind Method
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         display_name indent
 //                         signature_documentation scala default indent: Int 
+//                         kind Parameter
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         display_name indent
 //                         signature_documentation scala default indent: Int 
+//                         kind Parameter
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                  ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(indent)
 //                         display_name indent
 //                         signature_documentation scala default indent: Int 
+//                         kind Parameter
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(indent)
 //                         relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(indent)
 //                         relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#indent.
@@ -305,24 +350,28 @@ case class Renderer(out: java.io.Writer,
 //                  ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                                display_name escapeUnicode
 //                                signature_documentation scala val escapeUnicode: Boolean
+//                                kind Method
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
 //                                display_name escapeUnicode
 //                                signature_documentation scala default escapeUnicode: Boolean 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                display_name escapeUnicode
 //                                signature_documentation scala default escapeUnicode: Boolean 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
 //                  _____________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#`<init>`().(escapeUnicode)
 //                                display_name escapeUnicode
 //                                signature_documentation scala default escapeUnicode: Boolean 
+//                                kind Parameter
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#copy().(escapeUnicode)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer#escapeUnicode.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Renderer.apply().(escapeUnicode)
diff --git a/tests/snapshots/src/main/generated/ujson/StringParser.scala b/tests/snapshots/src/main/generated/ujson/StringParser.scala
index f948aa61d..42f5aa1fd 100644
--- a/tests/snapshots/src/main/generated/ujson/StringParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/StringParser.scala
@@ -25,19 +25,24 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //                         ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#
 //                                      display_name StringParser
 //                                      signature_documentation scala protected[ujson] final class StringParser[J]
+//                                      kind Class
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#[J]
 //                                        display_name J
 //                                        signature_documentation scala J
+//                                        kind TypeParameter
 //                                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().
 //                                          display_name <init>
 //                                          signature_documentation scala def this(s: String)
+//                                          kind Constructor
 //                                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                                           display_name s
 //                                           signature_documentation scala private[this] val s: String
+//                                           kind Method
 //                                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().(s)
 //                                         _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#`<init>`().(s)
 //                                           display_name s
 //                                           signature_documentation scala s: String 
+//                                           kind Parameter
 //                                           relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                                            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#
@@ -47,31 +52,37 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //                  ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#sLength.
 //                          display_name sLength
 //                          signature_documentation scala private[this] val sLength: Int
+//                          kind Method
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                              ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#length().
   override def growBuffer(until: Int): Unit = ()
 //             ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#growBuffer().
 //                        display_name growBuffer
 //                        signature_documentation scala def growBuffer(until: Int): Unit
+//                        kind Method
 //                        relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#growBuffer().
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#growBuffer().(until)
 //                              display_name until
 //                              signature_documentation scala until: Int 
+//                              kind Parameter
 //                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
 //                       signature_documentation scala def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int): (Array[Char], Boolean, Int)
+//                       kind Method
 //                       relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#readDataIntoBuffer().
 //                       ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(buffer)
 //                              display_name buffer
 //                              signature_documentation scala buffer: Array[Char] 
+//                              kind Parameter
 //                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
 //                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
 //                                                         signature_documentation scala bufferOffset: Int 
+//                                                         kind Parameter
 //                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     if(buffer == null) (s.toCharArray, sLength == 0, sLength)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(buffer)
@@ -88,6 +99,7 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#close().
 //                display_name close
 //                signature_documentation scala final def close(): Unit
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#close().
 }
 
@@ -95,6 +107,7 @@ object StringParser extends Transformer[String]{
 //     ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.
 //                  display_name StringParser
 //                  signature_documentation scala object StringParser
+//                  kind Object
 //                          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                             ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
@@ -102,17 +115,21 @@ object StringParser extends Transformer[String]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().
 //              display_name transform
 //              signature_documentation scala def transform(j: String, f: Visitor[local0, T[): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().(j)
 //                   display_name j
 //                   signature_documentation scala j: String 
+//                   kind Parameter
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().(f)
 //                              display_name f
 //                              signature_documentation scala f: Visitor[local0, T[ 
+//                              kind Parameter
 //                               ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().[T]
 //                                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#
diff --git a/tests/snapshots/src/main/generated/ujson/Transformer.scala b/tests/snapshots/src/main/generated/ujson/Transformer.scala
index 63857eacc..cada42dc3 100644
--- a/tests/snapshots/src/main/generated/ujson/Transformer.scala
+++ b/tests/snapshots/src/main/generated/ujson/Transformer.scala
@@ -10,13 +10,16 @@ trait Transformer[I] {
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
 //                display_name Transformer
 //                signature_documentation scala trait Transformer[I]
+//                kind Trait
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
 //                  display_name I
 //                  signature_documentation scala I
+//                  kind TypeParameter
   def transform[T](j: I, f: Visitor[_, T]): T
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              display_name transform
 //              signature_documentation scala def transform(j: I, f: Visitor[local0, T[): T
+//              kind AbstractMethod
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser.transform().
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser.transform().
@@ -27,13 +30,16 @@ trait Transformer[I] {
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().(j)
 //                   display_name j
 //                   signature_documentation scala j: I 
+//                   kind Parameter
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().(f)
 //                         display_name f
 //                         signature_documentation scala f: Visitor[local0, T[ 
+//                         kind Parameter
 //                          ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().[T]
@@ -41,12 +47,15 @@ trait Transformer[I] {
 //    ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().
 //                  display_name transformable
 //                  signature_documentation scala def transformable(j: I): fromTransformer[I]
+//                  kind Method
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().[T]
 //                    display_name T
 //                    signature_documentation scala T
+//                    kind TypeParameter
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transformable().(j)
 //                       display_name j
 //                       signature_documentation scala j: I 
+//                       kind Parameter
 //                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#[I]
 //                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.
 //                                      ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.
diff --git a/tests/snapshots/src/main/generated/ujson/Value.scala b/tests/snapshots/src/main/generated/ujson/Value.scala
index 2a38468b6..9f067f892 100644
--- a/tests/snapshots/src/main/generated/ujson/Value.scala
+++ b/tests/snapshots/src/main/generated/ujson/Value.scala
@@ -33,6 +33,7 @@ sealed trait Value extends Readable with geny.Writable{
 //           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                 display_name Value
 //                 signature_documentation scala sealed trait Value
+//                 kind Trait
 //                         ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                                       ^^^^ reference semanticdb maven . . geny/
 //                                            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#
@@ -40,12 +41,14 @@ sealed trait Value extends Readable with geny.Writable{
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#httpContentType().
 //                             display_name httpContentType
 //                             signature_documentation scala def httpContentType: Some[String]
+//                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#httpContentType().
 //                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
   def value: Any
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //          display_name value
 //          signature_documentation scala def value: Any
+//          kind AbstractMethod
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
@@ -64,12 +67,14 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#str().
 //        display_name str
 //        signature_documentation scala def str: String
+//        kind Method
     case ujson.Str(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //                 ^^^^^ definition local 0
 //                       display_name value
 //                       signature_documentation scala value: String 
+//                       kind Variable
 //                           ^^^^^ reference local 0
     case _ => throw Value.InvalidData(this, "Expected ujson.Str")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -83,11 +88,13 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#strOpt().
 //           display_name strOpt
 //           signature_documentation scala def strOpt: Option[String]
+//           kind Method
     case Str(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //           ^^^^^ definition local 1
 //                 display_name value
 //                 signature_documentation scala value: String 
+//                 kind Variable
 //                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                          ^^^^^ reference local 1
     case _ => None
@@ -102,12 +109,14 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#obj().
 //        display_name obj
 //        signature_documentation scala def obj: LinkedHashMap[String, Value]
+//        kind Method
     case ujson.Obj(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                 ^^^^^ definition local 2
 //                       display_name value
 //                       signature_documentation scala value: LinkedHashMap[String, Value] 
+//                       kind Variable
 //                           ^^^^^ reference local 2
     case _ => throw Value.InvalidData(this, "Expected ujson.Obj")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -120,11 +129,13 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#objOpt().
 //           display_name objOpt
 //           signature_documentation scala def objOpt: Option[LinkedHashMap[String, Value]]
+//           kind Method
     case Obj(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //           ^^^^^ definition local 3
 //                 display_name value
 //                 signature_documentation scala value: LinkedHashMap[String, Value] 
+//                 kind Variable
 //                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                          ^^^^^ reference local 3
     case _ => None
@@ -138,12 +149,14 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#arr().
 //        display_name arr
 //        signature_documentation scala def arr: ArrayBuffer[Value]
+//        kind Method
     case ujson.Arr(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //                 ^^^^^ definition local 4
 //                       display_name value
 //                       signature_documentation scala value: ArrayBuffer[Value] 
+//                       kind Variable
 //                           ^^^^^ reference local 4
     case _ => throw Value.InvalidData(this, "Expected ujson.Arr")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -156,11 +169,13 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#arrOpt().
 //           display_name arrOpt
 //           signature_documentation scala def arrOpt: Option[ArrayBuffer[Value]]
+//           kind Method
     case Arr(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //           ^^^^^ definition local 5
 //                 display_name value
 //                 signature_documentation scala value: ArrayBuffer[Value] 
+//                 kind Variable
 //                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                          ^^^^^ reference local 5
     case _ => None
@@ -174,12 +189,14 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#num().
 //        display_name num
 //        signature_documentation scala def num: Double
+//        kind Method
     case ujson.Num(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //                 ^^^^^ definition local 6
 //                       display_name value
 //                       signature_documentation scala value: Double 
+//                       kind Variable
 //                           ^^^^^ reference local 6
     case _ => throw Value.InvalidData(this, "Expected ujson.Num")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -192,11 +209,13 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#numOpt().
 //           display_name numOpt
 //           signature_documentation scala def numOpt: Option[Double]
+//           kind Method
     case Num(value) => Some(value)
 //       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //           ^^^^^ definition local 7
 //                 display_name value
 //                 signature_documentation scala value: Double 
+//                 kind Variable
 //                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                          ^^^^^ reference local 7
     case _ => None
@@ -210,12 +229,14 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#bool().
 //         display_name bool
 //         signature_documentation scala def bool: Boolean
+//         kind Method
     case ujson.Bool(value) => value
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
 //                  ^^^^^ definition local 8
 //                        display_name value
 //                        signature_documentation scala value: Boolean 
+//                        kind Variable
 //                            ^^^^^ reference local 8
     case _ => throw Value.InvalidData(this, "Expected ujson.Bool")
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -228,11 +249,13 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#boolOpt().
 //            display_name boolOpt
 //            signature_documentation scala def boolOpt: Option[Boolean]
+//            kind Method
     case Bool(value) => Some(value)
 //       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
 //            ^^^^^ definition local 9
 //                  display_name value
 //                  signature_documentation scala value: Boolean 
+//                  kind Variable
 //                      ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
 //                           ^^^^^ reference local 9
     case _ => None
@@ -245,6 +268,7 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#isNull().
 //           display_name isNull
 //           signature_documentation scala def isNull: Boolean
+//           kind Method
     case ujson.Null => true
 //       ^^^^^ reference semanticdb maven . . ujson/
 //             ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
@@ -255,9 +279,11 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#apply().
 //          display_name apply
 //          signature_documentation scala def apply(s: Selector): Value
+//          kind Method
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#apply().(s)
 //            display_name s
 //            signature_documentation scala s: Selector 
+//            kind Parameter
 //             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                   ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -266,14 +292,17 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().
 //           display_name update
 //           signature_documentation scala def update(s: Selector, v: Value): Unit
+//           kind Method
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(s)
 //             display_name s
 //             signature_documentation scala s: Selector 
+//             kind Parameter
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(v)
 //                                display_name v
 //                                signature_documentation scala v: Value 
+//                                kind Parameter
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(s)
@@ -290,14 +319,17 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).
 //           display_name update
 //           signature_documentation scala def update(s: Selector, f: (Value) => Value): Unit
+//           kind Method
 //           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(s)
 //             display_name s
 //             signature_documentation scala s: Selector 
+//             kind Parameter
 //              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(f)
 //                                display_name f
 //                                signature_documentation scala f: (Value) => Value 
+//                                kind Parameter
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
@@ -309,13 +341,16 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //              display_name transform
 //              signature_documentation scala def transform(f: Visitor[local10, T[): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().(f)
 //                   display_name f
 //                   signature_documentation scala f: Visitor[local10, T[ 
+//                   kind Parameter
 //                    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().[T]
 //                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -325,6 +360,7 @@ sealed trait Value extends Readable with geny.Writable{
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#toString().
 //                      display_name toString
 //                      signature_documentation scala def toString(): String
+//                      kind Method
 //                      relationship is_reference is_implementation semanticdb maven . . scala/Any#toString().
 //                      relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/Object#toString().
 //                        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().
@@ -332,13 +368,16 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().
 //           display_name render
 //           signature_documentation scala def render(indent: Int, escapeUnicode: Boolean): String
+//           kind Method
 //           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(indent)
 //                  display_name indent
 //                  signature_documentation scala default indent: Int 
+//                  kind Parameter
 //                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(escapeUnicode)
 //                                           display_name escapeUnicode
 //                                           signature_documentation scala default escapeUnicode: Boolean 
+//                                           kind Parameter
 //                                            ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                                    ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //                                                                              ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
@@ -350,19 +389,23 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().
 //                 display_name writeBytesTo
 //                 signature_documentation scala def writeBytesTo(out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit
+//                 kind Method
 //                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(out)
 //                     display_name out
 //                     signature_documentation scala out: OutputStream 
+//                     kind Parameter
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^ reference semanticdb maven . . java/io/
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(indent)
 //                                                   display_name indent
 //                                                   signature_documentation scala default indent: Int 
+//                                                   kind Parameter
 //                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                              ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(escapeUnicode)
 //                                                                            display_name escapeUnicode
 //                                                                            signature_documentation scala default escapeUnicode: Boolean 
+//                                                                            kind Parameter
 //                                                                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     this.transform(new ujson.BaseByteRenderer(out, indent, escapeUnicode))
@@ -378,10 +421,12 @@ sealed trait Value extends Readable with geny.Writable{
 //    ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo(+1).
 //                 display_name writeBytesTo
 //                 signature_documentation scala def writeBytesTo(out: OutputStream): Unit
+//                 kind Method
 //                 relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#writeBytesTo().
 //                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo(+1).(out)
 //                     display_name out
 //                     signature_documentation scala out: OutputStream 
+//                     kind Parameter
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^ reference semanticdb maven . . java/io/
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
@@ -400,6 +445,7 @@ object Value extends AstTransformer[Value]{
 //     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //           display_name Value
 //           signature_documentation scala object Value
+//           kind Object
 //                   ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#
 //                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                        ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
@@ -407,36 +453,43 @@ object Value extends AstTransformer[Value]{
 //     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //           display_name Value
 //           signature_documentation scala type Value >: Value <: Value
+//           kind Type
 //             ^^^^^ reference semanticdb maven . . ujson/
 //                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
   sealed trait Selector{
 //             ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                      display_name Selector
 //                      signature_documentation scala sealed trait Selector
+//                      kind Trait
     def apply(x: Value): Value
 //      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
 //            display_name apply
 //            signature_documentation scala def apply(x: Value): Value
+//            kind AbstractMethod
 //            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().
 //            relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().(x)
 //              display_name x
 //              signature_documentation scala x: Value 
+//              kind Parameter
 //               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
     def update(x: Value, y: Value): Unit
 //      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
 //             display_name update
 //             signature_documentation scala def update(x: Value, y: Value): Unit
+//             kind AbstractMethod
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().
 //             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().(x)
 //               display_name x
 //               signature_documentation scala x: Value 
+//               kind Parameter
 //                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().(y)
 //                         display_name y
 //                         signature_documentation scala y: Value 
+//                         kind Parameter
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
   }
@@ -444,20 +497,25 @@ object Value extends AstTransformer[Value]{
 //       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.
 //                display_name Selector
 //                signature_documentation scala object Selector
+//                kind Object
     implicit class IntSelector(i: Int) extends Selector{
 //                 ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#
 //                             display_name IntSelector
 //                             signature_documentation scala implicit class IntSelector
+//                             kind Class
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().
 //                              display_name <init>
 //                              signature_documentation scala def this(i: Int)
+//                              kind Constructor
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#i.
 //                               display_name i
 //                               signature_documentation scala private[this] val i: Int
+//                               kind Method
 //                               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().(i)
 //                             _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#`<init>`().(i)
 //                               display_name i
 //                               signature_documentation scala i: Int 
+//                               kind Parameter
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#i.
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
@@ -466,10 +524,12 @@ object Value extends AstTransformer[Value]{
 //        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().
 //              display_name apply
 //              signature_documentation scala def apply(x: Value): Value
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().(x)
 //                display_name x
 //                signature_documentation scala x: Value 
+//                kind Parameter
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#apply().(x)
@@ -479,14 +539,17 @@ object Value extends AstTransformer[Value]{
 //        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().
 //               display_name update
 //               signature_documentation scala def update(x: Value, y: Value): Unit
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(x)
 //                 display_name x
 //                 signature_documentation scala x: Value 
+//                 kind Parameter
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(y)
 //                           display_name y
 //                           signature_documentation scala y: Value 
+//                           kind Parameter
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#update().(x)
 //                                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#arr().
@@ -497,16 +560,20 @@ object Value extends AstTransformer[Value]{
 //                 ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#
 //                                display_name StringSelector
 //                                signature_documentation scala implicit class StringSelector
+//                                kind Class
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().
 //                                 display_name <init>
 //                                 signature_documentation scala def this(i: String)
+//                                 kind Constructor
 //                                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#i.
 //                                  display_name i
 //                                  signature_documentation scala private[this] val i: String
+//                                  kind Method
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().(i)
 //                                _ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#`<init>`().(i)
 //                                  display_name i
 //                                  signature_documentation scala i: String 
+//                                  kind Parameter
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#i.
 //                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                   ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
@@ -515,10 +582,12 @@ object Value extends AstTransformer[Value]{
 //        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().
 //              display_name apply
 //              signature_documentation scala def apply(x: Value): Value
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().(x)
 //                display_name x
 //                signature_documentation scala x: Value 
+//                kind Parameter
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#apply().(x)
@@ -528,14 +597,17 @@ object Value extends AstTransformer[Value]{
 //        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().
 //               display_name update
 //               signature_documentation scala def update(x: Value, y: Value): Unit
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#update().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(x)
 //                 display_name x
 //                 signature_documentation scala x: Value 
+//                 kind Parameter
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(y)
 //                           display_name y
 //                           signature_documentation scala y: Value 
+//                           kind Parameter
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#update().(x)
 //                                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#obj().
@@ -551,6 +623,7 @@ object Value extends AstTransformer[Value]{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
 //        display_name Str
 //        signature_documentation scala @deprecated\nval Str: Str.type
+//        kind Method
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
   @deprecated("use ujson.Str")
@@ -560,6 +633,7 @@ object Value extends AstTransformer[Value]{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
 //         display_name Str
 //         signature_documentation scala type Str >: Str <: Str
+//         kind Type
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
   @deprecated("use ujson.Obj")
@@ -569,6 +643,7 @@ object Value extends AstTransformer[Value]{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj.
 //        display_name Obj
 //        signature_documentation scala @deprecated\nval Obj: Obj.type
+//        kind Method
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
   @deprecated("use ujson.Obj")
@@ -578,6 +653,7 @@ object Value extends AstTransformer[Value]{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj#
 //         display_name Obj
 //         signature_documentation scala type Obj >: Obj <: Obj
+//         kind Type
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
   @deprecated("use ujson.Arr")
@@ -587,6 +663,7 @@ object Value extends AstTransformer[Value]{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr.
 //        display_name Arr
 //        signature_documentation scala @deprecated\nval Arr: Arr.type
+//        kind Method
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
   @deprecated("use ujson.Arr")
@@ -596,6 +673,7 @@ object Value extends AstTransformer[Value]{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr#
 //         display_name Arr
 //         signature_documentation scala type Arr >: Arr <: Arr
+//         kind Type
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
   @deprecated("use ujson.Num")
@@ -605,6 +683,7 @@ object Value extends AstTransformer[Value]{
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //        display_name Num
 //        signature_documentation scala @deprecated\nval Num: Num.type
+//        kind Method
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
   @deprecated("use ujson.Num")
@@ -614,6 +693,7 @@ object Value extends AstTransformer[Value]{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //         display_name Num
 //         signature_documentation scala type Num >: Num <: Num
+//         kind Type
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
   @deprecated("use ujson.Bool")
@@ -623,6 +703,7 @@ object Value extends AstTransformer[Value]{
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool.
 //         display_name Bool
 //         signature_documentation scala @deprecated\nval Bool: Bool.type
+//         kind Method
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
   @deprecated("use ujson.Bool")
@@ -632,6 +713,7 @@ object Value extends AstTransformer[Value]{
 //     ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool#
 //          display_name Bool
 //          signature_documentation scala type Bool >: Bool <: Bool
+//          kind Type
 //            ^^^^^ reference semanticdb maven . . ujson/
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
   @deprecated("use ujson.True")
@@ -641,6 +723,7 @@ object Value extends AstTransformer[Value]{
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.True.
 //         display_name True
 //         signature_documentation scala @deprecated\nval True: True.type
+//         kind Method
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
   @deprecated("use ujson.False")
@@ -650,6 +733,7 @@ object Value extends AstTransformer[Value]{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.False.
 //          display_name False
 //          signature_documentation scala @deprecated\nval False: False.type
+//          kind Method
 //            ^^^^^ reference semanticdb maven . . ujson/
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
   @deprecated("use ujson.Null")
@@ -659,24 +743,29 @@ object Value extends AstTransformer[Value]{
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
 //         display_name Null
 //         signature_documentation scala @deprecated\nval Null: Null.type
+//         kind Method
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
   implicit def JsonableSeq[T](items: TraversableOnce[T])
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().
 //                         display_name JsonableSeq
 //                         signature_documentation scala implicit def JsonableSeq(items: TraversableOnce[T])(f: (T) => Value): Arr
+//                         kind Method
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
 //                           display_name T
 //                           signature_documentation scala T
+//                           kind TypeParameter
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(items)
 //                                  display_name items
 //                                  signature_documentation scala items: TraversableOnce[T] 
+//                                  kind Parameter
 //                                   ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
                              (implicit f: T => Value): Arr = Arr.from(items.map(f))
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(f)
 //                                       display_name f
 //                                       signature_documentation scala implicit f: (T) => Value 
+//                                       kind Parameter
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
 //                                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr#
@@ -689,12 +778,15 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().
 //                          display_name JsonableDict
 //                          signature_documentation scala implicit def JsonableDict(items: TraversableOnce[(String, T)])(f: (T) => Value): Obj
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
 //                            display_name T
 //                            signature_documentation scala T
+//                            kind TypeParameter
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(items)
 //                                   display_name items
 //                                   signature_documentation scala items: TraversableOnce[(String, T)] 
+//                                   kind Parameter
 //                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
 //                                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
@@ -702,6 +794,7 @@ object Value extends AstTransformer[Value]{
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(f)
 //                                        display_name f
 //                                        signature_documentation scala implicit f: (T) => Value 
+//                                        kind Parameter
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj#
@@ -712,6 +805,7 @@ object Value extends AstTransformer[Value]{
 //                                                                               ^ definition local 11
 //                                                                                 display_name x
 //                                                                                 signature_documentation scala x: (String, T) 
+//                                                                                 kind Parameter
 //                                                                                     ^ reference local 11
 //                                                                                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(f)
@@ -721,9 +815,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().
 //                             display_name JsonableBoolean
 //                             signature_documentation scala implicit def JsonableBoolean(i: Boolean): Bool
+//                             kind Method
 //                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().(i)
 //                               display_name i
 //                               signature_documentation scala i: Boolean 
+//                               kind Parameter
 //                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                          ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool#
 //                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().(i)
@@ -735,9 +831,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().
 //                          display_name JsonableByte
 //                          signature_documentation scala implicit def JsonableByte(i: Byte): Num
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().(i)
 //                            display_name i
 //                            signature_documentation scala i: Byte 
+//                            kind Parameter
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
@@ -746,9 +844,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().
 //                           display_name JsonableShort
 //                           signature_documentation scala implicit def JsonableShort(i: Short): Num
+//                           kind Method
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().(i)
 //                             display_name i
 //                             signature_documentation scala i: Short 
+//                             kind Parameter
 //                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Short#
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
@@ -757,9 +857,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().
 //                         display_name JsonableInt
 //                         signature_documentation scala implicit def JsonableInt(i: Int): Num
+//                         kind Method
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().(i)
 //                           display_name i
 //                           signature_documentation scala i: Int 
+//                           kind Parameter
 //                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
@@ -768,9 +870,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableLong().
 //                          display_name JsonableLong
 //                          signature_documentation scala implicit def JsonableLong(i: Long): Str
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableLong().(i)
 //                            display_name i
 //                            signature_documentation scala i: Long 
+//                            kind Parameter
 //                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
 //                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
@@ -780,9 +884,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().
 //                           display_name JsonableFloat
 //                           signature_documentation scala implicit def JsonableFloat(i: Float): Num
+//                           kind Method
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().(i)
 //                             display_name i
 //                             signature_documentation scala i: Float 
+//                             kind Parameter
 //                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Float#
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
@@ -791,9 +897,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().
 //                            display_name JsonableDouble
 //                            signature_documentation scala implicit def JsonableDouble(i: Double): Num
+//                            kind Method
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().(i)
 //                              display_name i
 //                              signature_documentation scala i: Double 
+//                              kind Parameter
 //                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
@@ -802,9 +910,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableNull().
 //                          display_name JsonableNull
 //                          signature_documentation scala implicit def JsonableNull(i: Null): Null.type
+//                          kind Method
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableNull().(i)
 //                            display_name i
 //                            signature_documentation scala i: Null 
+//                            kind Parameter
 //                             ^^^^ reference semanticdb maven . . scala/Null#
 //                                    ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
 //                                                ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
@@ -812,9 +922,11 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableString().
 //                            display_name JsonableString
 //                            signature_documentation scala implicit def JsonableString(s: CharSequence): Str
+//                            kind Method
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableString().(s)
 //                              display_name s
 //                              signature_documentation scala s: CharSequence 
+//                              kind Parameter
 //                               ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
 //                                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
@@ -826,17 +938,21 @@ object Value extends AstTransformer[Value]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().
 //              display_name transform
 //              signature_documentation scala def transform(j: Value, f: Visitor[local12, T[): T
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(j)
 //                   display_name j
 //                   signature_documentation scala j: Value 
+//                   kind Parameter
 //                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                             display_name f
 //                             signature_documentation scala f: Visitor[local12, T[ 
+//                             kind Parameter
 //                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().[T]
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().[T]
@@ -863,6 +979,7 @@ object Value extends AstTransformer[Value]{
 //                   ^ definition local 13
 //                     display_name s
 //                     signature_documentation scala s: String 
+//                     kind Variable
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                           ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                       ^ reference local 13
@@ -872,6 +989,7 @@ object Value extends AstTransformer[Value]{
 //                   ^ definition local 14
 //                     display_name d
 //                     signature_documentation scala d: Double 
+//                     kind Variable
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                           ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                                        ^ reference local 14
@@ -881,6 +999,7 @@ object Value extends AstTransformer[Value]{
 //                   ^^^^^ definition local 15
 //                         display_name items
 //                         signature_documentation scala items: ArrayBuffer[Value] 
+//                         kind Variable
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                                               ^^^^^ reference local 15
@@ -890,6 +1009,7 @@ object Value extends AstTransformer[Value]{
 //                   ^^^^^ definition local 16
 //                         display_name items
 //                         signature_documentation scala items: LinkedHashMap[String, Value] 
+//                         kind Variable
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().
 //                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.transform().(f)
 //                                                ^^^^^ reference local 16
@@ -900,14 +1020,17 @@ object Value extends AstTransformer[Value]{
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().
 //               display_name visitArray
 //               signature_documentation scala def visitArray(length: Int, index: Int): AstArrVisitor[ArrayBuffer]
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //               ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().(length)
 //                      display_name length
 //                      signature_documentation scala length: Int 
+//                      kind Parameter
 //                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().(index)
 //                                  display_name index
 //                                  signature_documentation scala index: Int 
+//                                  kind Parameter
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#
 //                                                            ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
@@ -915,6 +1038,7 @@ object Value extends AstTransformer[Value]{
 //                                                                         ^^ definition local 17
 //                                                                            display_name xs
 //                                                                            signature_documentation scala xs: ArrayBuffer[Value] 
+//                                                                            kind Parameter
 //                                                                               ^^^^^ reference semanticdb maven . . ujson/
 //                                                                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //                                                                                         ^^ reference local 17
@@ -923,14 +1047,17 @@ object Value extends AstTransformer[Value]{
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().
 //                display_name visitObject
 //                signature_documentation scala def visitObject(length: Int, index: Int): AstObjVisitor[LinkedHashMap[String, Value]]
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().(length)
 //                       display_name length
 //                       signature_documentation scala length: Int 
+//                       kind Parameter
 //                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().(index)
 //                                   display_name index
 //                                   signature_documentation scala index: Int 
+//                                   kind Parameter
 //                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#
 //                                                             ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
@@ -941,6 +1068,7 @@ object Value extends AstTransformer[Value]{
 //                                                                                                   ^^ definition local 18
 //                                                                                                      display_name xs
 //                                                                                                      signature_documentation scala xs: LinkedHashMap[String, Value] 
+//                                                                                                      kind Parameter
 //                                                                                                         ^^^^^ reference semanticdb maven . . ujson/
 //                                                                                                               ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                                                                                                                   ^^ reference local 18
@@ -949,10 +1077,12 @@ object Value extends AstTransformer[Value]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitNull().
 //              display_name visitNull
 //              signature_documentation scala def visitNull(index: Int): Null
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitNull().(index)
 //                    display_name index
 //                    signature_documentation scala index: Int 
+//                    kind Parameter
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^^ reference semanticdb maven . . ujson/
 //                                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
@@ -961,10 +1091,12 @@ object Value extends AstTransformer[Value]{
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFalse().
 //               display_name visitFalse
 //               signature_documentation scala def visitFalse(index: Int): False
+//               kind Method
 //               relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
 //               ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFalse().(index)
 //                     display_name index
 //                     signature_documentation scala index: Int 
+//                     kind Parameter
 //                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                             ^^^^^ reference semanticdb maven . . ujson/
 //                                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
@@ -973,10 +1105,12 @@ object Value extends AstTransformer[Value]{
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitTrue().
 //              display_name visitTrue
 //              signature_documentation scala def visitTrue(index: Int): True
+//              kind Method
 //              relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
 //              ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitTrue().(index)
 //                    display_name index
 //                    signature_documentation scala index: Int 
+//                    kind Parameter
 //                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                            ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.True.
 
@@ -985,22 +1119,27 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().
 //                                     display_name visitFloat64StringParts
 //                                     signature_documentation scala def visitFloat64StringParts(s: CharSequence, decIndex: Int, expIndex: Int, index: Int): Num
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(s)
 //                                       display_name s
 //                                       signature_documentation scala s: CharSequence 
+//                                       kind Parameter
 //                                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                                      ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(decIndex)
 //                                                               display_name decIndex
 //                                                               signature_documentation scala decIndex: Int 
+//                                                               kind Parameter
 //                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                     ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(expIndex)
 //                                                                              display_name expIndex
 //                                                                              signature_documentation scala expIndex: Int 
+//                                                                              kind Parameter
 //                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(index)
 //                                                                                          display_name index
 //                                                                                          signature_documentation scala index: Int 
+//                                                                                          kind Parameter
 //                                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
     ujson.Num(
 //  ^^^^^ reference semanticdb maven . . ujson/
@@ -1028,15 +1167,18 @@ object Value extends AstTransformer[Value]{
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().
 //                          display_name visitFloat64
 //                          signature_documentation scala def visitFloat64(d: Double, index: Int): Num
+//                          kind Method
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64().
 //                          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(d)
 //                            display_name d
 //                            signature_documentation scala d: Double 
+//                            kind Parameter
 //                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(index)
 //                                           display_name index
 //                                           signature_documentation scala index: Int 
+//                                           kind Parameter
 //                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                   ^^^^^ reference semanticdb maven . . ujson/
 //                                                         ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
@@ -1046,14 +1188,17 @@ object Value extends AstTransformer[Value]{
 //    ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().
 //                display_name visitString
 //                signature_documentation scala def visitString(s: CharSequence, index: Int): Str
+//                kind Method
 //                relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().(s)
 //                  display_name s
 //                  signature_documentation scala s: CharSequence 
+//                  kind Parameter
 //                   ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#
 //                                 ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().(index)
 //                                       display_name index
 //                                       signature_documentation scala index: Int 
+//                                       kind Parameter
 //                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                               ^^^^^ reference semanticdb maven . . ujson/
 //                                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
@@ -1072,59 +1217,70 @@ object Value extends AstTransformer[Value]{
 //           ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       display_name InvalidData
 //                       signature_documentation scala case class InvalidData(data: Value, msg: String) extends Exception
+//                       kind Class
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().
 //                       display_name copy
 //                       signature_documentation scala def copy(data: Value, msg: String): InvalidData
+//                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.
 //                       display_name InvalidData
 //                       signature_documentation scala object InvalidData
+//                       kind Object
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //                       display_name apply
 //                       signature_documentation scala def apply(data: Value, msg: String): InvalidData
+//                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#productElementName().
 //                       display_name productElementName
 //                       signature_documentation scala def productElementName(x$1: Int): String
+//                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#productElement().
 //                       display_name productElement
 //                       signature_documentation scala def productElement(x$1: Int): Any
+//                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
 //                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().
 //                        display_name <init>
 //                        signature_documentation scala def this(data: Value, msg: String)
+//                        kind Constructor
 //                       ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                            display_name data
 //                            signature_documentation scala val data: Value
+//                            kind Method
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                            display_name data
 //                            signature_documentation scala data: Value 
+//                            kind Parameter
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            display_name data
 //                            signature_documentation scala data: Value 
+//                            kind Parameter
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
 //                       ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(data)
 //                            display_name data
 //                            signature_documentation scala default data: Value 
+//                            kind Parameter
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#data.
 //                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(data)
@@ -1132,24 +1288,28 @@ object Value extends AstTransformer[Value]{
 //                                    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
 //                                        display_name msg
 //                                        signature_documentation scala val msg: String
+//                                        kind Method
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        display_name msg
 //                                        signature_documentation scala msg: String 
+//                                        kind Parameter
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        display_name msg
 //                                        signature_documentation scala default msg: String 
+//                                        kind Parameter
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                    ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().(msg)
 //                                        display_name msg
 //                                        signature_documentation scala msg: String 
+//                                        kind Parameter
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
@@ -1166,41 +1326,49 @@ case class Str(value: String) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             display_name Str
 //             signature_documentation scala case class Str(value: String) extends Value
+//             kind Class
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#productElement().
 //             display_name productElement
 //             signature_documentation scala def productElement(x$1: Int): Any
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().
 //             display_name copy
 //             signature_documentation scala def copy(value: String): Str
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //             display_name Str
 //             signature_documentation scala object Str
+//             kind Object
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#productElementName().
 //             display_name productElementName
 //             signature_documentation scala def productElementName(x$1: Int): String
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //             display_name apply
 //             signature_documentation scala def apply(value: String): Str
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().
 //              display_name <init>
 //              signature_documentation scala def this(value: String)
+//              kind Constructor
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //                   display_name value
 //                   signature_documentation scala val value: String
+//                   kind Method
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
@@ -1208,18 +1376,21 @@ case class Str(value: String) extends Value
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
 //                   display_name value
 //                   signature_documentation scala value: String 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   display_name value
 //                   signature_documentation scala value: String 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().(value)
 //                   display_name value
 //                   signature_documentation scala default value: String 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
@@ -1230,26 +1401,32 @@ case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //             display_name Obj
 //             signature_documentation scala case class Obj(value: LinkedHashMap[String, Value]) extends Value
+//             kind Class
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#productElementName().
 //             display_name productElementName
 //             signature_documentation scala def productElementName(x$1: Int): String
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#productElement().
 //             display_name productElement
 //             signature_documentation scala def productElement(x$1: Int): Any
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().
 //             display_name copy
 //             signature_documentation scala def copy(value: LinkedHashMap[String, Value]): Obj
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().
 //              display_name <init>
 //              signature_documentation scala def this(value: LinkedHashMap[String, Value])
+//              kind Constructor
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //                   display_name value
 //                   signature_documentation scala val value: LinkedHashMap[String, Value]
+//                   kind Method
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
@@ -1257,18 +1434,21 @@ case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //                   display_name value
 //                   signature_documentation scala value: LinkedHashMap[String, Value] 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   display_name value
 //                   signature_documentation scala value: LinkedHashMap[String, Value] 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().(value)
 //                   display_name value
 //                   signature_documentation scala default value: LinkedHashMap[String, Value] 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
@@ -1283,17 +1463,21 @@ object Obj{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //         display_name Obj
 //         signature_documentation scala object Obj
+//         kind Object
 //     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).
 //         display_name apply
 //         signature_documentation scala def apply(value: LinkedHashMap[String, Value]): Obj
+//         kind Method
 //         relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
   implicit def from(items: TraversableOnce[(String, Value)]): Obj = {
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().
 //                  display_name from
 //                  signature_documentation scala implicit def from(items: TraversableOnce[(String, Value)]): Obj
+//                  kind Method
 //                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().(items)
 //                        display_name items
 //                        signature_documentation scala items: TraversableOnce[(String, Value)] 
+//                        kind Parameter
 //                         ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
 //                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -1313,23 +1497,28 @@ object Obj{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().
 //          display_name apply
 //          signature_documentation scala def apply(item: (String, V), items: (String, Value)*)(conv: (V) => Value): Obj
+//          kind Method
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
 //            display_name V
 //            signature_documentation scala V
+//            kind TypeParameter
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(item)
 //                  display_name item
 //                  signature_documentation scala item: (String, V) 
+//                  kind Parameter
 //                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
                         items: (String, Value)*)(implicit conv: V => Value): Obj = {
 //                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(items)
 //                            display_name items
 //                            signature_documentation scala items: (String, Value)* 
+//                            kind Parameter
 //                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
 //                                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                        ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(conv)
 //                                                             display_name conv
 //                                                             signature_documentation scala implicit conv: (V) => Value 
+//                                                             kind Parameter
 //                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
 //                                                                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
@@ -1337,6 +1526,7 @@ object Obj{
 //      ^^^ definition local 22
 //          display_name map
 //          signature_documentation scala map: LinkedHashMap[String, Value] 
+//          kind Variable
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                        ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
 //                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
@@ -1354,6 +1544,7 @@ object Obj{
 //       ^ definition local 23
 //         display_name i
 //         signature_documentation scala i: (String, Value) 
+//         kind Parameter
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(items)
 //                   ^^^ reference local 22
 //                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#put().
@@ -1370,6 +1561,7 @@ object Obj{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+1).
 //          display_name apply
 //          signature_documentation scala def apply(): Obj
+//          kind Method
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //                   ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                           ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
@@ -1382,26 +1574,32 @@ case class Arr(value: ArrayBuffer[Value]) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //             display_name Arr
 //             signature_documentation scala case class Arr(value: ArrayBuffer[Value]) extends Value
+//             kind Class
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#productElement().
 //             display_name productElement
 //             signature_documentation scala def productElement(x$1: Int): Any
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#productElementName().
 //             display_name productElementName
 //             signature_documentation scala def productElementName(x$1: Int): String
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().
 //             display_name copy
 //             signature_documentation scala def copy(value: ArrayBuffer[Value]): Arr
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().
 //              display_name <init>
 //              signature_documentation scala def this(value: ArrayBuffer[Value])
+//              kind Constructor
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //                   display_name value
 //                   signature_documentation scala val value: ArrayBuffer[Value]
+//                   kind Method
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
@@ -1409,18 +1607,21 @@ case class Arr(value: ArrayBuffer[Value]) extends Value
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   display_name value
 //                   signature_documentation scala value: ArrayBuffer[Value] 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   display_name value
 //                   signature_documentation scala default value: ArrayBuffer[Value] 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).(value)
 //                   display_name value
 //                   signature_documentation scala value: ArrayBuffer[Value] 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
@@ -1433,25 +1634,31 @@ object Arr{
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
 //         display_name Arr
 //         signature_documentation scala object Arr
+//         kind Object
 //     ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply(+1).
 //         display_name apply
 //         signature_documentation scala def apply(value: ArrayBuffer[Value]): Arr
+//         kind Method
 //         relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
   implicit def from[T](items: TraversableOnce[T])(implicit conv: T => Value): Arr = {
 //             ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().
 //                  display_name from
 //                  signature_documentation scala implicit def from(items: TraversableOnce[T])(conv: (T) => Value): Arr
+//                  kind Method
 //                  ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                    display_name T
 //                    signature_documentation scala T
+//                    kind TypeParameter
 //                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(items)
 //                           display_name items
 //                           signature_documentation scala items: TraversableOnce[T] 
+//                           kind Parameter
 //                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                                                         ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(conv)
 //                                                              display_name conv
 //                                                              signature_documentation scala implicit conv: (T) => Value 
+//                                                              kind Parameter
 //                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                                                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
@@ -1459,6 +1666,7 @@ object Arr{
 //      ^^^ definition local 25
 //          display_name buf
 //          signature_documentation scala buf: ArrayBuffer[Value] 
+//          kind Variable
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -1469,6 +1677,7 @@ object Arr{
 //                 ^^^^ definition local 26
 //                      display_name item
 //                      signature_documentation scala item: T 
+//                      kind Parameter
       buf += (conv(item): Value)
 //    ^^^ reference local 25
 //        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
@@ -1485,15 +1694,18 @@ object Arr{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().
 //          display_name apply
 //          signature_documentation scala def apply(items: Value*): Arr
+//          kind Method
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().(items)
 //                display_name items
 //                signature_documentation scala items: Value* 
+//                kind Parameter
 //                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
     val buf = new mutable.ArrayBuffer[Value](items.length)
 //      ^^^ definition local 27
 //          display_name buf
 //          signature_documentation scala buf: ArrayBuffer[Value] 
+//          kind Variable
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
 //                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -1506,6 +1718,7 @@ object Arr{
 //                 ^^^^ definition local 28
 //                      display_name item
 //                      signature_documentation scala item: Value 
+//                      kind Parameter
       buf += item
 //    ^^^ reference local 27
 //        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
@@ -1520,41 +1733,49 @@ case class Num(value: Double) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             display_name Num
 //             signature_documentation scala case class Num(value: Double) extends Value
+//             kind Class
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#productElement().
 //             display_name productElement
 //             signature_documentation scala def productElement(x$1: Int): Any
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().
 //             display_name copy
 //             signature_documentation scala def copy(value: Double): Num
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //             display_name apply
 //             signature_documentation scala def apply(value: Double): Num
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#productElementName().
 //             display_name productElementName
 //             signature_documentation scala def productElementName(x$1: Int): String
+//             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //             display_name Num
 //             signature_documentation scala object Num
+//             kind Object
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().
 //              display_name <init>
 //              signature_documentation scala def this(value: Double)
+//              kind Constructor
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //                   display_name value
 //                   signature_documentation scala val value: Double
+//                   kind Method
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
@@ -1562,18 +1783,21 @@ case class Num(value: Double) extends Value
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
 //                   display_name value
 //                   signature_documentation scala value: Double 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   display_name value
 //                   signature_documentation scala default value: Double 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
 //             _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#`<init>`().(value)
 //                   display_name value
 //                   signature_documentation scala value: Double 
+//                   kind Parameter
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
@@ -1584,15 +1808,18 @@ sealed abstract class Bool extends Value{
 //                    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                         display_name Bool
 //                         signature_documentation scala abstract sealed class Bool
+//                         kind Class
 //                         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
 //                           display_name <init>
 //                           signature_documentation scala def this()
+//                           kind Constructor
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                      ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def value: Boolean
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          display_name value
 //          signature_documentation scala def value: Boolean
+//          kind AbstractMethod
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
@@ -1602,13 +1829,16 @@ object Bool{
 //     ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
 //          display_name Bool
 //          signature_documentation scala object Bool
+//          kind Object
   def apply(value: Boolean): Bool = if (value) True else False
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().
 //          display_name apply
 //          signature_documentation scala def apply(value: Boolean): Bool
+//          kind Method
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().(value)
 //                display_name value
 //                signature_documentation scala value: Boolean 
+//                kind Parameter
 //                 ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                           ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().(value)
@@ -1618,9 +1848,11 @@ object Bool{
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.unapply().
 //            display_name unapply
 //            signature_documentation scala def unapply(bool: Bool): Option[Boolean]
+//            kind Method
 //            ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.unapply().(bool)
 //                 display_name bool
 //                 signature_documentation scala bool: Bool 
+//                 kind Parameter
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Option#
 //                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
@@ -1632,9 +1864,11 @@ case object False extends Bool{
 //          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
 //                display_name False
 //                signature_documentation scala case object False
+//                kind Object
 //          _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.productElement().
 //                display_name productElement
 //                signature_documentation scala def productElement(x$1: Int): Any
+//                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
 //                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                        ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
@@ -1643,6 +1877,7 @@ case object False extends Bool{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
 //          display_name value
 //          signature_documentation scala def value: Boolean
+//          kind Method
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
@@ -1650,9 +1885,11 @@ case object True extends Bool{
 //          ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
 //               display_name True
 //               signature_documentation scala case object True
+//               kind Object
 //          ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.productElement().
 //               display_name productElement
 //               signature_documentation scala def productElement(x$1: Int): Any
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
@@ -1661,6 +1898,7 @@ case object True extends Bool{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.value().
 //          display_name value
 //          signature_documentation scala def value: Boolean
+//          kind Method
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
@@ -1668,9 +1906,11 @@ case object Null extends Value{
 //          ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
 //               display_name Null
 //               signature_documentation scala case object Null
+//               kind Object
 //          ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.productElement().
 //               display_name productElement
 //               signature_documentation scala def productElement(x$1: Int): Any
+//               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
 //               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
 //                       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -1679,5 +1919,6 @@ case object Null extends Value{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.value().
 //          display_name value
 //          signature_documentation scala def value: Null
+//          kind Method
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 }
diff --git a/tests/snapshots/src/main/generated/ujson/package.scala b/tests/snapshots/src/main/generated/ujson/package.scala
index 9014606b2..24fe9c184 100644
--- a/tests/snapshots/src/main/generated/ujson/package.scala
+++ b/tests/snapshots/src/main/generated/ujson/package.scala
@@ -7,20 +7,25 @@ package object ujson{
 //             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.
 //                   display_name ujson
 //                   signature_documentation scala package object ujson
+//                   kind PackageObject
   def transform[T](t: Readable, v: upickle.core.Visitor[_, T]) = t.transform(v)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //              display_name transform
 //              signature_documentation scala def transform(t: Readable, v: Visitor[local0, T[): T
+//              kind Method
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().[T]
 //                display_name T
 //                signature_documentation scala T
+//                kind TypeParameter
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().(t)
 //                   display_name t
 //                   signature_documentation scala t: Readable 
+//                   kind Parameter
 //                    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().(v)
 //                                display_name v
 //                                signature_documentation scala v: Visitor[local0, T[ 
+//                                kind Parameter
 //                                 ^^^^^^^ reference semanticdb maven . . upickle/
 //                                         ^^^^ reference semanticdb maven . . upickle/core/
 //                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
@@ -36,13 +41,16 @@ package object ujson{
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().
 //         display_name read
 //         signature_documentation scala def read(s: Readable, trace: Boolean): Value
+//         kind Method
 //         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().(s)
 //           display_name s
 //           signature_documentation scala s: Readable 
+//           kind Parameter
 //            ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.read().(trace)
 //                            display_name trace
 //                            signature_documentation scala default trace: Boolean 
+//                            kind Parameter
 //                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
@@ -60,9 +68,11 @@ package object ujson{
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.copy().
 //         display_name copy
 //         signature_documentation scala def copy(t: Value): Value
+//         kind Method
 //         ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.copy().(t)
 //           display_name t
 //           signature_documentation scala t: Value 
+//           kind Parameter
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
@@ -78,26 +88,31 @@ package object ujson{
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().
 //          display_name write
 //          signature_documentation scala def write(t: Value, indent: Int, escapeUnicode: Boolean): String
+//          kind Method
 //          ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(t)
 //            display_name t
 //            signature_documentation scala t: Value 
+//            kind Parameter
 //             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
             indent: Int = -1,
 //          ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(indent)
 //                 display_name indent
 //                 signature_documentation scala default indent: Int 
+//                 kind Parameter
 //                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
             escapeUnicode: Boolean = false): String = {
 //          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(escapeUnicode)
 //                        display_name escapeUnicode
 //                        signature_documentation scala default escapeUnicode: Boolean 
+//                        kind Parameter
 //                         ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
     val writer = new java.io.StringWriter
 //      ^^^^^^ definition local 1
 //             display_name writer
 //             signature_documentation scala writer: StringWriter 
+//             kind Variable
 //                   ^^^^ reference semanticdb maven . . java/
 //                        ^^ reference semanticdb maven . . java/io/
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/StringWriter#
@@ -120,15 +135,18 @@ package object ujson{
 //    ^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().
 //            display_name writeTo
 //            signature_documentation scala def writeTo(t: Value, out: Writer, indent: Int, escapeUnicode: Boolean): Unit
+//            kind Method
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(t)
 //              display_name t
 //              signature_documentation scala t: Value 
+//              kind Parameter
 //               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
               out: java.io.Writer,
 //            ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(out)
 //                display_name out
 //                signature_documentation scala out: Writer 
+//                kind Parameter
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/io/Writer#
@@ -136,11 +154,13 @@ package object ujson{
 //            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(indent)
 //                   display_name indent
 //                   signature_documentation scala default indent: Int 
+//                   kind Parameter
 //                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
               escapeUnicode: Boolean = false): Unit = {
 //            ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(escapeUnicode)
 //                          display_name escapeUnicode
 //                          signature_documentation scala default escapeUnicode: Boolean 
+//                          kind Parameter
 //                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     transform(t, Renderer(out, indent, escapeUnicode))
@@ -155,15 +175,18 @@ package object ujson{
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().
 //                        display_name writeToOutputStream
 //                        signature_documentation scala def writeToOutputStream(t: Value, out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit
+//                        kind Method
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(t)
 //                          display_name t
 //                          signature_documentation scala t: Value 
+//                          kind Parameter
 //                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
                           out: java.io.OutputStream,
 //                        ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(out)
 //                            display_name out
 //                            signature_documentation scala out: OutputStream 
+//                            kind Parameter
 //                             ^^^^ reference semanticdb maven . . java/
 //                                  ^^ reference semanticdb maven . . java/io/
 //                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
@@ -171,11 +194,13 @@ package object ujson{
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(indent)
 //                               display_name indent
 //                               signature_documentation scala default indent: Int 
+//                               kind Parameter
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                           escapeUnicode: Boolean = false): Unit = {
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(escapeUnicode)
 //                                      display_name escapeUnicode
 //                                      signature_documentation scala default escapeUnicode: Boolean 
+//                                      kind Parameter
 //                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     transform(t, new BaseByteRenderer(out, indent, escapeUnicode))
@@ -192,25 +217,30 @@ package object ujson{
 //    ^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().
 //                     display_name writeToByteArray
 //                     signature_documentation scala def writeToByteArray(t: Value, indent: Int, escapeUnicode: Boolean): Array[Byte]
+//                     kind Method
 //                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(t)
 //                       display_name t
 //                       signature_documentation scala t: Value 
+//                       kind Parameter
 //                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
                        indent: Int = -1,
 //                     ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(indent)
 //                            display_name indent
 //                            signature_documentation scala default indent: Int 
+//                            kind Parameter
 //                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                        escapeUnicode: Boolean = false) = {
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(escapeUnicode)
 //                                   display_name escapeUnicode
 //                                   signature_documentation scala default escapeUnicode: Boolean 
+//                                   kind Parameter
 //                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
     val baos = new java.io.ByteArrayOutputStream
 //      ^^^^ definition local 2
 //           display_name baos
 //           signature_documentation scala baos: ByteArrayOutputStream 
+//           kind Variable
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
 //                         ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/ByteArrayOutputStream#
@@ -233,9 +263,11 @@ package object ujson{
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.validate().
 //             display_name validate
 //             signature_documentation scala def validate(s: Readable): Unit
+//             kind Method
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.validate().(s)
 //               display_name s
 //               signature_documentation scala s: Readable 
+//               kind Parameter
 //                ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
@@ -249,23 +281,28 @@ package object ujson{
 //    ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().
 //             display_name reformat
 //             signature_documentation scala def reformat(s: Readable, indent: Int, escapeUnicode: Boolean): String
+//             kind Method
 //             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(s)
 //               display_name s
 //               signature_documentation scala s: Readable 
+//               kind Parameter
 //                ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                          ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(indent)
 //                                 display_name indent
 //                                 signature_documentation scala default indent: Int 
+//                                 kind Parameter
 //                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                            ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(escapeUnicode)
 //                                                          display_name escapeUnicode
 //                                                          signature_documentation scala default escapeUnicode: Boolean 
+//                                                          kind Parameter
 //                                                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
     val writer = new java.io.StringWriter()
 //      ^^^^^^ definition local 3
 //             display_name writer
 //             signature_documentation scala writer: StringWriter 
+//             kind Variable
 //                   ^^^^ reference semanticdb maven . . java/
 //                        ^^ reference semanticdb maven . . java/io/
 //                           ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/StringWriter#
@@ -288,23 +325,28 @@ package object ujson{
 //    ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().
 //               display_name reformatTo
 //               signature_documentation scala def reformatTo(s: Readable, out: Writer, indent: Int, escapeUnicode: Boolean): Unit
+//               kind Method
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(s)
 //                 display_name s
 //                 signature_documentation scala s: Readable 
+//                 kind Parameter
 //                  ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
 //                            ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(out)
 //                                display_name out
 //                                signature_documentation scala out: Writer 
+//                                kind Parameter
 //                                 ^^^^ reference semanticdb maven . . java/
 //                                      ^^ reference semanticdb maven . . java/io/
 //                                         ^^^^^^ reference semanticdb maven jdk 11 java/io/Writer#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(indent)
 //                                                        display_name indent
 //                                                        signature_documentation scala default indent: Int 
+//                                                        kind Parameter
 //                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
 //                                                                   ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(escapeUnicode)
 //                                                                                 display_name escapeUnicode
 //                                                                                 signature_documentation scala default escapeUnicode: Boolean 
+//                                                                                 kind Parameter
 //                                                                                  ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                                                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     transform(s, Renderer(out, indent, escapeUnicode))
@@ -323,14 +365,17 @@ package object ujson{
 //    ^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().
 //                           display_name reformatToOutputStream
 //                           signature_documentation scala def reformatToOutputStream(s: Readable, out: OutputStream, indent: Int, escapeUnicode: Boolean): Unit
+//                           kind Method
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(s)
 //                             display_name s
 //                             signature_documentation scala s: Readable 
+//                             kind Parameter
 //                              ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
                              out: java.io.OutputStream,
 //                           ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(out)
 //                               display_name out
 //                               signature_documentation scala out: OutputStream 
+//                               kind Parameter
 //                                ^^^^ reference semanticdb maven . . java/
 //                                     ^^ reference semanticdb maven . . java/io/
 //                                        ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
@@ -338,11 +383,13 @@ package object ujson{
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(indent)
 //                                  display_name indent
 //                                  signature_documentation scala default indent: Int 
+//                                  kind Parameter
 //                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                              escapeUnicode: Boolean = false): Unit = {
 //                           ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(escapeUnicode)
 //                                         display_name escapeUnicode
 //                                         signature_documentation scala default escapeUnicode: Boolean 
+//                                         kind Parameter
 //                                          ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
 //                                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
     transform(s, new BaseByteRenderer(out, indent, escapeUnicode))
@@ -358,24 +405,29 @@ package object ujson{
 //    ^^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().
 //                        display_name reformatToByteArray
 //                        signature_documentation scala def reformatToByteArray(s: Readable, indent: Int, escapeUnicode: Boolean): Array[Byte]
+//                        kind Method
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(s)
 //                          display_name s
 //                          signature_documentation scala s: Readable 
+//                          kind Parameter
 //                           ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
                           indent: Int = -1,
 //                        ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(indent)
 //                               display_name indent
 //                               signature_documentation scala default indent: Int 
+//                               kind Parameter
 //                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
                           escapeUnicode: Boolean = false) = {
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(escapeUnicode)
 //                                      display_name escapeUnicode
 //                                      signature_documentation scala default escapeUnicode: Boolean 
+//                                      kind Parameter
 //                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
     val baos = new java.io.ByteArrayOutputStream
 //      ^^^^ definition local 4
 //           display_name baos
 //           signature_documentation scala baos: ByteArrayOutputStream 
+//           kind Variable
 //                 ^^^^ reference semanticdb maven . . java/
 //                      ^^ reference semanticdb maven . . java/io/
 //                         ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/ByteArrayOutputStream#
@@ -398,6 +450,7 @@ package object ujson{
 //     ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.Js#
 //        display_name Js
 //        signature_documentation scala type Js >: Value <: Value
+//        kind Type
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
   @deprecated("use ujson.Value")
 // ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
@@ -406,5 +459,6 @@ package object ujson{
 //    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.Js.
 //       display_name Js
 //       signature_documentation scala @deprecated\nval Js: 
+//       kind Method
 //         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 }

From 49c52c47b05638e8fb5e995fd954ce0b5bdf282a Mon Sep 17 00:00:00 2001
From: Nicolas Guichard <nicolas.guichard@kdab.com>
Date: Wed, 10 Jan 2024 16:39:35 +0100
Subject: [PATCH 09/11] semanticdb-javac: set kind to Variable for local
 variables

---
 .../semanticdb_javac/SemanticdbVisitor.java   |  4 +++
 .../com/airbnb/epoxy/AsyncEpoxyDiffer.java    | 10 ++++++
 .../com/airbnb/epoxy/BaseEpoxyAdapter.java    |  8 +++++
 .../generated/com/airbnb/epoxy/Carousel.java  | 17 ++++++++++
 .../com/airbnb/epoxy/ControllerHelper.java    |  3 ++
 .../airbnb/epoxy/ControllerHelperLookup.java  |  5 +++
 .../com/airbnb/epoxy/DebugTimer.java          |  1 +
 .../com/airbnb/epoxy/DiffHelper.java          | 31 +++++++++++++++++++
 .../com/airbnb/epoxy/DiffPayload.java         | 12 +++++++
 .../com/airbnb/epoxy/EpoxyAdapter.java        | 16 ++++++++++
 .../com/airbnb/epoxy/EpoxyAsyncUtil.java      |  1 +
 .../com/airbnb/epoxy/EpoxyController.java     | 20 ++++++++++++
 .../airbnb/epoxy/EpoxyControllerAdapter.java  | 12 +++++++
 .../epoxy/EpoxyItemSpacingDecorator.java      | 21 +++++++++++++
 .../com/airbnb/epoxy/EpoxyModel.java          |  8 +++++
 .../com/airbnb/epoxy/EpoxyModelGroup.java     |  8 +++++
 .../airbnb/epoxy/EpoxyModelTouchCallback.java | 13 ++++++++
 .../com/airbnb/epoxy/EpoxyTouchHelper.java    |  6 ++++
 .../generated/com/airbnb/epoxy/IdUtils.java   |  3 ++
 .../com/airbnb/epoxy/ListenersUtils.java      |  3 ++
 .../generated/com/airbnb/epoxy/ModelList.java | 13 ++++++++
 .../com/airbnb/epoxy/ModelState.java          |  1 +
 .../epoxy/QuantityStringResAttribute.java     |  2 ++
 .../com/airbnb/epoxy/SimpleEpoxyModel.java    |  2 ++
 .../com/airbnb/epoxy/StringAttributeData.java |  2 ++
 .../generated/com/airbnb/epoxy/UpdateOp.java  |  1 +
 .../com/airbnb/epoxy/UpdateOpHelper.java      |  3 ++
 .../com/airbnb/epoxy/ViewHolderState.java     | 12 +++++++
 .../com/airbnb/epoxy/ViewTypeManager.java     |  5 +++
 ...rappedEpoxyModelCheckedChangeListener.java |  3 ++
 .../main/java/minimized/AnonymousClasses.java |  1 +
 .../src/main/java/minimized/Arrays.java       |  4 +++
 .../src/main/java/minimized/Enums.java        |  1 +
 .../src/main/java/minimized/Fields.java       |  3 ++
 .../java/minimized/ForComprehensions.java     |  3 ++
 .../src/main/java/minimized/InnerClasses.java |  4 +++
 .../src/main/java/minimized/Methods.java      |  5 +++
 .../src/main/java/minimized/Primitives.java   |  9 ++++++
 .../src/main/java/minimized/SubClasses.java   |  1 +
 .../src/main/java/minimized/TabIndented.java  |  1 +
 40 files changed, 278 insertions(+)

diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
index 4de9daf55..cebd32f95 100644
--- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
+++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
@@ -177,6 +177,10 @@ private void emitSymbolInformation(Element sym, Tree tree) {
                     .collect(Collectors.joining(", "));
         if (!args.isEmpty())
           builder.setDisplayName(sym.getSimpleName().toString() + "(" + args + ")");
+        break;
+      case LOCAL_VARIABLE:
+        builder.setKind(Kind.LOCAL);
+        break;
     }
 
     Semanticdb.SymbolInformation info = builder.build();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
index 44351705c..bc84590f3 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
@@ -261,12 +261,14 @@ public synchronized boolean forceListOverride(@Nullable List<EpoxyModel<?>> newL
 //                                display_name interruptedDiff
 //                                signature_documentation java final boolean interruptedDiff
 //                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
+//                                kind Variable
 //                                  ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff().
     int generation = generationTracker.incrementAndGetNextScheduled();
 //      ^^^^^^^^^^ definition local 6
 //                 display_name generation
 //                 signature_documentation java int generation
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
+//                 kind Variable
 //                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker.
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#incrementAndGetNextScheduled().
     tryLatchList(newList, generation);
@@ -309,6 +311,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //                          display_name runGeneration
 //                          signature_documentation java final int runGeneration
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
+//                          kind Variable
     @Nullable final List<? extends EpoxyModel<?>> previousList;
 //   ^^^^^^^^ reference semanticdb maven maven/androidx.annotation/annotation 1.1.0 androidx/annotation/Nullable#
 //                  ^^^^ reference semanticdb maven jdk 11 java/util/List#
@@ -317,6 +320,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //                                                             display_name previousList
 //                                                             signature_documentation java @Nullable\nfinal List<? extends EpoxyModel<?>> previousList
 //                                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
+//                                                             kind Variable
 
     synchronized (this) {
       // Incrementing generation means any currently-running diffs are discarded when they finish
@@ -355,6 +359,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //                      display_name result
 //                      signature_documentation java DiffResult result
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
+//                      kind Variable
       if (previousList != null && !previousList.isEmpty()) {
 //        ^^^^^^^^^^^^ reference local 9
 //                                 ^^^^^^^^^^^^ reference local 9
@@ -393,6 +398,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
 //                                     display_name wrappedCallback
 //                                     signature_documentation java final DiffCallback wrappedCallback
 //                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#submitList().
+//                                     kind Variable
 //                                           ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
 //                                                        ^^^^^^^^^^^^ reference local 9
 //                                                                      ^^^^^^^ reference local 7
@@ -418,6 +424,7 @@ public void run() {
 //                                 display_name result
 //                                 signature_documentation java unresolved_type result
 //                                 enclosing_symbol local 13
+//                                 kind Variable
 //                                   ^^^^^^^^ reference semanticdb maven . . DiffUtil#
 //                                            ^^^^^^^^^^^^^ reference semanticdb maven . . DiffUtil#calculateDiff#
 //                                                          ^^^^^^^^^^^^^^^ reference local 11
@@ -482,6 +489,7 @@ public void run() {
 //                                   display_name dispatchResult
 //                                   signature_documentation java final boolean dispatchResult
 //                                   enclosing_symbol local 19
+//                                   kind Variable
 //                                     ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList().
 //                                                  ^^^^^^^ reference local 16
 //                                                           ^^^^^^^^^^^^^ reference local 15
@@ -604,6 +612,7 @@ synchronized boolean finishMaxGeneration() {
 //                           display_name isInterrupting
 //                           signature_documentation java boolean isInterrupting
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishMaxGeneration().
+//                           kind Variable
 //                             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#hasUnfinishedGeneration().
       maxFinishedGeneration = maxScheduledGeneration;
 //    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxFinishedGeneration.
@@ -636,6 +645,7 @@ synchronized boolean finishGeneration(int runGeneration) {
 //                               display_name isLatestGeneration
 //                               signature_documentation java boolean isLatestGeneration
 //                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishGeneration().
+//                               kind Variable
           maxScheduledGeneration == runGeneration && runGeneration > maxFinishedGeneration;
 //        ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#maxScheduledGeneration.
 //                                  ^^^^^^^^^^^^^ reference local 24
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
index b515a2cda..ba15453f3 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
@@ -270,6 +270,7 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
+//                      kind Variable
 //                        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
 //                                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
 //                                                                  ^^^^^^^^ reference local 4
@@ -279,6 +280,7 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 //            display_name view
 //            signature_documentation java unresolved_type view
 //            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder().
+//            kind Variable
 //              ^^^^^ reference local 5
 //                    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#buildView().
 //                              ^^^^^^ reference local 3
@@ -342,6 +344,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
 //                            display_name modelToShow
 //                            signature_documentation java EpoxyModel<?> modelToShow
 //                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
+//                            kind Variable
 //                              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelForPosition().
 //                                                  ^^^^^^^^ reference local 10
 
@@ -351,6 +354,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position, List<Object>
 //                                     display_name previouslyBoundModel
 //                                     signature_documentation java EpoxyModel<?> previouslyBoundModel
 //                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1).
+//                                     kind Variable
     if (diffPayloadsEnabled()) {
 //      ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#diffPayloadsEnabled().
       previouslyBoundModel = DiffPayload.getModelFromPayload(payloads, getItemId(position));
@@ -576,6 +580,7 @@ public void onViewRecycled(EpoxyViewHolder holder) {
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onViewRecycled().
+//                      kind Variable
 //                        ^^^^^^ reference local 26
 //                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     holder.unbind();
@@ -728,6 +733,7 @@ public void onSaveInstanceState(Bundle outState) {
 //                              display_name holder
 //                              signature_documentation java EpoxyViewHolder holder
 //                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState().
+//                              kind Variable
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders.
       viewHolderState.save(holder);
 //    ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
@@ -813,6 +819,7 @@ protected int getModelPosition(EpoxyModel<?> model) {
 //           display_name size
 //           signature_documentation java int size
 //           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
@@ -820,6 +827,7 @@ protected int getModelPosition(EpoxyModel<?> model) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
+//             kind Variable
 //                  ^ reference local 39
 //                      ^^^^ reference local 38
 //                            ^ reference local 39
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
index 5cec7e996..29e50b142 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
@@ -247,6 +247,7 @@ protected void init() {
 //                       display_name defaultSpacingDp
 //                       signature_documentation java int defaultSpacingDp
 //                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#init().
+//                       kind Variable
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp().
 
     if (defaultSpacingDp >= 0) {
@@ -276,6 +277,7 @@ && getPaddingBottom() == 0) {
 //                                      display_name snapHelperFactory
 //                                      signature_documentation java SnapHelperFactory snapHelperFactory
 //                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#init().
+//                                      kind Variable
 //                                        ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSnapHelperFactory().
     if (snapHelperFactory != null) {
 //      ^^^^^^^^^^^^^^^^^ reference local 10
@@ -439,6 +441,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //                    display_name prefetchCount
 //                    signature_documentation java int prefetchCount
 //                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount().
+//                    kind Variable
 //                      ^^^^^^^^^^^^^^^^^^ reference local 14
 //                                                    ^^^^^^^^^^^^^^^^^^ reference local 14
 
@@ -448,6 +451,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
 //                              display_name layoutManager
 //                              signature_documentation java unresolved_type layoutManager
 //                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount().
+//                              kind Variable
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#
     if (layoutManager instanceof LinearLayoutManager) {
 //      ^^^^^^^^^^^^^ reference local 16
@@ -481,6 +485,7 @@ public void onChildAttachedToWindow(View child) {
 //                                             display_name childLayoutParams
 //                                             signature_documentation java unresolved_type childLayoutParams
 //                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
+//                                             kind Variable
 //                                               ^^^^^ reference local 17
 //                                                     ^^^^^^^^^^^^^^^ reference semanticdb maven . . View#getLayoutParams#
       child.setTag(R.id.epoxy_recycler_view_child_initial_size_id, childLayoutParams.width);
@@ -497,6 +502,7 @@ public void onChildAttachedToWindow(View child) {
 //                      display_name itemSpacingPx
 //                      signature_documentation java int itemSpacingPx
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
+//                      kind Variable
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpacingDecorator#
 //                                              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpacingDecorator#getPxBetweenItems#
       int spaceBetweenItems = 0;
@@ -504,6 +510,7 @@ public void onChildAttachedToWindow(View child) {
 //                          display_name spaceBetweenItems
 //                          signature_documentation java int spaceBetweenItems
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
+//                          kind Variable
       if (itemSpacingPx > 0) {
 //        ^^^^^^^^^^^^^ reference local 19
         // The item decoration space is not counted in the width of the view
@@ -518,6 +525,7 @@ public void onChildAttachedToWindow(View child) {
 //                                    display_name isScrollingHorizontally
 //                                    signature_documentation java boolean isScrollingHorizontally
 //                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
+//                                    kind Variable
 //                                      ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#
 //                                                         ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getLayoutManager#canScrollHorizontally#
       int itemSizeInScrollingDirection =
@@ -525,6 +533,7 @@ public void onChildAttachedToWindow(View child) {
 //                                     display_name itemSizeInScrollingDirection
 //                                     signature_documentation java int itemSizeInScrollingDirection
 //                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildAttachedToWindow().
+//                                     kind Variable
           (int)
               ((getSpaceForChildren(isScrollingHorizontally) - spaceBetweenItems)
 //              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#getSpaceForChildren().
@@ -618,6 +627,7 @@ private static int getTotalWidthPx(View view) {
 //                         display_name metrics
 //                         signature_documentation java unresolved_type metrics
 //                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalWidthPx().
+//                         kind Variable
 //                           ^^^^ reference local 24
 //                                ^^^^^^^^^^ reference semanticdb maven . . View#getContext#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven . . View#getContext#getResources#
@@ -662,6 +672,7 @@ private static int getTotalHeightPx(View view) {
 //                         display_name metrics
 //                         signature_documentation java unresolved_type metrics
 //                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#getTotalHeightPx().
+//                         kind Variable
 //                           ^^^^ reference local 26
 //                                ^^^^^^^^^^ reference semanticdb maven . . View#getContext#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven . . View#getContext#getResources#
@@ -690,6 +701,7 @@ public void onChildDetachedFromWindow(View child) {
 //                      display_name initialWidth
 //                      signature_documentation java Object initialWidth
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildDetachedFromWindow().
+//                      kind Variable
 //                        ^^^^^ reference local 28
 //                              ^^^^^^ reference semanticdb maven . . View#getTag#
 //                                     ^ reference semanticdb maven . . R/
@@ -706,6 +718,7 @@ public void onChildDetachedFromWindow(View child) {
 //                                  display_name params
 //                                  signature_documentation java unresolved_type params
 //                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#onChildDetachedFromWindow().
+//                                  kind Variable
 //                                    ^^^^^ reference local 28
 //                                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . View#getLayoutParams#
       params.width = (int) initialWidth;
@@ -789,6 +802,7 @@ public void setPaddingRes(@DimenRes int paddingRes) {
 //         display_name px
 //         signature_documentation java int px
 //         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingRes().
+//         kind Variable
 //           ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#resToPx#
 //                   ^^^^^^^^^^ reference local 32
     setPadding(px, px, px, px);
@@ -831,6 +845,7 @@ public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) {
 //         display_name px
 //         signature_documentation java int px
 //         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#setPaddingDp().
+//         kind Variable
 //           ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#dpToPx#
 //                  ^^^^^^^^^ reference local 34
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#NO_VALUE_SET.
@@ -1401,6 +1416,7 @@ public boolean equals(Object o) {
 //                    display_name padding
 //                    signature_documentation java Padding padding
 //                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#equals().
+//                    kind Variable
 //                       ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#
 //                                ^ reference local 64
 
@@ -1447,6 +1463,7 @@ public int hashCode() {
 //               display_name result
 //               signature_documentation java int result
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#hashCode().
+//               kind Variable
 //                 ^^^^ reference semanticdb maven . . com/airbnb/epoxy/Carousel#Padding#left.
       result = 31 * result + top;
 //    ^^^^^^ reference local 66
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
index eda8ba180..b82bb679f 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java
@@ -49,6 +49,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 //                                    display_name currentModels
 //                                    signature_documentation java List<EpoxyModel<?>> currentModels
 //                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
+//                                    kind Variable
 //                                      ^^^^^^^^^^ reference local 0
 //                                                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#getAdapter().
 //                                                              ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCopyOfModels().
@@ -58,6 +59,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
+//             kind Variable
 //                  ^ reference local 2
 //                      ^^^^^^^^^^^^^ reference local 1
 //                                    ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -68,6 +70,7 @@ protected void validateModelHashCodesHaveNotChanged(T controller) {
 //                     display_name model
 //                     signature_documentation java EpoxyModel model
 //                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelper#validateModelHashCodesHaveNotChanged().
+//                     kind Variable
 //                       ^^^^^^^^^^^^^ reference local 1
 //                                     ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                         ^ reference local 2
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
index 85e4cb397..143962a7b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java
@@ -79,6 +79,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //                             display_name constructor
 //                             signature_documentation java Constructor<?> constructor
 //                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
+//                             kind Variable
 //                               ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
 //                                                       ^^^^^^^^^^ reference local 0
 //                                                                  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
@@ -126,6 +127,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) {
 //                    display_name cause
 //                    signature_documentation java Throwable cause
 //                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
+//                    kind Variable
 //                      ^ reference local 4
 //                        ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationTargetException#getCause().
       if (cause instanceof RuntimeException) {
@@ -167,6 +169,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //                            display_name helperCtor
 //                            signature_documentation java Constructor<?> helperCtor
 //                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
+//                            kind Variable
 //                              ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#BINDINGS.
 //                                       ^^^ reference semanticdb maven jdk 11 java/util/Map#get().
 //                                           ^^^^^^^^^^^^^^^ reference local 6
@@ -185,6 +188,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //                 display_name clsName
 //                 signature_documentation java String clsName
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
+//                 kind Variable
 //                   ^^^^^^^^^^^^^^^ reference local 6
 //                                   ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#getName().
     if (clsName.startsWith("android.") || clsName.startsWith("java.")) {
@@ -202,6 +206,7 @@ private static Constructor<?> findConstructorForClass(Class<?> controllerClass)
 //                          display_name bindingClass
 //                          signature_documentation java Class<?> bindingClass
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass().
+//                          kind Variable
 //                            ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                  ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Class#forName().
 //                                          ^^^^^^^ reference local 8
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
index 44e71d407..bff53dc04 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
@@ -106,6 +106,7 @@ public void stop() {
 //                   display_name durationMs
 //                   signature_documentation java float durationMs
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DebugTimer#stop().
+//                   kind Variable
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/System#
 //                             ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/System#nanoTime().
 //                                          ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DebugTimer#startTime.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
index ec922cddb..b1b588afd 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
@@ -233,6 +233,7 @@ void notifyModelChanges() {
 //                                display_name updateOpHelper
 //                                signature_documentation java UpdateOpHelper updateOpHelper
 //                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyModelChanges().
+//                                kind Variable
 //                                      ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#`<init>`().
 
     buildDiff(updateOpHelper);
@@ -270,6 +271,7 @@ private void notifyChanges(UpdateOpHelper opHelper) {
 //                   display_name op
 //                   signature_documentation java UpdateOp op
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#notifyChanges().
+//                   kind Variable
 //                     ^^^^^^^^ reference local 3
 //                              ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#opList.
       switch (op.type) {
@@ -379,6 +381,7 @@ private UpdateOpHelper buildDiff(UpdateOpHelper updateOpHelper) {
 //                        display_name hasInsertions
 //                        signature_documentation java boolean hasInsertions
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#buildDiff().
+//                        kind Variable
         oldStateList.size() - updateOpHelper.getNumRemovals() != currentStateList.size();
 //      ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                   ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
@@ -443,6 +446,7 @@ private void prepareStateForDiff() {
 //                                 display_name tempList
 //                                 signature_documentation java ArrayList<ModelState> tempList
 //                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
+//                                 kind Variable
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
     oldStateList = currentStateList;
 //  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
@@ -459,6 +463,7 @@ private void prepareStateForDiff() {
 //                                display_name tempMap
 //                                signature_documentation java Map<Long, ModelState> tempMap
 //                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
+//                                kind Variable
 //                                  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
     oldStateMap = currentStateMap;
 //  ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateMap.
@@ -475,6 +480,7 @@ private void prepareStateForDiff() {
 //                             display_name modelState
 //                             signature_documentation java ModelState modelState
 //                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
+//                             kind Variable
 //                               ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
       modelState.pair = null;
 //    ^^^^^^^^^^ reference local 9
@@ -486,6 +492,7 @@ private void prepareStateForDiff() {
 //                 display_name modelCount
 //                 signature_documentation java int modelCount
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
+//                 kind Variable
 //                   ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                              ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -499,6 +506,7 @@ private void prepareStateForDiff() {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#prepareStateForDiff().
+//             kind Variable
 //                  ^ reference local 11
 //                      ^^^^^^^^^^ reference local 10
 //                                  ^ reference local 11
@@ -526,6 +534,7 @@ private ModelState createStateForPosition(int position) {
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
+//                      kind Variable
 //                        ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                                   ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -539,6 +548,7 @@ private ModelState createStateForPosition(int position) {
 //                   display_name state
 //                   signature_documentation java ModelState state
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
+//                   kind Variable
 //                     ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
 //                                ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#build().
 //                                      ^^^^^ reference local 13
@@ -551,6 +561,7 @@ private ModelState createStateForPosition(int position) {
 //                           display_name previousValue
 //                           signature_documentation java ModelState previousValue
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
+//                           kind Variable
 //                             ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateMap.
 //                                             ^^^ reference semanticdb maven jdk 11 java/util/Map#put().
 //                                                 ^^^^^ reference local 14
@@ -563,6 +574,7 @@ private ModelState createStateForPosition(int position) {
 //                         display_name previousPosition
 //                         signature_documentation java int previousPosition
 //                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
+//                         kind Variable
 //                           ^^^^^^^^^^^^^ reference local 15
 //                                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
       EpoxyModel<?> previousModel = adapter.getCurrentModels().get(previousPosition);
@@ -571,6 +583,7 @@ private ModelState createStateForPosition(int position) {
 //                                display_name previousModel
 //                                signature_documentation java EpoxyModel<?> previousModel
 //                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#createStateForPosition().
+//                                kind Variable
 //                                  ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#adapter.
 //                                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
 //                                                             ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -611,6 +624,7 @@ private void collectRemovals(UpdateOpHelper helper) {
 //                        display_name state
 //                        signature_documentation java ModelState state
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectRemovals().
+//                        kind Variable
 //                          ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
       // Update the position of the item to take into account previous removals,
       // so that future operations will reference the correct position
@@ -672,6 +686,7 @@ private void collectInsertions(UpdateOpHelper helper) {
 //                                       display_name oldItemIterator
 //                                       signature_documentation java Iterator<ModelState> oldItemIterator
 //                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
+//                                       kind Variable
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
 
@@ -681,6 +696,7 @@ private void collectInsertions(UpdateOpHelper helper) {
 //                               display_name itemToInsert
 //                               signature_documentation java ModelState itemToInsert
 //                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
+//                               kind Variable
 //                                 ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       if (itemToInsert.pair != null) {
 //        ^^^^^^^^^^^^ reference local 22
@@ -692,6 +708,7 @@ private void collectInsertions(UpdateOpHelper helper) {
 //                             display_name nextOldItem
 //                             signature_documentation java ModelState nextOldItem
 //                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectInsertions().
+//                             kind Variable
 //                               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
 //                                                   ^^^^^^^^^^^^^^^ reference local 21
         if (nextOldItem != null) {
@@ -733,6 +750,7 @@ private void collectChanges(UpdateOpHelper helper) {
 //                          display_name newItem
 //                          signature_documentation java ModelState newItem
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
+//                          kind Variable
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       ModelState previousItem = newItem.pair;
 //    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
@@ -740,6 +758,7 @@ private void collectChanges(UpdateOpHelper helper) {
 //                            display_name previousItem
 //                            signature_documentation java ModelState previousItem
 //                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
+//                            kind Variable
 //                              ^^^^^^^ reference local 25
 //                                      ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
       if (previousItem == null) {
@@ -754,6 +773,7 @@ private void collectChanges(UpdateOpHelper helper) {
 //                         display_name modelChanged
 //                         signature_documentation java boolean modelChanged
 //                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectChanges().
+//                         kind Variable
       if (immutableModels) {
 //        ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#immutableModels.
         // Make sure that the old model hasn't changed, otherwise comparing it with the new one
@@ -823,6 +843,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //                                       display_name oldItemIterator
 //                                       signature_documentation java Iterator<ModelState> oldItemIterator
 //                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
+//                                       kind Variable
 //                                         ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#oldStateList.
 //                                                      ^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#iterator().
     ModelState nextOldItem = null;
@@ -831,6 +852,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //                         display_name nextOldItem
 //                         signature_documentation java ModelState nextOldItem
 //                         enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
+//                         kind Variable
 
     for (ModelState newItem : currentStateList) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#
@@ -838,6 +860,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //                          display_name newItem
 //                          signature_documentation java ModelState newItem
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
+//                          kind Variable
 //                            ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffHelper#currentStateList.
       if (newItem.pair == null) {
 //        ^^^^^^^ reference local 31
@@ -929,6 +952,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //                          display_name newItemDistance
 //                          signature_documentation java int newItemDistance
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
+//                          kind Variable
 //                            ^^^^^^^ reference local 31
 //                                    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
 //                                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
@@ -939,6 +963,7 @@ private void collectMoves(UpdateOpHelper helper) {
 //                          display_name oldItemDistance
 //                          signature_documentation java int oldItemDistance
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#collectMoves().
+//                          kind Variable
 //                            ^^^^^^^^^^^ reference local 30
 //                                        ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#pair.
 //                                             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#position.
@@ -1037,6 +1062,7 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //           display_name size
 //           signature_documentation java int size
 //           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
+//           kind Variable
 //             ^^^^^^^ reference local 35
 //                     ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -1045,6 +1071,7 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
+//             kind Variable
 //               ^^^^ reference local 34
 //                    ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#lastMoveOp.
 //                                ^ reference local 37
@@ -1056,6 +1083,7 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //                    display_name moveOp
 //                    signature_documentation java UpdateOp moveOp
 //                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
+//                    kind Variable
 //                      ^^^^^^^ reference local 35
 //                              ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                  ^ reference local 37
@@ -1064,6 +1092,7 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //                     display_name fromPosition
 //                     signature_documentation java int fromPosition
 //                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
+//                     kind Variable
 //                       ^^^^^^ reference local 38
 //                              ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#positionStart.
       int toPosition = moveOp.itemCount;
@@ -1071,6 +1100,7 @@ private void updateItemPosition(ModelState item, List<UpdateOp> moveOps) {
 //                   display_name toPosition
 //                   signature_documentation java int toPosition
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#updateItemPosition().
+//                   kind Variable
 //                     ^^^^^^ reference local 38
 //                            ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#itemCount.
 
@@ -1127,6 +1157,7 @@ private ModelState getNextItemWithPair(Iterator<ModelState> iterator) {
 //                      display_name nextItem
 //                      signature_documentation java ModelState nextItem
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffHelper#getNextItemWithPair().
+//                      kind Variable
     while (nextItem == null && iterator.hasNext()) {
 //         ^^^^^^^^ reference local 42
 //                             ^^^^^^^^ reference local 41
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
index e1f3b96da..a429c0a52 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java
@@ -71,6 +71,7 @@ public class DiffPayload {
 //                 display_name modelCount
 //                 signature_documentation java int modelCount
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
+//                 kind Variable
 //                   ^^^^^^ reference local 0
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -96,6 +97,7 @@ public class DiffPayload {
 //                             display_name model
 //                             signature_documentation java EpoxyModel<?> model
 //                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#`<init>`().
+//                             kind Variable
 //                               ^^^^^^ reference local 0
         modelsById.put(model.id(), model);
 //      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
@@ -160,6 +162,7 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //                      display_name payload
 //                      signature_documentation java Object payload
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
+//                      kind Variable
 //                        ^^^^^^^^ reference local 4
       DiffPayload diffPayload = (DiffPayload) payload;
 //    ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
@@ -167,6 +170,7 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //                            display_name diffPayload
 //                            signature_documentation java DiffPayload diffPayload
 //                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
+//                            kind Variable
 //                               ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#
 //                                            ^^^^^^^ reference local 6
 
@@ -189,6 +193,7 @@ public static EpoxyModel<?> getModelFromPayload(List<Object> payloads, long mode
 //                               display_name modelForId
 //                               signature_documentation java EpoxyModel<?> modelForId
 //                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#getModelFromPayload().
+//                               kind Variable
 //                                 ^^^^^^^^^^^ reference local 7
 //                                             ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                                        ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
@@ -229,6 +234,7 @@ boolean equalsForTesting(DiffPayload that) {
 //               display_name thisSize
 //               signature_documentation java int thisSize
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
+//               kind Variable
 //                 ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                            ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
     int thatSize = that.modelsById.size();
@@ -236,6 +242,7 @@ boolean equalsForTesting(DiffPayload that) {
 //               display_name thatSize
 //               signature_documentation java int thatSize
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
+//               kind Variable
 //                 ^^^^ reference local 9
 //                      ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                 ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
@@ -251,6 +258,7 @@ boolean equalsForTesting(DiffPayload that) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
+//             kind Variable
 //                  ^ reference local 12
 //                      ^^^^^^^^ reference local 10
 //                                ^ reference local 12
@@ -259,6 +267,7 @@ boolean equalsForTesting(DiffPayload that) {
 //                 display_name thisKey
 //                 signature_documentation java long thisKey
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
+//                 kind Variable
 //                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                              ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#keyAt().
 //                                    ^ reference local 12
@@ -267,6 +276,7 @@ boolean equalsForTesting(DiffPayload that) {
 //                 display_name thatKey
 //                 signature_documentation java long thatKey
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
+//                 kind Variable
 //                   ^^^^ reference local 9
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                   ^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#keyAt().
@@ -284,6 +294,7 @@ boolean equalsForTesting(DiffPayload that) {
 //                            display_name thisModel
 //                            signature_documentation java EpoxyModel<?> thisModel
 //                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
+//                            kind Variable
 //                              ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                         ^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#valueAt().
 //                                                 ^ reference local 12
@@ -293,6 +304,7 @@ boolean equalsForTesting(DiffPayload that) {
 //                            display_name thatModel
 //                            signature_documentation java EpoxyModel<?> thatModel
 //                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/DiffPayload#equalsForTesting().
+//                            kind Variable
 //                              ^^^^ reference local 9
 //                                   ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/DiffPayload#modelsById.
 //                                              ^^^^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#valueAt().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
index ef10b2763..da1635792 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
@@ -146,6 +146,7 @@ EpoxyModel<?> getModelForPosition(int position) {
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getModelForPosition().
+//                      kind Variable
 //                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                               ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                   ^^^^^^^^ reference local 0
@@ -234,6 +235,7 @@ protected void notifyModelChanged(EpoxyModel<?> model, @Nullable Object payload)
 //            display_name index
 //            signature_documentation java int index
 //            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#notifyModelChanged(+1).
+//            kind Variable
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 3
     if (index != -1) {
@@ -264,6 +266,7 @@ protected void addModel(EpoxyModel<?> modelToAdd) {
 //                  display_name initialSize
 //                  signature_documentation java int initialSize
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModel().
+//                  kind Variable
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -302,6 +305,7 @@ protected void addModels(EpoxyModel<?>... modelsToAdd) {
 //                  display_name initialSize
 //                  signature_documentation java int initialSize
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
+//                  kind Variable
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     int numModelsToAdd = modelsToAdd.length;
@@ -309,6 +313,7 @@ protected void addModels(EpoxyModel<?>... modelsToAdd) {
 //                     display_name numModelsToAdd
 //                     signature_documentation java int numModelsToAdd
 //                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels().
+//                     kind Variable
 //                       ^^^^^^^^^^^ reference local 8
 //                                   ^^^^^^ reference semanticdb maven . . Array#length.
 
@@ -357,6 +362,7 @@ protected void addModels(Collection<? extends EpoxyModel<?>> modelsToAdd) {
 //                  display_name initialSize
 //                  signature_documentation java int initialSize
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#addModels(+1).
+//                  kind Variable
 //                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                           ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -402,6 +408,7 @@ protected void insertModelBefore(EpoxyModel<?> modelToInsert, EpoxyModel<?> mode
 //                  display_name targetIndex
 //                  signature_documentation java int targetIndex
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelBefore().
+//                  kind Variable
 //                    ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                                     ^^^^^^^^^^^^^^^^^^^ reference local 14
     if (targetIndex == -1) {
@@ -452,6 +459,7 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
 //                 display_name modelIndex
 //                 signature_documentation java int modelIndex
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
+//                 kind Variable
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                                    ^^^^^^^^^^^^^^^^^^ reference local 17
     if (modelIndex == -1) {
@@ -466,6 +474,7 @@ protected void insertModelAfter(EpoxyModel<?> modelToInsert, EpoxyModel<?> model
 //                  display_name targetIndex
 //                  signature_documentation java int targetIndex
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#insertModelAfter().
+//                  kind Variable
 //                    ^^^^^^^^^^ reference local 18
     pauseModelListNotifications();
 //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#pauseModelListNotifications().
@@ -503,6 +512,7 @@ protected void removeModel(EpoxyModel<?> model) {
 //            display_name index
 //            signature_documentation java int index
 //            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeModel().
+//            kind Variable
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 20
     if (index != -1) {
@@ -537,6 +547,7 @@ protected void removeAllModels() {
 //                       display_name numModelsRemoved
 //                       signature_documentation java int numModelsRemoved
 //                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllModels().
+//                       kind Variable
 //                         ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -577,6 +588,7 @@ protected void removeAllAfterModel(EpoxyModel<?> model) {
 //                                     display_name modelsToRemove
 //                                     signature_documentation java List<EpoxyModel<?>> modelsToRemove
 //                                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
+//                                     kind Variable
 //                                       ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
 //                                                         ^^^^^ reference local 23
     int numModelsRemoved = modelsToRemove.size();
@@ -584,6 +596,7 @@ protected void removeAllAfterModel(EpoxyModel<?> model) {
 //                       display_name numModelsRemoved
 //                       signature_documentation java int numModelsRemoved
 //                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
+//                       kind Variable
 //                         ^^^^^^^^^^^^^^ reference local 24
 //                                        ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     int initialModelCount = models.size();
@@ -591,6 +604,7 @@ protected void removeAllAfterModel(EpoxyModel<?> model) {
 //                        display_name initialModelCount
 //                        signature_documentation java int initialModelCount
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#removeAllAfterModel().
+//                        kind Variable
 //                          ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#models.
 //                                 ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -779,6 +793,7 @@ protected void showModels(Iterable<EpoxyModel<?>> models, boolean show) {
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
+//                           kind Variable
 //                             ^^^^^^ reference local 34
       showModel(model, show);
 //    ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#showModel().
@@ -905,6 +920,7 @@ protected List<EpoxyModel<?>> getAllModelsAfter(EpoxyModel<?> model) {
 //            display_name index
 //            signature_documentation java int index
 //            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAdapter#getAllModelsAfter().
+//            kind Variable
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition().
 //                               ^^^^^ reference local 41
     if (index == -1) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
index 996c80779..dfc62c92d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java
@@ -206,6 +206,7 @@ public static Looper buildBackgroundLooper(String threadName) {
 //                              display_name handlerThread
 //                              signature_documentation java unresolved_type handlerThread
 //                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyAsyncUtil#buildBackgroundLooper().
+//                              kind Variable
 //                                                  ^^^^^^^^^^ reference local 3
     handlerThread.start();
 //  ^^^^^^^^^^^^^ reference local 4
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
index 6918e374e..04f934c12 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
@@ -720,6 +720,7 @@ private int getExpectedModelCount() {
 //                        display_name currentModelCount
 //                        signature_documentation java int currentModelCount
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#getExpectedModelCount().
+//                        kind Variable
 //                          ^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#adapter.
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount().
     return currentModelCount != 0 ? currentModelCount : 25;
@@ -770,6 +771,7 @@ int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
 //           display_name size
 //           signature_documentation java int size
 //           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList().
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                              ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
     for (int i = 0; i < size; i++) {
@@ -777,6 +779,7 @@ int getFirstIndexOfModelInBuildingList(EpoxyModel<?> model) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList().
+//             kind Variable
 //                  ^ reference local 11
 //                      ^^^^ reference local 10
 //                            ^ reference local 11
@@ -811,11 +814,13 @@ boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
 //                 display_name modelCount
 //                 signature_documentation java int modelCount
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
+//                 kind Variable
     int size = modelsBeingBuilt.size();
 //      ^^^^ definition local 14
 //           display_name size
 //           signature_documentation java int size
 //           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
 //                              ^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#size().
     for (int i = 0; i < size; i++) {
@@ -823,6 +828,7 @@ boolean isModelAddedMultipleTimes(EpoxyModel<?> model) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes().
+//             kind Variable
 //                  ^ reference local 15
 //                      ^^^^ reference local 14
 //                            ^ reference local 15
@@ -914,6 +920,7 @@ private void runInterceptors() {
 //                                             display_name callback
 //                                             signature_documentation java ModelInterceptorCallback callback
 //                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
+//                                             kind Variable
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
           callback.onInterceptorsStarted(this);
 //        ^^^^^^^^ reference local 19
@@ -931,6 +938,7 @@ private void runInterceptors() {
 //                                 display_name interceptor
 //                                 signature_documentation java Interceptor interceptor
 //                                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
+//                                 kind Variable
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#interceptors.
         interceptor.intercept(modelsBeingBuilt);
 //      ^^^^^^^^^^^ reference local 20
@@ -950,6 +958,7 @@ private void runInterceptors() {
 //                                             display_name callback
 //                                             signature_documentation java ModelInterceptorCallback callback
 //                                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#runInterceptors().
+//                                             kind Variable
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#modelInterceptorCallbacks.
           callback.onInterceptorsFinished(this);
 //        ^^^^^^^^ reference local 21
@@ -1138,6 +1147,7 @@ protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+1).
+//                           kind Variable
 //                             ^^^^^^^^^^^ reference local 26
       add(model);
 //    ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
@@ -1176,6 +1186,7 @@ protected void add(@NonNull List<? extends EpoxyModel<?>> modelsToAdd) {
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#add(+2).
+//                           kind Variable
 //                             ^^^^^^^^^^^ reference local 28
       add(model);
 //    ^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#add().
@@ -1340,6 +1351,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                     display_name modelIds
 //                     signature_documentation java Set<Long> modelIds
 //                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
+//                     kind Variable
 //                           ^^^^^^^ reference semanticdb maven jdk 11 java/util/HashSet#`<init>`(+3).
 //                                     ^^^^^^ reference local 33
 //                                            ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -1351,6 +1363,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                                            display_name modelIterator
 //                                            signature_documentation java ListIterator<EpoxyModel<?>> modelIterator
 //                                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
+//                                            kind Variable
 //                                              ^^^^^^ reference local 33
 //                                                     ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/List#listIterator().
     while (modelIterator.hasNext()) {
@@ -1362,6 +1375,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                        display_name model
 //                        signature_documentation java EpoxyModel<?> model
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
+//                        kind Variable
 //                          ^^^^^^^^^^^^^ reference local 35
 //                                        ^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#next().
       if (!modelIds.add(model.id())) {
@@ -1374,6 +1388,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                           display_name indexOfDuplicate
 //                           signature_documentation java int indexOfDuplicate
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
+//                           kind Variable
 //                             ^^^^^^^^^^^^^ reference local 35
 //                                           ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         modelIterator.remove();
@@ -1385,6 +1400,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                          display_name indexOfOriginal
 //                          signature_documentation java int indexOfOriginal
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
+//                          kind Variable
 //                            ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
 //                                                    ^^^^^^ reference local 33
 //                                                            ^^^^^ reference local 36
@@ -1394,6 +1410,7 @@ private void filterDuplicatesIfNeeded(List<EpoxyModel<?>> models) {
 //                                  display_name originalModel
 //                                  signature_documentation java EpoxyModel<?> originalModel
 //                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#filterDuplicatesIfNeeded().
+//                                  kind Variable
 //                                    ^^^^^^ reference local 33
 //                                           ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                               ^^^^^^^^^^^^^^^ reference local 38
@@ -1445,6 +1462,7 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
 //           display_name size
 //           signature_documentation java int size
 //           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
+//           kind Variable
 //             ^^^^^^ reference local 40
 //                    ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
@@ -1452,6 +1470,7 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
+//             kind Variable
 //                  ^ reference local 43
 //                      ^^^^ reference local 42
 //                            ^ reference local 43
@@ -1461,6 +1480,7 @@ private int findPositionOfDuplicate(List<EpoxyModel<?>> models, EpoxyModel<?> du
 //                        display_name model
 //                        signature_documentation java EpoxyModel<?> model
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyController#findPositionOfDuplicate().
+//                        kind Variable
 //                          ^^^^^^ reference local 40
 //                                 ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                     ^ reference local 43
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
index aa511b003..106a0c057 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
@@ -213,6 +213,7 @@ void setModels(@NonNull ControllerModelList models) {
 //                                              display_name currentModels
 //                                              signature_documentation java List<? extends EpoxyModel<?>> currentModels
 //                                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
+//                                              kind Variable
 //                                                ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
     if (!currentModels.isEmpty() && currentModels.get(0).isDebugValidationEnabled()) {
 //       ^^^^^^^^^^^^^ reference local 4
@@ -225,6 +226,7 @@ void setModels(@NonNull ControllerModelList models) {
 //               display_name i
 //               signature_documentation java int i
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
+//               kind Variable
 //                    ^ reference local 5
 //                        ^^^^^^^^^^^^^ reference local 4
 //                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
@@ -235,6 +237,7 @@ void setModels(@NonNull ControllerModelList models) {
 //                          display_name model
 //                          signature_documentation java EpoxyModel<?> model
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#setModels().
+//                          kind Variable
 //                            ^^^^^^^^^^^^^ reference local 4
 //                                          ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                              ^ reference local 5
@@ -303,6 +306,7 @@ public void onResult(@NonNull DiffResult result) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#onResult().
+//             kind Variable
 //               ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#modelBuildListeners.
 //                                   ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 //                                               ^ reference local 8
@@ -589,6 +593,7 @@ public EpoxyModel<?> getModelById(long id) {
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelById().
+//                           kind Variable
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
       if (model.id() == id) {
 //        ^^^^^ reference local 23
@@ -621,6 +626,7 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //           display_name size
 //           signature_documentation java int size
 //           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
+//           kind Variable
 //             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
     for (int i = 0; i < size; i++) {
@@ -628,6 +634,7 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
+//             kind Variable
 //                  ^ reference local 26
 //                      ^^^^ reference local 25
 //                            ^ reference local 26
@@ -637,6 +644,7 @@ public int getModelPosition(@NonNull EpoxyModel<?> targetModel) {
 //                        display_name model
 //                        signature_documentation java EpoxyModel<?> model
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition().
+//                        kind Variable
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 //                                             ^^^ reference semanticdb maven jdk 11 java/util/List#get().
 //                                                 ^ reference local 26
@@ -691,6 +699,7 @@ void moveModel(int fromPosition, int toPosition) {
 //                                       display_name updatedList
 //                                       signature_documentation java ArrayList<EpoxyModel<?>> updatedList
 //                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
+//                                       kind Variable
 //                                             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+2).
 //                                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 
@@ -717,6 +726,7 @@ void moveModel(int fromPosition, int toPosition) {
 //                          display_name interruptedDiff
 //                          signature_documentation java boolean interruptedDiff
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#moveModel().
+//                          kind Variable
 //                            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                                     ^^^^^^^^^^^ reference local 30
@@ -749,6 +759,7 @@ void notifyModelChanged(int position) {
 //                                       display_name updatedList
 //                                       signature_documentation java ArrayList<EpoxyModel<?>> updatedList
 //                                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged().
+//                                       kind Variable
 //                                             ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`(+2).
 //                                                         ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels().
 
@@ -767,6 +778,7 @@ void notifyModelChanged(int position) {
 //                          display_name interruptedDiff
 //                          signature_documentation java boolean interruptedDiff
 //                          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged().
+//                          kind Variable
 //                            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyControllerAdapter#differ.
 //                                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride().
 //                                                     ^^^^^^^^^^^ reference local 33
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
index f587a2c95..731b8ef49 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
@@ -204,6 +204,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //               display_name position
 //               signature_documentation java int position
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//               kind Variable
 //                 ^^^^^^ reference local 4
 //                        ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getChildAdapterPosition#
 //                                                ^^^^ reference local 3
@@ -222,6 +223,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //                                    display_name layout
 //                                    signature_documentation java unresolved_type layout
 //                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//                                    kind Variable
 //                                      ^^^^^^ reference local 4
 //                                             ^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getLayoutManager#
     calculatePositionDetails(parent, position, layout);
@@ -235,24 +237,28 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //               display_name left
 //               signature_documentation java boolean left
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//               kind Variable
 //                 ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useLeftPadding().
     boolean right = useRightPadding();
 //          ^^^^^ definition local 9
 //                display_name right
 //                signature_documentation java boolean right
 //                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//                kind Variable
 //                  ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useRightPadding().
     boolean top = useTopPadding();
 //          ^^^ definition local 10
 //              display_name top
 //              signature_documentation java boolean top
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//              kind Variable
 //                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useTopPadding().
     boolean bottom = useBottomPadding();
 //          ^^^^^^ definition local 11
 //                 display_name bottom
 //                 signature_documentation java boolean bottom
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//                 kind Variable
 //                   ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#useBottomPadding().
 
     if (shouldReverseLayout(layout, horizontallyScrolling)) {
@@ -266,6 +272,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //                   display_name temp
 //                   signature_documentation java boolean temp
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//                   kind Variable
 //                     ^^^^ reference local 8
         left = right;
 //      ^^^^ reference local 8
@@ -279,6 +286,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //                   display_name temp
 //                   signature_documentation java boolean temp
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//                   kind Variable
 //                     ^^^ reference local 10
         top = bottom;
 //      ^^^ reference local 10
@@ -296,6 +304,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State s
 //              display_name padding
 //              signature_documentation java int padding
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets().
+//              kind Variable
 //                ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
     outRect.right = right ? padding : 0;
 //  ^^^^^^^ reference local 2
@@ -343,6 +352,7 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                display_name itemCount
 //                signature_documentation java int itemCount
 //                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
+//                kind Variable
 //                  ^^^^^^ reference local 15
 //                         ^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getAdapter#
 //                                      ^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#getAdapter#getItemCount#
@@ -374,6 +384,7 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                           display_name grid
 //                           signature_documentation java unresolved_type grid
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
+//                           kind Variable
 //                              ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#
 //                                                 ^^^^^^ reference local 17
       final SpanSizeLookup spanSizeLookup = grid.getSpanSizeLookup();
@@ -382,6 +393,7 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                                        display_name spanSizeLookup
 //                                        signature_documentation java final unresolved_type spanSizeLookup
 //                                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
+//                                        kind Variable
 //                                          ^^^^ reference local 19
 //                                               ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#getSpanSizeLookup#
       int spanSize = spanSizeLookup.getSpanSize(position);
@@ -389,6 +401,7 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                 display_name spanSize
 //                 signature_documentation java int spanSize
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
+//                 kind Variable
 //                   ^^^^^^^^^^^^^^ reference local 20
 //                                  ^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#getSpanSize#
 //                                              ^^^^^^^^ reference local 16
@@ -397,6 +410,7 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                  display_name spanCount
 //                  signature_documentation java int spanCount
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
+//                  kind Variable
 //                    ^^^^ reference local 19
 //                         ^^^^^^^^^^^^ reference semanticdb maven . . GridLayoutManager#getSpanCount#
       int spanIndex = spanSizeLookup.getSpanIndex(position, spanCount);
@@ -404,6 +418,7 @@ private void calculatePositionDetails(RecyclerView parent, int position, LayoutM
 //                  display_name spanIndex
 //                  signature_documentation java int spanIndex
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#calculatePositionDetails().
+//                  kind Variable
 //                    ^^^^^^^^^^^^^^ reference local 20
 //                                   ^^^^^^^^^^^^ reference semanticdb maven . . SpanSizeLookup#getSpanIndex#
 //                                                ^^^^^^^^ reference local 16
@@ -453,6 +468,7 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
 //                        display_name reverseLayout
 //                        signature_documentation java boolean reverseLayout
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
+//                        kind Variable
         layout instanceof LinearLayoutManager && ((LinearLayoutManager) layout).getReverseLayout();
 //      ^^^^^^ reference local 24
 //                        ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . LinearLayoutManager#
@@ -464,6 +480,7 @@ private static boolean shouldReverseLayout(LayoutManager layout, boolean horizon
 //              display_name rtl
 //              signature_documentation java boolean rtl
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#shouldReverseLayout().
+//              kind Variable
 //                ^^^^^^ reference local 24
 //                       ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . LayoutManager#getLayoutDirection#
 //                                               ^^^^^^^^^^ reference semanticdb maven . . ViewCompat#
@@ -584,11 +601,13 @@ private static boolean isInFirstRow(int position, SpanSizeLookup spanSizeLookup,
 //                display_name totalSpan
 //                signature_documentation java int totalSpan
 //                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
+//                kind Variable
     for (int i = 0; i <= position; i++) {
 //           ^ definition local 32
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInFirstRow().
+//             kind Variable
 //                  ^ reference local 32
 //                       ^^^^^^^^ reference local 28
 //                                 ^ reference local 32
@@ -635,11 +654,13 @@ private static boolean isInLastRow(int position, int itemCount, SpanSizeLookup s
 //                display_name totalSpan
 //                signature_documentation java int totalSpan
 //                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
+//                kind Variable
     for (int i = itemCount - 1; i >= position; i--) {
 //           ^ definition local 38
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyItemSpacingDecorator#isInLastRow().
+//             kind Variable
 //               ^^^^^^^^^ reference local 34
 //                              ^ reference local 38
 //                                   ^^^^^^^^ reference local 33
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
index 97fedeeb0..34b333f1b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
@@ -537,6 +537,7 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //              display_name result
 //              signature_documentation java long result
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+2).
+//              kind Variable
     if (ids != null) {
 //      ^^^ reference local 16
       for (@Nullable Number id : ids) {
@@ -546,6 +547,7 @@ public EpoxyModel<T> id(@Nullable Number... ids) {
 //                             display_name id
 //                             signature_documentation java @Nullable\nNumber id
 //                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+2).
+//                             kind Variable
 //                               ^^^ reference local 16
         result = 31 * result + hashLong64Bit(id == null ? 0 : id.hashCode());
 //      ^^^^^^ reference local 17
@@ -588,6 +590,7 @@ public EpoxyModel<T> id(long id1, long id2) {
 //              display_name result
 //              signature_documentation java long result
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+3).
+//              kind Variable
 //                ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashLong64Bit().
 //                              ^^^ reference local 19
     result = 31 * result + hashLong64Bit(id2);
@@ -663,6 +666,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
 //              display_name result
 //              signature_documentation java long result
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
+//              kind Variable
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                ^^^ reference local 23
     if (otherKeys != null) {
@@ -673,6 +677,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... ot
 //                               display_name otherKey
 //                               signature_documentation java CharSequence otherKey
 //                               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+5).
+//                               kind Variable
 //                                 ^^^^^^^^^ reference local 24
         result = 31 * result + hashString64Bit(otherKey);
 //      ^^^^^^ reference local 25
@@ -721,6 +726,7 @@ public EpoxyModel<T> id(@Nullable CharSequence key, long id) {
 //              display_name result
 //              signature_documentation java long result
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id(+6).
+//              kind Variable
 //                ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
 //                                ^^^ reference local 27
     result = 31 * result + hashLong64Bit(id);
@@ -1176,6 +1182,7 @@ public boolean equals(Object o) {
 //                     display_name that
 //                     signature_documentation java EpoxyModel<?> that
 //                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#equals().
+//                     kind Variable
 //                        ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                                       ^ reference local 46
 
@@ -1212,6 +1219,7 @@ public int hashCode() {
 //             display_name result
 //             signature_documentation java int result
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
+//             kind Variable
 //                      ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
 //                            ^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#id.
     result = 31 * result + getViewType();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
index 484579d1a..bf981263b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
@@ -232,12 +232,14 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List<EpoxyModel<?>> models) {
 //                    display_name saveState
 //                    signature_documentation java boolean saveState
 //                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
+//                    kind Variable
     for (EpoxyModel<?> model : models) {
 //       ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#
 //                     ^^^^^ definition local 7
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
+//                           kind Variable
 //                             ^^^^^^ reference local 5
       if (model.shouldSaveViewState()) {
 //        ^^^^^ reference local 7
@@ -473,6 +475,7 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
 //                                      display_name previousGroup
 //                                      signature_documentation java final EpoxyModelGroup previousGroup
 //                                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#bind(+2).
+//                                      kind Variable
 //                                         ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                                                          ^^^^^^^^^^^^^^^^^^^^ reference local 24
 
@@ -519,6 +522,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex
 //                                    display_name previousModel
 //                                    signature_documentation java EpoxyModel<?> previousModel
 //                                    enclosing_symbol local 27
+//                                    kind Variable
 //                                      ^^^^^^^^^^^^^ reference local 25
 //                                                    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                                                           ^^^ reference semanticdb maven jdk 11 java/util/List#get().
@@ -736,6 +740,7 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba
 //                 display_name modelCount
 //                 signature_documentation java int modelCount
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
+//                 kind Variable
 //                   ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#models.
 //                          ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
 
@@ -744,6 +749,7 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
+//             kind Variable
 //                  ^ reference local 50
 //                      ^^^^^^^^^^ reference local 49
 //                                  ^ reference local 50
@@ -952,6 +958,7 @@ public boolean equals(Object o) {
 //                       display_name that
 //                       signature_documentation java EpoxyModelGroup that
 //                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#equals().
+//                       kind Variable
 //                          ^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#
 //                                           ^ reference local 61
 
@@ -976,6 +983,7 @@ public int hashCode() {
 //             display_name result
 //             signature_documentation java int result
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#hashCode().
+//             kind Variable
 //               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelGroup#super.
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
     result = 31 * result + models.hashCode();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
index f8ae67343..bfb581aad 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
@@ -144,6 +144,7 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
+//                      kind Variable
 //                        ^^^^^^^^^^ reference local 3
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
 
@@ -155,6 +156,7 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo
 //                                display_name isOtherCallbackActive
 //                                signature_documentation java boolean isOtherCallbackActive
 //                                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags().
+//                                kind Variable
         holderBeingDragged == null
 //      ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#holderBeingDragged.
             && holderBeingSwiped == null
@@ -265,6 +267,7 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                   display_name fromPosition
 //                   signature_documentation java int fromPosition
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
+//                   kind Variable
 //                     ^^^^^^^^^^ reference local 11
 //                                ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     int toPosition = target.getAdapterPosition();
@@ -272,6 +275,7 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                 display_name toPosition
 //                 signature_documentation java int toPosition
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
+//                 kind Variable
 //                   ^^^^^^ reference local 12
 //                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     controller.moveModel(fromPosition, toPosition);
@@ -286,6 +290,7 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder,
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onMove().
+//                      kind Variable
 //                        ^^^^^^^^^^ reference local 11
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     if (!isTouchableModel(model)) {
@@ -362,6 +367,7 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
+//                      kind Variable
 //                        ^^^^^^^^^^ reference local 20
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     View view = viewHolder.itemView;
@@ -370,6 +376,7 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 //            display_name view
 //            signature_documentation java unresolved_type view
 //            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
+//            kind Variable
 //              ^^^^^^^^^^ reference local 20
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#itemView#
     int position = viewHolder.getAdapterPosition();
@@ -377,6 +384,7 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) {
 //               display_name position
 //               signature_documentation java int position
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped().
+//               kind Variable
 //                 ^^^^^^^^^^ reference local 20
 //                            ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
 
@@ -461,6 +469,7 @@ protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actio
 //                        display_name model
 //                        signature_documentation java EpoxyModel<?> model
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged().
+//                        kind Variable
 //                          ^^^^^^^^^^ reference local 29
 //                                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
       if (!isTouchableModel(model)) {
@@ -829,6 +838,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //                      display_name model
 //                      signature_documentation java EpoxyModel<?> model
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
+//                      kind Variable
 //                        ^^^^^^^^^^ reference local 53
 //                                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getModel().
     if (!isTouchableModel(model)) {
@@ -847,6 +857,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //                display_name itemView
 //                signature_documentation java unresolved_type itemView
 //                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
+//                kind Variable
 //                  ^^^^^^^^^^ reference local 53
 //                             ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#itemView#
 
@@ -855,6 +866,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //                      display_name swipeProgress
 //                      signature_documentation java float swipeProgress
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
+//                      kind Variable
     if (Math.abs(dX) > Math.abs(dY)) {
 //      ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
 //           ^^^ reference semanticdb maven jdk 11 java/lang/Math#abs(+2).
@@ -881,6 +893,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder
 //                        display_name clampedProgress
 //                        signature_documentation java float clampedProgress
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw().
+//                        kind Variable
 //                          ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
 //                               ^^^ reference semanticdb maven jdk 11 java/lang/Math#max(+2).
 //                                        ^^^^ reference semanticdb maven jdk 11 java/lang/Math#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
index 24d9215e8..013dd7c95 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
@@ -358,6 +358,7 @@ public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelCla
 //                                                    display_name targetClasses
 //                                                    signature_documentation java List<Class<? extends EpoxyModel>> targetClasses
 //                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTarget().
+//                                                    kind Variable
 //                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
       targetClasses.add(targetModelClass);
 //    ^^^^^^^^^^^^^ reference local 10
@@ -557,6 +558,7 @@ public ItemTouchHelper andCallbacks(final DragCallbacks<U> callbacks) {
 //                                    display_name itemTouchHelper
 //                                    signature_documentation java unresolved_type itemTouchHelper
 //                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#andCallbacks().
+//                                    kind Variable
           new ItemTouchHelper(new EpoxyModelTouchCallback<U>(controller, targetModelClass) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
 //                                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U]
@@ -604,6 +606,7 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                                 display_name isTargetType
 //                                 signature_documentation java boolean isTargetType
 //                                 enclosing_symbol local 26
+//                                 kind Variable
 //                                   ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClasses.
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
                   ? super.isTouchableModel(model)
@@ -1120,6 +1123,7 @@ public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelCl
 //                                                    display_name targetClasses
 //                                                    signature_documentation java List<Class<? extends EpoxyModel>> targetClasses
 //                                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTarget().
+//                                                    kind Variable
 //                                                          ^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#`<init>`().
       targetClasses.add(targetModelClass);
 //    ^^^^^^^^^^^^^ reference local 65
@@ -1303,6 +1307,7 @@ public ItemTouchHelper andCallbacks(final SwipeCallbacks<U> callbacks) {
 //                                    display_name itemTouchHelper
 //                                    signature_documentation java unresolved_type itemTouchHelper
 //                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#andCallbacks().
+//                                    kind Variable
           new ItemTouchHelper(new EpoxyModelTouchCallback<U>(null, targetModelClass) {
 //                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModelTouchCallback#
 //                                                        ^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U]
@@ -1349,6 +1354,7 @@ protected boolean isTouchableModel(EpoxyModel<?> model) {
 //                                 display_name isTargetType
 //                                 signature_documentation java boolean isTargetType
 //                                 enclosing_symbol local 80
+//                                 kind Variable
 //                                   ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClasses.
 //                                                      ^^^^ reference semanticdb maven jdk 11 java/util/List#size().
                   ? super.isTouchableModel(model)
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
index a1b64b9d6..b3a52c665 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java
@@ -83,11 +83,13 @@ public static long hashString64Bit(@Nullable CharSequence str) {
 //              display_name result
 //              signature_documentation java long result
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
+//              kind Variable
     final int len = str.length();
 //            ^^^ definition local 3
 //                display_name len
 //                signature_documentation java final int len
 //                enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
+//                kind Variable
 //                  ^^^ reference local 1
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     for (int i = 0; i < len; i++) {
@@ -95,6 +97,7 @@ public static long hashString64Bit(@Nullable CharSequence str) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/IdUtils#hashString64Bit().
+//             kind Variable
 //                  ^ reference local 4
 //                      ^^^ reference local 3
 //                           ^ reference local 4
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
index 0e6dc227f..7d7ddb6e1 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java
@@ -54,6 +54,7 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
 //                            display_name recyclerView
 //                            signature_documentation java unresolved_type recyclerView
 //                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
+//                            kind Variable
 //                              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
 //                                                     ^ reference local 0
     if (recyclerView == null) {
@@ -67,6 +68,7 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) {
 //                        display_name viewHolder
 //                        signature_documentation java unresolved_type viewHolder
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
+//                        kind Variable
 //                          ^^^^^^^^^^^^ reference local 1
 //                                       ^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . RecyclerView#findContainingViewHolder#
 //                                                                ^ reference local 0
@@ -111,6 +113,7 @@ private static RecyclerView findParentRecyclerView(@Nullable View v) {
 //                    display_name parent
 //                    signature_documentation java unresolved_type parent
 //                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ListenersUtils#findParentRecyclerView().
+//                    kind Variable
 //                      ^ reference local 3
 //                        ^^^^^^^^^ reference semanticdb maven . . View#getParent#
     if (parent instanceof RecyclerView) {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
index 520f4b0e5..ead85d29d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
@@ -245,6 +245,7 @@ public EpoxyModel<?> set(int index, EpoxyModel<?> element) {
 //                              display_name previousModel
 //                              signature_documentation java EpoxyModel<?> previousModel
 //                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#set().
+//                              kind Variable
 //                                ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#super.
 //                                      ^^^ reference semanticdb maven jdk 11 java/util/ArrayList#set().
 //                                          ^^^^^ reference local 10
@@ -427,6 +428,7 @@ public boolean remove(Object o) {
 //            display_name index
 //            signature_documentation java int index
 //            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#remove(+1).
+//            kind Variable
 //              ^^^^^^^ reference semanticdb maven jdk 11 java/util/ArrayList#indexOf().
 //                      ^ reference local 20
 
@@ -527,12 +529,14 @@ public boolean removeAll(Collection<?> collection) {
 //                 display_name result
 //                 signature_documentation java boolean result
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#removeAll().
+//                 kind Variable
     Iterator<?> it = iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //              ^^ definition local 26
 //                 display_name it
 //                 signature_documentation java Iterator<?> it
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#removeAll().
+//                 kind Variable
 //                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
     while (it.hasNext()) {
 //         ^^ reference local 26
@@ -577,12 +581,14 @@ public boolean retainAll(Collection<?> collection) {
 //                 display_name result
 //                 signature_documentation java boolean result
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#retainAll().
+//                 kind Variable
     Iterator<?> it = iterator();
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Iterator#
 //              ^^ definition local 29
 //                 display_name it
 //                 signature_documentation java Iterator<?> it
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#retainAll().
+//                 kind Variable
 //                   ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#iterator().
     while (it.hasNext()) {
 //         ^^ reference local 29
@@ -687,6 +693,7 @@ public EpoxyModel<?> next() {
 //          display_name i
 //          signature_documentation java int i
 //          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#next().
+//          kind Variable
 //            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
       cursor = i + 1;
 //    ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
@@ -873,6 +880,7 @@ public EpoxyModel<?> previous() {
 //          display_name i
 //          signature_documentation java int i
 //          enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#previous().
+//          kind Variable
 //            ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
       if (i < 0) {
 //        ^ reference local 34
@@ -950,6 +958,7 @@ public void add(EpoxyModel<?> e) {
 //            display_name i
 //            signature_documentation java int i
 //            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#ListItr#add().
+//            kind Variable
 //              ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#Itr#cursor.
         ModelList.this.add(i, e);
 //      ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#
@@ -1235,6 +1244,7 @@ public int previousIndex() {
 //                   display_name previous
 //                   signature_documentation java int previous
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#previousIndex().
+//                   kind Variable
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#SubListIterator#iterator.
 //                              ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/ListIterator#previousIndex().
         if (previous >= start) {
@@ -1396,6 +1406,7 @@ public boolean addAll(int location, Collection<? extends EpoxyModel<?>> collecti
 //                       display_name result
 //                       signature_documentation java boolean result
 //                       enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll().
+//                       kind Variable
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                  ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                                         ^^^^^^^^ reference local 54
@@ -1448,6 +1459,7 @@ public boolean addAll(@NonNull Collection<? extends EpoxyModel<?>> collection) {
 //                     display_name result
 //                     signature_documentation java boolean result
 //                     enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#addAll(+1).
+//                     kind Variable
 //                       ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#addAll(+1).
 //                                       ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#offset.
@@ -1595,6 +1607,7 @@ public EpoxyModel<?> remove(int location) {
 //                             display_name result
 //                             signature_documentation java EpoxyModel<?> result
 //                             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#remove().
+//                             kind Variable
 //                               ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#SubList#fullList.
 //                                        ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelList#remove().
 //                                               ^^^^^^^^ reference local 61
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
index df9858ef7..0d801d62d 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java
@@ -86,6 +86,7 @@ static ModelState build(EpoxyModel<?> model, int position, boolean immutableMode
 //                   display_name state
 //                   signature_documentation java ModelState state
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ModelState#build().
+//                   kind Variable
 //                         ^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ModelState#`<init>`().
 
     state.lastMoveOp = 0;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
index 0ce6c8a3e..cf9fb8c8c 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java
@@ -187,6 +187,7 @@ public boolean equals(Object o) {
 //                                  display_name that
 //                                  signature_documentation java QuantityStringResAttribute that
 //                                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#equals().
+//                                  kind Variable
 //                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#
 //                                                                 ^ reference local 6
 
@@ -224,6 +225,7 @@ public int hashCode() {
 //             display_name result
 //             signature_documentation java int result
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#hashCode().
+//             kind Variable
 //               ^^ reference semanticdb maven . . com/airbnb/epoxy/QuantityStringResAttribute#id.
     result = 31 * result + quantity;
 //  ^^^^^^ reference local 8
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
index b8cede93f..90b3fbf72 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java
@@ -228,6 +228,7 @@ public boolean equals(Object o) {
 //                        display_name that
 //                        signature_documentation java SimpleEpoxyModel that
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#equals().
+//                        kind Variable
 //                           ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#
 //                                             ^ reference local 8
 
@@ -268,6 +269,7 @@ public int hashCode() {
 //             display_name result
 //             signature_documentation java int result
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#hashCode().
+//             kind Variable
 //               ^^^^^ reference semanticdb maven . . com/airbnb/epoxy/SimpleEpoxyModel#super.
 //                     ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#hashCode().
     result = 31 * result + layoutRes;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
index bad334f8d..324a3b178 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java
@@ -352,6 +352,7 @@ public boolean equals(Object o) {
 //                           display_name that
 //                           signature_documentation java StringAttributeData that
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#equals().
+//                           kind Variable
 //                              ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#
 //                                                   ^ reference local 10
 
@@ -405,6 +406,7 @@ public int hashCode() {
 //             display_name result
 //             signature_documentation java int result
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/StringAttributeData#hashCode().
+//             kind Variable
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/StringAttributeData#string.
 //                                       ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#hashCode().
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
index b28f2ebfb..afb6e55bb 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
@@ -137,6 +137,7 @@ static UpdateOp instance(@Type int type, int positionStart, int itemCount,
 //              display_name op
 //              signature_documentation java UpdateOp op
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
+//              kind Variable
 //                    ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#`<init>`().
 
     op.type = type;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
index bbe733a9f..8c5dfe608 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java
@@ -161,6 +161,7 @@ void add(int startPosition, int itemCount) {
 //                        display_name batchWithLast
 //                        signature_documentation java boolean batchWithLast
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#add(+1).
+//                        kind Variable
 //                          ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //                                   ^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#ADD.
         && (lastOp.contains(startPosition) || lastOp.positionEnd() == startPosition);
@@ -300,6 +301,7 @@ void remove(int startPosition, int itemCount) {
 //                        display_name batchWithLast
 //                        signature_documentation java boolean batchWithLast
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#remove(+1).
+//                        kind Variable
     if (isLastOp(REMOVE)) {
 //      ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#isLastOp().
 //               ^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#REMOVE.
@@ -473,6 +475,7 @@ void move(int from, int to) {
 //              display_name op
 //              signature_documentation java UpdateOp op
 //              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/UpdateOpHelper#move().
+//              kind Variable
 //                ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#
 //                         ^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#instance().
 //                                  ^^^^ reference semanticdb maven . . com/airbnb/epoxy/UpdateOp#MOVE.
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
index cd3d000c1..519265811 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
@@ -122,6 +122,7 @@ public void writeToParcel(Parcel dest, int flags) {
 //                 display_name size
 //                 signature_documentation java final int size
 //                 enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
+//                 kind Variable
 //                   ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
     dest.writeInt(size);
 //  ^^^^ reference local 1
@@ -132,6 +133,7 @@ public void writeToParcel(Parcel dest, int flags) {
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#writeToParcel().
+//             kind Variable
 //                  ^ reference local 4
 //                      ^^^^ reference local 3
 //                            ^ reference local 4
@@ -209,6 +211,7 @@ public void save(Collection<EpoxyViewHolder> holders) {
 //                              display_name holder
 //                              signature_documentation java EpoxyViewHolder holder
 //                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save().
+//                              kind Variable
 //                                ^^^^^^^ reference local 6
       save(holder);
 //    ^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
@@ -244,6 +247,7 @@ public void save(EpoxyViewHolder holder) {
 //                  display_name state
 //                  signature_documentation java ViewState state
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#save(+1).
+//                  kind Variable
 //                    ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //                        ^^^^^^ reference local 8
 //                               ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getItemId#
@@ -294,6 +298,7 @@ public void restore(EpoxyViewHolder holder) {
 //                  display_name state
 //                  signature_documentation java ViewState state
 //                  enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#restore().
+//                  kind Variable
 //                    ^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#get().
 //                        ^^^^^^ reference local 10
 //                               ^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getItemId#
@@ -361,6 +366,7 @@ private ViewState(int size, int[] keys, Parcelable[] values) {
 //               display_name i
 //               signature_documentation java int i
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#`<init>`(+1).
+//               kind Variable
 //                    ^ reference local 15
 //                        ^^^^ reference local 12
 //                                ^ reference local 15
@@ -388,6 +394,7 @@ public void save(View view) {
 //                   display_name originalId
 //                   signature_documentation java int originalId
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#save().
+//                   kind Variable
 //                     ^^^^ reference local 16
 //                          ^^^^^ reference semanticdb maven . . View#getId#
       setIdIfNoneExists(view);
@@ -418,6 +425,7 @@ public void restore(View view) {
 //                   display_name originalId
 //                   signature_documentation java int originalId
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#restore().
+//                   kind Variable
 //                     ^^^^ reference local 18
 //                          ^^^^^ reference semanticdb maven . . View#getId#
       setIdIfNoneExists(view);
@@ -495,12 +503,14 @@ public void writeToParcel(Parcel parcel, int flags) {
 //             display_name size
 //             signature_documentation java int size
 //             enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
+//             kind Variable
 //               ^^^^ reference semanticdb maven maven/androidx.collection/collection 1.0.0 androidx/collection/LongSparseArray#size().
       int[] keys = new int[size];
 //          ^^^^ definition local 24
 //               display_name keys
 //               signature_documentation java int[] keys
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
+//               kind Variable
 //                         ^^^^ reference local 23
       Parcelable[] values = new Parcelable[size];
 //    ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
@@ -508,6 +518,7 @@ public void writeToParcel(Parcel parcel, int flags) {
 //                        display_name values
 //                        signature_documentation java unresolved_type[] values
 //                        enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
+//                        kind Variable
 //                              ^^^^^^^^^^ reference semanticdb maven . . Parcelable#
 //                                         ^^^^ reference local 23
       for (int i = 0; i < size; ++i) {
@@ -515,6 +526,7 @@ public void writeToParcel(Parcel parcel, int flags) {
 //               display_name i
 //               signature_documentation java int i
 //               enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel().
+//               kind Variable
 //                    ^ reference local 26
 //                        ^^^^ reference local 23
 //                                ^ reference local 26
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
index a5e4f4c3b..3f1cd2fd6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java
@@ -102,6 +102,7 @@ static int getViewType(EpoxyModel<?> model) {
 //                      display_name defaultViewType
 //                      signature_documentation java int defaultViewType
 //                      enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
+//                      kind Variable
 //                        ^^^^^ reference local 1
 //                              ^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyModel#getViewType().
     if (defaultViewType != 0) {
@@ -118,6 +119,7 @@ static int getViewType(EpoxyModel<?> model) {
 //                   display_name modelClass
 //                   signature_documentation java Class modelClass
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
+//                   kind Variable
 //                     ^^^^^ reference local 1
 //                           ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#getClass().
 
@@ -127,6 +129,7 @@ static int getViewType(EpoxyModel<?> model) {
 //                   display_name viewType
 //                   signature_documentation java Integer viewType
 //                   enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getViewType().
+//                   kind Variable
 //                     ^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP.
 //                                   ^^^ reference semanticdb maven jdk 11 java/util/Map#get().
 //                                       ^^^^^^^^^^ reference local 3
@@ -203,6 +206,7 @@ && getViewType(lastModelForViewTypeLookup) == viewType) {
 //                           display_name model
 //                           signature_documentation java EpoxyModel<?> model
 //                           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
+//                           kind Variable
 //                             ^^^^^^^ reference local 5
 //                                     ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels().
       if (getViewType(model) == viewType) {
@@ -221,6 +225,7 @@ && getViewType(lastModelForViewTypeLookup) == viewType) {
 //                                    display_name hiddenEpoxyModel
 //                                    signature_documentation java HiddenEpoxyModel hiddenEpoxyModel
 //                                    enclosing_symbol semanticdb maven . . com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
+//                                    kind Variable
 //                                          ^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/HiddenEpoxyModel#`<init>`().
     if (viewType == hiddenEpoxyModel.getViewType()) {
 //      ^^^^^^^^ reference local 6
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
index 44fa60ef9..6ad592e33 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
@@ -95,6 +95,7 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 //                              display_name epoxyHolder
 //                              signature_documentation java EpoxyViewHolder epoxyHolder
 //                              enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
+//                              kind Variable
 //                                ^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#
 //                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView().
 //                                                                          ^^^^^^ reference local 1
@@ -114,6 +115,7 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) {
 //                            display_name adapterPosition
 //                            signature_documentation java final int adapterPosition
 //                            enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged().
+//                            kind Variable
 //                              ^^^^^^^^^^^ reference local 3
 //                                          ^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyViewHolder#getAdapterPosition#
     if (adapterPosition != RecyclerView.NO_POSITION) {
@@ -167,6 +169,7 @@ public boolean equals(Object o) {
 //           display_name that
 //           signature_documentation java WrappedEpoxyModelCheckedChangeListener<?, ?> that
 //           enclosing_symbol semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#equals().
+//           kind Variable
 //              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#
 //                                                            ^ reference local 5
 
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
index bd6c5d9c8..e7dcdf466 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnonymousClasses.java
@@ -34,6 +34,7 @@ public static int app(int n) {
 //                                display_name fn
 //                                signature_documentation java Function<Integer, Integer> fn
 //                                enclosing_symbol semanticdb maven . . minimized/AnonymousClasses#app().
+//                                kind Variable
         new Function<Integer, Integer>() {
 //          ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //                   ^^^^^^^ reference semanticdb maven jdk 11 java/lang/Integer#
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
index 1c562c29a..1be452b49 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Arrays.java
@@ -20,23 +20,27 @@ public static String app() {
 //          display_name a
 //          signature_documentation java int[] a
 //          enclosing_symbol semanticdb maven . . minimized/Arrays#app().
+//          kind Variable
     String[] b = {"1", "2", "3"};
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //           ^ definition local 1
 //             display_name b
 //             signature_documentation java String[] b
 //             enclosing_symbol semanticdb maven . . minimized/Arrays#app().
+//             kind Variable
     int[][] c = {{1}, {2}, {3}};
 //          ^ definition local 2
 //            display_name c
 //            signature_documentation java int[][] c
 //            enclosing_symbol semanticdb maven . . minimized/Arrays#app().
+//            kind Variable
     String[][] d = {{"1"}, {"2"}, {"3"}};
 //  ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
 //             ^ definition local 3
 //               display_name d
 //               signature_documentation java String[][] d
 //               enclosing_symbol semanticdb maven . . minimized/Arrays#app().
+//               kind Variable
     return b[0] + a[0] + c[1][0] + d[1][0];
 //         ^ reference local 1
 //                ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
index a86cbeae2..4b7e459cf 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Enums.java
@@ -71,6 +71,7 @@ public static String app() {
 //             display_name all
 //             signature_documentation java String all
 //             enclosing_symbol semanticdb maven . . minimized/Enums#app().
+//             kind Variable
 //               ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/Arrays#stream().
 //                             ^^^^^^ reference semanticdb maven . . minimized/Enums#values().
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
index d1d34b8fc..f7acf3560 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Fields.java
@@ -90,6 +90,7 @@ public static String app() {
 //                display_name fields
 //                signature_documentation java Fields fields
 //                enclosing_symbol semanticdb maven . . minimized/Fields#app().
+//                kind Variable
 //                      ^^^^^^ reference semanticdb maven . . minimized/Fields#`<init>`().
     InnerFields innerFields = fields.new InnerFields();
 //  ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#
@@ -97,6 +98,7 @@ public static String app() {
 //                          display_name innerFields
 //                          signature_documentation java InnerFields innerFields
 //                          enclosing_symbol semanticdb maven . . minimized/Fields#app().
+//                          kind Variable
 //                            ^^^^^^ reference local 0
 //                                       ^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerFields#`<init>`().
     InnerStaticFields innerStaticFields = new InnerStaticFields();
@@ -105,6 +107,7 @@ public static String app() {
 //                                      display_name innerStaticFields
 //                                      signature_documentation java InnerStaticFields innerStaticFields
 //                                      enclosing_symbol semanticdb maven . . minimized/Fields#app().
+//                                      kind Variable
 //                                            ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Fields#InnerStaticFields#`<init>`().
     return String.valueOf(fields.privateField)
 //         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
index ca70ac31b..82a0d54b3 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/ForComprehensions.java
@@ -34,6 +34,7 @@ public static int app(int n) {
 //                         display_name integers
 //                         signature_documentation java List<Integer> integers
 //                         enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app().
+//                         kind Variable
 //                           ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#
 //                                       ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Collections#singletonList().
 //                                                     ^ reference local 0
@@ -42,11 +43,13 @@ public static int app(int n) {
 //             display_name result
 //             signature_documentation java int result
 //             enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app().
+//             kind Variable
     for (int i : integers) {
 //           ^ definition local 3
 //             display_name i
 //             signature_documentation java int i
 //             enclosing_symbol semanticdb maven . . minimized/ForComprehensions#app().
+//             kind Variable
 //               ^^^^^^^^ reference local 1
       result += i;
 //    ^^^^^^ reference local 2
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
index 24505c9e1..3a913002e 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
@@ -303,6 +303,7 @@ public static void testAnon() {
 //                                    display_name fn
 //                                    signature_documentation java InnerInterface<String, String> fn
 //                                    enclosing_symbol semanticdb maven . . minimized/InnerClasses#testAnon().
+//                                    kind Variable
         new InnerInterface<String, String>() {
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerInterface#
 //                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
@@ -345,6 +346,7 @@ public static String app() {
 //        display_name a
 //        signature_documentation java int a
 //        enclosing_symbol semanticdb maven . . minimized/InnerClasses#app().
+//        kind Variable
     InnerStaticClass.innerStaticMethod();
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass#
 //                   ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerStaticClass#innerStaticMethod().
@@ -354,6 +356,7 @@ public static String app() {
 //                            display_name innerClasses
 //                            signature_documentation java InnerClasses innerClasses
 //                            enclosing_symbol semanticdb maven . . minimized/InnerClasses#app().
+//                            kind Variable
 //                                  ^^^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#`<init>`().
 //                                               ^ reference local 11
     InnerClass innerClass = innerClasses.new InnerClass(a);
@@ -362,6 +365,7 @@ public static String app() {
 //                        display_name innerClass
 //                        signature_documentation java InnerClass innerClass
 //                        enclosing_symbol semanticdb maven . . minimized/InnerClasses#app().
+//                        kind Variable
 //                          ^^^^^^^^^^^^ reference local 12
 //                                           ^^^^^^^^^^ reference semanticdb maven . . minimized/InnerClasses#InnerClass#`<init>`().
 //                                                      ^ reference local 11
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
index 7f52ca43b..26bb5c11d 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Methods.java
@@ -88,12 +88,14 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //                  display_name methods
 //                  signature_documentation java Methods methods
 //                  enclosing_symbol semanticdb maven . . minimized/Methods#app().
+//                  kind Variable
 //                        ^^^^^^^ reference semanticdb maven . . minimized/Methods#`<init>`().
     int a = staticOverload(n);
 //      ^ definition local 7
 //        display_name a
 //        signature_documentation java int a
 //        enclosing_symbol semanticdb maven . . minimized/Methods#app().
+//        kind Variable
 //          ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload().
 //                         ^ reference local 4
     String b = staticOverload(m);
@@ -102,6 +104,7 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //           display_name b
 //           signature_documentation java String b
 //           enclosing_symbol semanticdb maven . . minimized/Methods#app().
+//           kind Variable
 //             ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/Methods#staticOverload(+1).
 //                            ^ reference local 5
     int c = methods.overload(n);
@@ -109,6 +112,7 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //        display_name c
 //        signature_documentation java int c
 //        enclosing_symbol semanticdb maven . . minimized/Methods#app().
+//        kind Variable
 //          ^^^^^^^ reference local 6
 //                  ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload().
 //                           ^ reference local 4
@@ -118,6 +122,7 @@ public static String app(int n, String m) throws RuntimeException, IndexOutOfBou
 //           display_name d
 //           signature_documentation java String d
 //           enclosing_symbol semanticdb maven . . minimized/Methods#app().
+//           kind Variable
 //             ^^^^^^^ reference local 6
 //                     ^^^^^^^^ reference semanticdb maven . . minimized/Methods#overload(+1).
 //                              ^ reference local 5
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
index ff8723729..9aee96598 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Primitives.java
@@ -26,12 +26,14 @@ public static String app() {
 //                display_name random
 //                signature_documentation java Random random
 //                enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//                kind Variable
 //                      ^^^^^^ reference semanticdb maven jdk 11 java/util/Random#`<init>`().
     byte a = (byte) random.nextInt();
 //       ^ definition local 1
 //         display_name a
 //         signature_documentation java byte a
 //         enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//         kind Variable
 //                  ^^^^^^ reference local 0
 //                         ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     short b = (short) random.nextInt();
@@ -39,6 +41,7 @@ public static String app() {
 //          display_name b
 //          signature_documentation java short b
 //          enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//          kind Variable
 //                    ^^^^^^ reference local 0
 //                           ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     int c = random.nextInt();
@@ -46,6 +49,7 @@ public static String app() {
 //        display_name c
 //        signature_documentation java int c
 //        enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//        kind Variable
 //          ^^^^^^ reference local 0
 //                 ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     long d = random.nextLong();
@@ -53,6 +57,7 @@ public static String app() {
 //         display_name d
 //         signature_documentation java long d
 //         enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//         kind Variable
 //           ^^^^^^ reference local 0
 //                  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextLong().
     char e = (char) random.nextInt();
@@ -60,6 +65,7 @@ public static String app() {
 //         display_name e
 //         signature_documentation java char e
 //         enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//         kind Variable
 //                  ^^^^^^ reference local 0
 //                         ^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextInt().
     float f = (float) random.nextDouble();
@@ -67,6 +73,7 @@ public static String app() {
 //          display_name f
 //          signature_documentation java float f
 //          enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//          kind Variable
 //                    ^^^^^^ reference local 0
 //                           ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble().
     double g = (double) random.nextDouble();
@@ -74,6 +81,7 @@ public static String app() {
 //           display_name g
 //           signature_documentation java double g
 //           enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//           kind Variable
 //                      ^^^^^^ reference local 0
 //                             ^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextDouble().
     boolean h = random.nextBoolean();
@@ -81,6 +89,7 @@ public static String app() {
 //            display_name h
 //            signature_documentation java boolean h
 //            enclosing_symbol semanticdb maven . . minimized/Primitives#app().
+//            kind Variable
 //              ^^^^^^ reference local 0
 //                     ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/Random#nextBoolean().
     return "" + a + b + c + d + e + f + g + h;
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
index 7f97bb836..04a4c1db7 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/SubClasses.java
@@ -50,6 +50,7 @@ public static String app() {
 //               display_name s
 //               signature_documentation java SubClasses s
 //               enclosing_symbol semanticdb maven . . minimized/SubClasses#app().
+//               kind Variable
 //                     ^^^^^^^^^^ reference semanticdb maven . . minimized/SubClasses#`<init>`().
     return s.abstractImplementation()
 //         ^ reference local 0
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
index ec438c768..30a3e7a2f 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/TabIndented.java
@@ -20,6 +20,7 @@ public class TabIndented {
 //         display_name o
 //         signature_documentation java Object o
 //         enclosing_symbol semanticdb maven . . minimized/TabIndented#app().
+//         kind Variable
 //               ^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#
 →→→@Override
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#

From 77f62679a0c172c653b060e328a108d399a29010 Mon Sep 17 00:00:00 2001
From: Anton Sviridov <keynmol@gmail.com>
Date: Mon, 20 May 2024 11:01:08 +0100
Subject: [PATCH 10/11] Update snapshots after rebase

---
 .../src/main/generated/BaseByteRenderer.scala |  90 ++--
 .../src/main/generated/BaseCharRenderer.scala |  90 ++--
 .../src/main/generated/ByteParser.scala       | 510 +++++++++---------
 .../src/main/generated/CharParser.scala       | 510 +++++++++---------
 .../airbnb/epoxy/BaseEpoxyTouchCallback.java  |   2 -
 .../com/airbnb/epoxy/EpoxyController.java     |   2 +-
 .../generated/com/airbnb/epoxy/UpdateOp.java  |   2 +-
 .../com/airbnb/epoxy/VisibilityState.java     |   2 +-
 .../src/main/java/minimized/Annotations.java  |   2 +-
 .../AnnotationsOnParameterizedTypes.java      |  62 ++-
 .../src/main/java/minimized/InnerClasses.java |   2 +-
 .../main/generated/ujson/AstTransformer.scala |  48 +-
 .../generated/ujson/ByteArrayParser.scala     |  30 +-
 .../generated/ujson/ByteBufferParser.scala    |  18 +-
 .../generated/ujson/CharSequenceParser.scala  |  12 +-
 .../src/main/generated/ujson/Exceptions.scala |  24 +-
 .../main/generated/ujson/IndexedValue.scala   | 136 ++---
 .../src/main/generated/ujson/JsVisitor.scala  |  82 +--
 .../src/main/generated/ujson/Readable.scala   |  16 +-
 .../main/generated/ujson/StringParser.scala   |  18 +-
 .../src/main/generated/ujson/Value.scala      | 282 +++++-----
 .../src/main/generated/ujson/package.scala    |  56 +-
 22 files changed, 1013 insertions(+), 983 deletions(-)

diff --git a/tests/snapshots/src/main/generated/BaseByteRenderer.scala b/tests/snapshots/src/main/generated/BaseByteRenderer.scala
index 349fe73bc..02518308d 100644
--- a/tests/snapshots/src/main/generated/BaseByteRenderer.scala
+++ b/tests/snapshots/src/main/generated/BaseByteRenderer.scala
@@ -3,7 +3,7 @@ package ujson
 import scala.annotation.switch
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
 import upickle.core.{ArrVisitor, ObjVisitor}
 //     ^^^^^^^ reference semanticdb maven . . upickle/
 //             ^^^^ reference semanticdb maven . . upickle/core/
@@ -63,7 +63,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                            signature_documentation scala default indent: Int 
 //                            kind Parameter
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                        escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
 //                                   display_name escapeUnicode
@@ -75,7 +75,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                   signature_documentation scala default escapeUnicode: Boolean 
 //                                   kind Parameter
 //                                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#escapeUnicode.
-//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#[T]
@@ -108,7 +108,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#writeOutToIfLongerThan().
 //                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#out.
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
   }
 
   private[this] var depth: Int = 0
@@ -121,7 +121,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                        signature_documentation scala private[this] var depth_=(x$1: Int): Unit
 //                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
 
   private[this] var commaBuffered = false
@@ -161,12 +161,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                      display_name length
 //                      signature_documentation scala length: Int 
 //                      kind Parameter
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitArray().(index)
 //                                  display_name index
 //                                  signature_documentation scala index: Int 
 //                                  kind Parameter
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                              ^ definition local 1
 //                                                display_name $anon
 //                                                signature_documentation scala final class $anon
@@ -183,7 +183,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 
     depth += 1
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     renderIndent()
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
     def subVisitor = BaseByteRenderer.this
@@ -208,8 +208,8 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                             display_name index
 //                             signature_documentation scala index: Int 
 //                             kind Parameter
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
       flushBuffer()
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
       commaBuffered = true
@@ -225,12 +225,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
       depth -= 1
 //    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
       renderIndent()
 //    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
       elemBuilder.append(']')
@@ -253,12 +253,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                       display_name length
 //                       signature_documentation scala length: Int 
 //                       kind Parameter
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitObject().(index)
 //                                   display_name index
 //                                   signature_documentation scala index: Int 
 //                                   kind Parameter
-//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^ definition local 10
 //                                                 display_name $anon
 //                                                 signature_documentation scala final class $anon
@@ -274,7 +274,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
     depth += 1
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     renderIndent()
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
     def subVisitor = BaseByteRenderer.this
@@ -294,7 +294,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#
     def visitKeyValue(s: Any): Unit = {
 //      ^^^^^^^^^^^^^ definition local 11
@@ -307,13 +307,13 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                      signature_documentation scala s: Any 
 //                      kind Parameter
 //                       ^^^ reference semanticdb maven . . scala/Any#
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
       elemBuilder.append(':')
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
       if (indent != -1) elemBuilder.append(' ')
 //        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+3).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+3).
 //                      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
     }
@@ -332,8 +332,8 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                             display_name index
 //                             signature_documentation scala index: Int 
 //                             kind Parameter
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
       commaBuffered = true
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
     }
@@ -347,12 +347,12 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#commaBuffered().
       depth -= 1
 //    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
       renderIndent()
 //    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#renderIndent().
       elemBuilder.append('}')
@@ -375,7 +375,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                    display_name index
 //                    signature_documentation scala index: Int 
 //                    kind Parameter
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     elemBuilder.ensureLength(4)
@@ -409,7 +409,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     elemBuilder.ensureLength(5)
@@ -446,7 +446,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                    display_name index
 //                    signature_documentation scala index: Int 
 //                    kind Parameter
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     elemBuilder.ensureLength(4)
@@ -485,17 +485,17 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                                      display_name decIndex
 //                                                      signature_documentation scala decIndex: Int 
 //                                                      kind Parameter
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
 //                                                                     signature_documentation scala expIndex: Int 
 //                                                                     kind Parameter
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().(index)
 //                                                                                 display_name index
 //                                                                                 signature_documentation scala index: Int 
 //                                                                                 kind Parameter
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     elemBuilder.ensureLength(s.length())
@@ -517,7 +517,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     while(i < sLength){
 //        ^ reference local 18
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+3).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+3).
 //            ^^^^^^^ reference local 19
       elemBuilder.appendUnsafeC(s.charAt(i))
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
@@ -527,7 +527,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                       ^ reference local 18
       i += 1
 //    ^ reference local 18
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     }
     flushByteBuilder()
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushByteBuilder().
@@ -546,21 +546,21 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                            display_name d
 //                            signature_documentation scala d: Double 
 //                            kind Parameter
-//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
+//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(index)
 //                                           display_name index
 //                                           signature_documentation scala index: Int 
 //                                           kind Parameter
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     d match{
 //  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64().(d)
       case Double.PositiveInfinity => visitNonNullString("Infinity", -1)
-//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.
-//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.PositiveInfinity.
+//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.
+//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.PositiveInfinity.
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
       case Double.NegativeInfinity => visitNonNullString("-Infinity", -1)
-//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.
-//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.NegativeInfinity.
+//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.
+//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.NegativeInfinity.
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitNonNullString().
       case d if java.lang.Double.isNaN(d) => visitNonNullString("NaN", -1)
 //         ^ definition local 21
@@ -584,10 +584,10 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //            signature_documentation scala i: Int 
 //            kind Variable
 //              ^ reference local 22
-//                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toInt().
+//                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toInt().
         if (d == i) visitFloat64StringParts(i.toString, -1, -1, index)
 //          ^ reference local 22
-//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#`==`(+3).
+//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#`==`(+3).
 //               ^ reference local 23
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitFloat64StringParts().
 //                                          ^ reference local 23
@@ -622,7 +622,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                       display_name index
 //                                       signature_documentation scala index: Int 
 //                                       kind Parameter
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     if (s eq null) visitNull(index)
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#visitString().(s)
@@ -649,7 +649,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                                              display_name index
 //                                              signature_documentation scala index: Int 
 //                                              kind Parameter
-//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#flushBuffer().
     upickle.core.RenderUtils.escapeByte(unicodeCharBuilder, elemBuilder, s, escapeUnicode)
@@ -674,7 +674,7 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //                       kind Method
     if (indent == -1) ()
 //      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
-//             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
     else {
       var i = indent * depth
 //        ^ definition local 24
@@ -682,25 +682,25 @@ class BaseByteRenderer[T <: upickle.core.ByteOps.Output]
 //          signature_documentation scala i: Int 
 //          kind Variable
 //            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#indent.
-//                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`*`(+3).
+//                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`*`(+3).
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#depth().
       elemBuilder.ensureLength(i + 1)
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#ensureLength().
 //                             ^ reference local 24
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       elemBuilder.appendUnsafe('\n')
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#appendUnsafe().
       while(i > 0) {
 //          ^ reference local 24
-//            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>`(+3).
+//            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>`(+3).
         elemBuilder.appendUnsafe(' ')
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseByteRenderer#elemBuilder.
 //                  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#appendUnsafe().
         i -= 1
 //      ^ reference local 24
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
       }
     }
   }
diff --git a/tests/snapshots/src/main/generated/BaseCharRenderer.scala b/tests/snapshots/src/main/generated/BaseCharRenderer.scala
index dc0f7cb5e..9b1d69ee6 100644
--- a/tests/snapshots/src/main/generated/BaseCharRenderer.scala
+++ b/tests/snapshots/src/main/generated/BaseCharRenderer.scala
@@ -3,7 +3,7 @@ package ujson
 import scala.annotation.switch
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
 import upickle.core.{ArrVisitor, ObjVisitor}
 //     ^^^^^^^ reference semanticdb maven . . upickle/
 //             ^^^^ reference semanticdb maven . . upickle/core/
@@ -63,7 +63,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                            signature_documentation scala default indent: Int 
 //                            kind Parameter
 //                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                        escapeUnicode: Boolean = false) extends JsVisitor[T, T]{
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
 //                                   display_name escapeUnicode
@@ -75,7 +75,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                   signature_documentation scala default escapeUnicode: Boolean 
 //                                   kind Parameter
 //                                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#escapeUnicode.
-//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#[T]
@@ -108,7 +108,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //              ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#writeOutToIfLongerThan().
 //                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#out.
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
   }
 
   private[this] var depth: Int = 0
@@ -121,7 +121,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                        signature_documentation scala private[this] var depth_=(x$1: Int): Unit
 //                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
 
   private[this] var commaBuffered = false
@@ -161,12 +161,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                      display_name length
 //                      signature_documentation scala length: Int 
 //                      kind Parameter
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitArray().(index)
 //                                  display_name index
 //                                  signature_documentation scala index: Int 
 //                                  kind Parameter
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                              ^ definition local 1
 //                                                display_name $anon
 //                                                signature_documentation scala final class $anon
@@ -183,7 +183,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 
     depth += 1
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     renderIndent()
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
     def subVisitor = BaseCharRenderer.this
@@ -208,8 +208,8 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                             display_name index
 //                             signature_documentation scala index: Int 
 //                             kind Parameter
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
       flushBuffer()
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
       commaBuffered = true
@@ -225,12 +225,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
       depth -= 1
 //    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
       renderIndent()
 //    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
       elemBuilder.append(']')
@@ -253,12 +253,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                       display_name length
 //                       signature_documentation scala length: Int 
 //                       kind Parameter
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitObject().(index)
 //                                   display_name index
 //                                   signature_documentation scala index: Int 
 //                                   kind Parameter
-//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^ definition local 10
 //                                                 display_name $anon
 //                                                 signature_documentation scala final class $anon
@@ -274,7 +274,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
     depth += 1
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     renderIndent()
 //  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
     def subVisitor = BaseCharRenderer.this
@@ -294,7 +294,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#
     def visitKeyValue(s: Any): Unit = {
 //      ^^^^^^^^^^^^^ definition local 11
@@ -307,13 +307,13 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                      signature_documentation scala s: Any 
 //                      kind Parameter
 //                       ^^^ reference semanticdb maven . . scala/Any#
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
       elemBuilder.append(':')
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
       if (indent != -1) elemBuilder.append(' ')
 //        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+3).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+3).
 //                      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
     }
@@ -332,8 +332,8 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                             display_name index
 //                             signature_documentation scala index: Int 
 //                             kind Parameter
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
       commaBuffered = true
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
     }
@@ -347,12 +347,12 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
       commaBuffered = false
 //    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#commaBuffered().
       depth -= 1
 //    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
       renderIndent()
 //    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#renderIndent().
       elemBuilder.append('}')
@@ -375,7 +375,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                    display_name index
 //                    signature_documentation scala index: Int 
 //                    kind Parameter
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     elemBuilder.ensureLength(4)
@@ -409,7 +409,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     elemBuilder.ensureLength(5)
@@ -446,7 +446,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                    display_name index
 //                    signature_documentation scala index: Int 
 //                    kind Parameter
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     elemBuilder.ensureLength(4)
@@ -485,17 +485,17 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                                      display_name decIndex
 //                                                      signature_documentation scala decIndex: Int 
 //                                                      kind Parameter
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
 //                                                                     signature_documentation scala expIndex: Int 
 //                                                                     kind Parameter
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().(index)
 //                                                                                 display_name index
 //                                                                                 signature_documentation scala index: Int 
 //                                                                                 kind Parameter
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     elemBuilder.ensureLength(s.length())
@@ -517,7 +517,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     while(i < sLength){
 //        ^ reference local 18
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+3).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+3).
 //            ^^^^^^^ reference local 19
       elemBuilder.appendUnsafeC(s.charAt(i))
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
@@ -527,7 +527,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                       ^ reference local 18
       i += 1
 //    ^ reference local 18
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     }
     flushCharBuilder()
 //  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushCharBuilder().
@@ -546,21 +546,21 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                            display_name d
 //                            signature_documentation scala d: Double 
 //                            kind Parameter
-//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
+//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(index)
 //                                           display_name index
 //                                           signature_documentation scala index: Int 
 //                                           kind Parameter
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     d match{
 //  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64().(d)
       case Double.PositiveInfinity => visitNonNullString("Infinity", -1)
-//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.
-//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.PositiveInfinity.
+//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.
+//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.PositiveInfinity.
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
       case Double.NegativeInfinity => visitNonNullString("-Infinity", -1)
-//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.
-//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double.NegativeInfinity.
+//         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.
+//                ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double.NegativeInfinity.
 //                                    ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitNonNullString().
       case d if java.lang.Double.isNaN(d) => visitNonNullString("NaN", -1)
 //         ^ definition local 21
@@ -584,10 +584,10 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //            signature_documentation scala i: Int 
 //            kind Variable
 //              ^ reference local 22
-//                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toInt().
+//                ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toInt().
         if (d == i) visitFloat64StringParts(i.toString, -1, -1, index)
 //          ^ reference local 22
-//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#`==`(+3).
+//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#`==`(+3).
 //               ^ reference local 23
 //                  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitFloat64StringParts().
 //                                          ^ reference local 23
@@ -622,7 +622,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                       display_name index
 //                                       signature_documentation scala index: Int 
 //                                       kind Parameter
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     if (s eq null) visitNull(index)
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#visitString().(s)
@@ -649,7 +649,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                                              display_name index
 //                                              signature_documentation scala index: Int 
 //                                              kind Parameter
-//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     flushBuffer()
 //  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#flushBuffer().
     upickle.core.RenderUtils.escapeChar(unicodeCharBuilder, elemBuilder, s, escapeUnicode)
@@ -674,7 +674,7 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //                       kind Method
     if (indent == -1) ()
 //      ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
-//             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
     else {
       var i = indent * depth
 //        ^ definition local 24
@@ -682,25 +682,25 @@ class BaseCharRenderer[T <: upickle.core.CharOps.Output]
 //          signature_documentation scala i: Int 
 //          kind Variable
 //            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#indent.
-//                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`*`(+3).
+//                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`*`(+3).
 //                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#depth().
       elemBuilder.ensureLength(i + 1)
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#ensureLength().
 //                             ^ reference local 24
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       elemBuilder.appendUnsafe('\n')
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#appendUnsafe().
       while(i > 0) {
 //          ^ reference local 24
-//            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>`(+3).
+//            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>`(+3).
         elemBuilder.appendUnsafe(' ')
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/BaseCharRenderer#elemBuilder.
 //                  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#appendUnsafe().
         i -= 1
 //      ^ reference local 24
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
       }
     }
   }
diff --git a/tests/snapshots/src/main/generated/ByteParser.scala b/tests/snapshots/src/main/generated/ByteParser.scala
index 825d20231..645c034b7 100644
--- a/tests/snapshots/src/main/generated/ByteParser.scala
+++ b/tests/snapshots/src/main/generated/ByteParser.scala
@@ -26,8 +26,8 @@ import java.nio.charset.Charset
 import scala.annotation.{switch, tailrec}
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
-//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
+//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
+//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
 
 /**
   * A specialized JSON parse that can parse Bytes (Chars or Bytes), sending
@@ -80,7 +80,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          display_name i
 //                          signature_documentation scala i: Int 
 //                          kind Parameter
-//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if (requestUntil(i)) throw new IncompleteParseException("exhausted input")
 //      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#requestUntil().
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().(i)
@@ -97,8 +97,8 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                           display_name i
 //                           signature_documentation scala i: Int 
 //                           kind Parameter
-//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
     requestUntilOrThrow(i)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().(i)
@@ -119,7 +119,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                            display_name i
 //                            signature_documentation scala i: Int 
 //                            kind Parameter
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#requestUntil().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().(i)
 
@@ -134,56 +134,56 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/InputStreamParser#close().
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 
   /**
    * Valid parser states.
    */
   @inline private[this] final val ARRBEG = 6
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
 //                                       display_name ARRBEG
 //                                       signature_documentation scala @inline\nprivate[this] final val ARRBEG: 6
 //                                       kind Method
   @inline private[this] final val OBJBEG = 7
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
 //                                       display_name OBJBEG
 //                                       signature_documentation scala @inline\nprivate[this] final val OBJBEG: 7
 //                                       kind Method
   @inline private[this] final val DATA = 1
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
 //                                     display_name DATA
 //                                     signature_documentation scala @inline\nprivate[this] final val DATA: 1
 //                                     kind Method
   @inline private[this] final val KEY = 2
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#KEY.
 //                                    display_name KEY
 //                                    signature_documentation scala @inline\nprivate[this] final val KEY: 2
 //                                    kind Method
   @inline private[this] final val COLON = 3
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#COLON.
 //                                      display_name COLON
 //                                      signature_documentation scala @inline\nprivate[this] final val COLON: 3
 //                                      kind Method
   @inline private[this] final val ARREND = 4
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARREND.
 //                                       display_name ARREND
 //                                       signature_documentation scala @inline\nprivate[this] final val ARREND: 4
 //                                       kind Method
   @inline private[this] final val OBJEND = 5
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJEND.
 //                                       display_name OBJEND
 //                                       signature_documentation scala @inline\nprivate[this] final val OBJEND: 5
@@ -226,7 +226,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        kind Variable
 //          ^ reference local 3
     while (!atEof(j)) {
-//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
+//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`unary_!`().
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                ^ reference local 4
       (getByteSafe(j): @switch) match {
@@ -234,14 +234,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                 ^ reference local 4
         case '\n' | ' ' | '\t' | '\r' => j += 1
 //                                       ^ reference local 4
-//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         case _ => die(j, "expected whitespace or eof")
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                    ^ reference local 4
       }
     }
     if (!atEof(j)) die(j, "expected eof")
-//      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
+//      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`unary_!`().
 //       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //             ^ reference local 4
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
@@ -264,12 +264,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                          display_name i
 //                          signature_documentation scala i: Int 
 //                          kind Parameter
-//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(msg)
 //                                    display_name msg
 //                                    signature_documentation scala msg: String 
 //                                    kind Parameter
-//                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                              ^^^^^^^ reference semanticdb maven . . scala/Nothing#
     val out = new upickle.core.ByteBuilder()
 //      ^^^ definition local 6
@@ -293,14 +293,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       out,
 //    ^^^ reference local 6
       new ArrayCharSequence(Array(elemOps.toInt(getByteSafe(i)).toChar)),
-//        ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrayCharSequence#
-//                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrayCharSequence#`<init>`().
-//                          ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array.
+//        ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrayCharSequence#
+//                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrayCharSequence#`<init>`().
+//                          ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array.
 //                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
 //                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteOps.toInt().
 //                                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(i)
-//                                                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#toChar().
+//                                                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#toChar().
       unicode = false
 //    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.escapeByte().(unicode)
     )
@@ -309,7 +309,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        display_name s
 //        signature_documentation scala s: String 
 //        kind Variable
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/StringOps#format().
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/StringOps#format().
 //                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().(msg)
 //                                   ^^^ reference local 6
 //                                       ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#makeString().
@@ -338,7 +338,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                     display_name i
 //                                     signature_documentation scala i: Int 
 //                                     kind Parameter
-//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(ctxt)
 //                                                display_name ctxt
 //                                                signature_documentation scala ctxt: ObjArrVisitor[Any, J] 
@@ -352,7 +352,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                                               kind Parameter
 //                                                                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 9
 //        display_name j
@@ -379,10 +379,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == '-') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -390,10 +390,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     }
     if (c == '0') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -411,7 +411,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 10
         j += 1;
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -419,7 +419,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j == j0) die(i, "expected digit")
 //        ^ reference local 9
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //             ^^ reference local 13
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
@@ -427,15 +427,15 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == '.') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       decIndex = j - i
 //    ^^^^^^^^ reference local 11
 //               ^ reference local 9
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -452,7 +452,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 10
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -460,7 +460,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 15
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //              ^ reference local 9
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
@@ -468,31 +468,31 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == 'e' || c == 'E') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                  ^ reference local 10
-//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       expIndex = j - i
 //    ^^^^^^^^ reference local 12
 //               ^ reference local 9
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                    ^ reference local 9
       if (c == '+' || c == '-') {
 //        ^ reference local 10
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                    ^ reference local 10
-//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -510,7 +510,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 10
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -518,7 +518,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j0 == j)  die(i, "expected digit")
 //        ^^ reference local 17
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //              ^ reference local 9
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNum().(i)
@@ -554,25 +554,25 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                display_name decIndex
 //                                                signature_documentation scala decIndex: Int 
 //                                                kind Parameter
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          expIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(expIndex)
 //                                                display_name expIndex
 //                                                signature_documentation scala expIndex: Int 
 //                                                kind Parameter
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          i: Int,
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(i)
 //                                         display_name i
 //                                         signature_documentation scala i: Int 
 //                                         kind Parameter
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          j: Int) = {
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(j)
 //                                         display_name j
 //                                         signature_documentation scala j: Int 
 //                                         kind Parameter
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     facade.visitFloat64StringParts(
 //  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(facade)
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
@@ -580,7 +580,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(i)
 //                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(j)
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(i)
       decIndex,
 //    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitFloat64StringPartsWithWrapper().(decIndex)
@@ -614,7 +614,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                             display_name i
 //                                             signature_documentation scala i: Int 
 //                                             kind Parameter
-//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(facade)
 //                                                          display_name facade
 //                                                          signature_documentation scala facade: Visitor[local20, J[ 
@@ -622,7 +622,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 21
 //        display_name j
@@ -649,11 +649,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == '-') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       // any valid input will require at least one digit after -
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -661,10 +661,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     }
     if (c == '0') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       if (atEof(j)) {
 //        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //              ^ reference local 21
@@ -694,7 +694,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                ^ reference local 21
@@ -714,7 +714,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 25
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //              ^ reference local 21
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
@@ -722,16 +722,16 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == '.') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       // any valid input will require at least one digit after .
       decIndex = j - i
 //    ^^^^^^^^ reference local 23
 //               ^ reference local 21
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -748,7 +748,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                ^ reference local 21
@@ -768,7 +768,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if(j0 == j) die(i, "expected digit")
 //       ^^ reference local 27
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //             ^ reference local 21
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
@@ -776,32 +776,32 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     if (c == 'e' || c == 'E') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                  ^ reference local 22
-//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       // any valid input will require at least one digit after e, e+, etc
       expIndex = j - i
 //    ^^^^^^^^ reference local 24
 //               ^ reference local 21
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getByteSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                    ^ reference local 21
       if (c == '+' || c == '-') {
 //        ^ reference local 22
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                    ^ reference local 22
-//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getByteSafe(j)
 //      ^ reference local 22
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
@@ -819,7 +819,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#atEof().
 //                ^ reference local 21
@@ -839,7 +839,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 29
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //              ^ reference local 21
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNumTopLevel().(i)
@@ -870,8 +870,8 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                    display_name i
 //                                    signature_documentation scala i: Int 
 //                                    kind Parameter
-//                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
+//                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
     import upickle.core.RenderUtils.hex
 //         ^^^^^^^ reference semanticdb maven . . upickle/
 //                 ^^^^ reference semanticdb maven . . upickle/core/
@@ -885,46 +885,46 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     x = (x << 4) | hex(getByteSafe(i+2).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#toInt().
     x = (x << 4) | hex(getByteSafe(i+3).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#toInt().
     x = (x << 4) | hex(getByteSafe(i+4).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#toInt().
     x = (x << 4) | hex(getByteSafe(i+5).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#toInt().
     x.toChar
 //  ^ reference local 31
-//    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#toChar().
+//    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#toChar().
   }
 
 
@@ -942,7 +942,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                      display_name i
 //                                      signature_documentation scala i: Int 
 //                                      kind Parameter
-//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(facade)
 //                                                   display_name facade
 //                                                   signature_documentation scala facade: Visitor[local32, J[ 
@@ -953,22 +953,22 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     requestUntilOrThrow(i + 3)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (getByteUnsafe(i + 1) == 'r' && getByteUnsafe(i + 2) == 'u' && getByteUnsafe(i + 3) == 'e') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       facade.visitTrue(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTrue().(facade)
 //           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
@@ -994,7 +994,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                       display_name i
 //                                       signature_documentation scala i: Int 
 //                                       kind Parameter
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(facade)
 //                                                    display_name facade
 //                                                    signature_documentation scala facade: Visitor[local33, J[ 
@@ -1005,28 +1005,28 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     requestUntilOrThrow(i + 4)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
     if (getByteUnsafe(i + 1) == 'a' && getByteUnsafe(i + 2) == 'l' && getByteUnsafe(i + 3) == 's' && getByteUnsafe(i + 4) == 'e') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                                                                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                                                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                                                                                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(i)
-//                                                                                                                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                                                                                        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                                                                                                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                                                                                        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       facade.visitFalse(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().(facade)
 //           ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
@@ -1052,7 +1052,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                      display_name i
 //                                      signature_documentation scala i: Int 
 //                                      kind Parameter
-//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(facade)
 //                                                   display_name facade
 //                                                   signature_documentation scala facade: Visitor[local34, J[ 
@@ -1063,22 +1063,22 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     requestUntilOrThrow(i + 3)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (getByteUnsafe(i + 1) == 'u' && getByteUnsafe(i + 2) == 'l' && getByteUnsafe(i + 3) == 'l') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#getByteUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#`==`(+2).
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#`==`(+2).
       facade.visitNull(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().(facade)
 //           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
@@ -1099,7 +1099,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                          display_name i
 //                                          signature_documentation scala i: Int 
 //                                          kind Parameter
-//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(facade)
 //                                                       display_name facade
 //                                                       signature_documentation scala facade: Visitor[local35, J[ 
@@ -1107,7 +1107,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     try parseTopLevel0(i, facade)
 //      ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel().(i)
@@ -1120,8 +1120,8 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    * Parse and return the next JSON value and the position beyond it.
    */
   @tailrec
-// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#`<init>`().
+// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseTopLevel0(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                                         display_name parseTopLevel0
@@ -1131,7 +1131,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                           display_name i
 //                                           signature_documentation scala i: Int 
 //                                           kind Parameter
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                                        display_name facade
 //                                                        signature_documentation scala facade: Visitor[local38, J[ 
@@ -1139,7 +1139,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     (getByteSafe(i): @switch) match {
 //   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
@@ -1147,12 +1147,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
       case ' ' | '\t' | 'r' => parseTopLevel0(i + 1, facade)
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                   ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
       case '\n' => parseTopLevel0(i + 1, facade)
 //                 ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                       ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 
       // if we have a recursive top-level structure, we'll delegate the parsing
@@ -1161,20 +1161,20 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                           ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Nil.
+//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Nil.
       case '{' => parseNested(OBJBEG, i + 1, facade.visitObject(-1, i), Nil)
 //                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                           ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                                  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Nil.
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Nil.
 
       // we have a single top-level number
       case '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' => parseNumTopLevel(i, facade)
@@ -1194,19 +1194,19 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
 //                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       case 'f' => (parseFalse(i, facade), i + 5)
 //                 ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseFalse().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       case 'n' => (parseNull(i, facade), i + 4)
 //                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNull().
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
 //                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(facade)
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseTopLevel0().(i)
-//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
       // invalid
       case _ => die(i, "expected json value")
@@ -1224,9 +1224,9 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //             display_name j
 //             signature_documentation scala j: Int 
 //             kind Parameter
-//              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/PartialFunction#
-//                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Throwable#
+//              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/PartialFunction#
+//                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Throwable#
 //                                               ^^^^^^^ reference semanticdb maven . . scala/Nothing#
 //                                                          ^ definition local 39
 //                                                            display_name $anonfun
@@ -1264,8 +1264,8 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
    * @param path the json path in the tree
    */
   @tailrec
-// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#`<init>`().
+// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseNested(state: Int,
 //                          ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                      display_name parseNested
@@ -1275,13 +1275,13 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                            display_name state
 //                                            signature_documentation scala state: Int 
 //                                            kind Parameter
-//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                         i: Int,
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
 //                                        display_name i
 //                                        signature_documentation scala i: Int 
 //                                        kind Parameter
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                         stackHead: ObjArrVisitor[_, J],
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                display_name stackHead
@@ -1294,11 +1294,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                display_name stackTail
 //                                                signature_documentation scala stackTail: List[ObjArrVisitor[local51, J[] 
 //                                                kind Parameter
-//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
+//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     (getByteSafe(i): @switch) match{
 //   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
@@ -1307,7 +1307,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(state)
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
@@ -1370,7 +1370,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
           case _ => dieWithFailureMessage(i, state)
@@ -1404,10 +1404,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#ARRBEG.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                 ^^^ reference local 58
 //                                      ^^^^^^^^^ reference local 62
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#`::`().
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#`::`().
 //                                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
       case '{' =>
@@ -1435,10 +1435,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#OBJBEG.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                 ^^^ reference local 63
 //                                      ^^^^^^^^^ reference local 67
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#`::`().
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#`::`().
 //                                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
       case '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' =>
@@ -1500,7 +1500,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
@@ -1532,7 +1532,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
@@ -1564,7 +1564,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 
@@ -1579,7 +1579,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                   ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
           case OBJEND => parseNested(KEY, i + 1, stackHead, stackTail)
@@ -1587,7 +1587,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                                   ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#KEY.
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackHead)
 //                                                          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
           case _ => dieWithFailureMessage(i, state)
@@ -1608,30 +1608,30 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                        ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
               case Some(t) => t
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                      ^ definition local 77
 //                        display_name t
 //                        signature_documentation scala t: (J, Int) 
 //                        kind Variable
 //                            ^ reference local 77
               case None =>
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 78
 //                                display_name stackTailHead
 //                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
 //                                kind Variable
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
-//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
+//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                           ^^^^^^^^^^^^^ reference local 78
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                                  ^^^^^^^^^^^^^ reference local 78
 //                                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
-//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#tail().
+//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#tail().
             }
           case _ => dieWithFailureMessage(i, state)
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().
@@ -1651,30 +1651,30 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                        ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
               case Some(t) => t
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                      ^ definition local 79
 //                        display_name t
 //                        signature_documentation scala t: (J, Int) 
 //                        kind Variable
 //                            ^ reference local 79
               case None =>
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 80
 //                                display_name stackTailHead
 //                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
 //                                kind Variable
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
-//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
+//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#collectionEndFor().
 //                                           ^^^^^^^^^^^^^ reference local 80
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(i)
-//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                                  ^^^^^^^^^^^^^ reference local 80
 //                                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseNested().(stackTail)
-//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#tail().
+//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#tail().
             }
           case _ => dieWithFailureMessage(i, state)
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().
@@ -1699,12 +1699,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                            display_name i
 //                            signature_documentation scala i: Int 
 //                            kind Parameter
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(state)
 //                                        display_name state
 //                                        signature_documentation scala state: Int 
 //                                        kind Parameter
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     val expected = state match{
 //      ^^^^^^^^ definition local 81
 //               display_name expected
@@ -1729,7 +1729,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     die(i, s"expected $expected")
 //  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#dieWithFailureMessage().(i)
-//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
 //                     ^^^^^^^^ reference local 81
   }
 
@@ -1742,12 +1742,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                        display_name state
 //                        signature_documentation scala state: Int 
 //                        kind Parameter
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(i)
 //                                display_name i
 //                                signature_documentation scala i: Int 
 //                                kind Parameter
-//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#failIfNotData().(state)
     case DATA | ARRBEG => // do nothing
 //       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#DATA.
@@ -1773,26 +1773,26 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                                 display_name stackTail
 //                                                                 signature_documentation scala stackTail: List[ObjArrVisitor[local83, J[] 
 //                                                                 kind Parameter
-//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
+//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
 //                                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
 //                                                                                               display_name i
 //                                                                                               signature_documentation scala i: Int 
 //                                                                                               kind Parameter
-//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if (stackTail.isEmpty) {
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
-//                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#isEmpty().
+//                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#isEmpty().
       Some(try stackHead.visitEnd(i) catch reject(i), i + 1)
-//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackHead)
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
 //                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
-//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     } else {
       val ctxt2 = stackTail.head.narrow
 //        ^^^^^ definition local 86
@@ -1800,7 +1800,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //              signature_documentation scala ctxt2: ObjArrVisitor[Any, J] 
 //              kind Variable
 //                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(stackTail)
-//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
+//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#narrow().
       try ctxt2.visitValue(stackHead.visitEnd(i), i) catch reject(i)
 //        ^^^^^ reference local 86
@@ -1812,7 +1812,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#reject().
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#tryCloseCollection().(i)
       None
-//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
 
     }
   }
@@ -1850,8 +1850,8 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                              display_name i
 //                                              signature_documentation scala i: Int 
 //                                              kind Parameter
-//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 91
 //        display_name j
@@ -1869,25 +1869,25 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                            ^ reference local 91
     while (c != '"') {
 //         ^ reference local 92
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+2).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+2).
       if (c < ' ') die(j, s"control char (${c}) in string")
 //        ^ reference local 92
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+2).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+2).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference local 91
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
 //                                          ^ reference local 92
       if (c == '\\' || c > 127) return -1 - j
 //        ^ reference local 92
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+2).
-//                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+2).
+//                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                     ^ reference local 92
-//                       ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>`(+3).
-//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                       ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>`(+3).
+//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                          ^ reference local 91
       j += 1
 //    ^ reference local 91
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = elemOps.toUnsignedInt(getByteSafe(j))
 //    ^ reference local 92
 //        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#elemOps.
@@ -1897,7 +1897,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
     }
     j + 1
 //  ^ reference local 91
-//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
   }
 
   /**
@@ -1912,8 +1912,8 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                display_name i0
 //                                                signature_documentation scala i0: Int 
 //                                                kind Parameter
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var i = i0
 //      ^ definition local 94
 //        display_name i
@@ -1931,63 +1931,63 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                            ^ reference local 94
     while (c != '"') {
 //         ^ reference local 95
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+2).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+2).
 
       if (c < ' ') die(i, s"control char (${c}) in string")
 //        ^ reference local 95
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+2).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+2).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                     ^ reference local 94
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
 //                                          ^ reference local 95
       else if (c == '\\') {
 //             ^ reference local 95
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+2).
         (getByteSafe(i + 1): @switch) match {
 //       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#getByteSafe().
 //                   ^ reference local 94
-//                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 'b' => { outputBuilder.append('\b'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 'f' => { outputBuilder.append('\f'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 'n' => { outputBuilder.append('\n'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 'r' => { outputBuilder.append('\r'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 't' => { outputBuilder.append('\t'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
           case '"' => { outputBuilder.append('"'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                 ^ reference local 94
-//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case '/' => { outputBuilder.append('/'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                 ^ reference local 94
-//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case '\\' => { outputBuilder.append('\\'); i += 2 }
 //                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#append().
 //                                                   ^ reference local 94
-//                                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
           // if there's a problem then descape will explode
           case 'u' =>
@@ -2005,7 +2005,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
             i += 6
 //          ^ reference local 94
-//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
           case c => die(i + 1, s"illegal escape sequence after \\")
 //             ^ definition local 98
@@ -2014,8 +2014,8 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //               kind Variable
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#die().
 //                      ^ reference local 94
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
         }
       } else {
         // this case is for "normal" code points that are just one Char.
@@ -2029,7 +2029,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                           ^ reference local 95
         i += 1
 //      ^ reference local 94
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       }
       c = elemOps.toUnsignedInt(getByteSafe(i))
 //    ^ reference local 95
@@ -2041,7 +2041,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 
     i + 1
 //  ^ reference local 94
-//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
   }
 
   /**
@@ -2061,14 +2061,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                             display_name i
 //                                             signature_documentation scala i: Int 
 //                                             kind Parameter
-//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(stackHead)
 //                                                             display_name stackHead
 //                                                             signature_documentation scala stackHead: ObjArrVisitor[local99, J[ 
 //                                                             kind Parameter
 //                                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 100
@@ -2077,20 +2077,20 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 100
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
       visitString(i, unsafeCharSeqForRange(i + 1, k - i - 2), stackHead)
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
 //                   ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
-//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                ^ reference local 100
-//                                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(i)
-//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringValue().(stackHead)
       k
 //    ^ reference local 100
@@ -2123,14 +2123,14 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                           display_name i
 //                                           signature_documentation scala i: Int 
 //                                           kind Parameter
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(stackHead)
 //                                                           display_name stackHead
 //                                                           signature_documentation scala stackHead: ObjArrVisitor[local102, J[ 
 //                                                           kind Parameter
 //                                                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 103
@@ -2139,20 +2139,20 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 103
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
       visitStringKey(i, unsafeCharSeqForRange(i + 1, k - i - 2), stackHead)
 //    ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
 //                      ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
-//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                   ^ reference local 103
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(i)
-//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringKey().(stackHead)
       k
 //    ^ reference local 103
@@ -2186,12 +2186,12 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                 display_name i
 //                                 signature_documentation scala i: Int 
 //                                 kind Parameter
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
 //                                         display_name k
 //                                         signature_documentation scala k: Int 
 //                                         kind Parameter
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     outputBuilder.reset()
 //  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ByteBuilder#reset().
@@ -2199,11 +2199,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //  ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#appendBytesToBuilder().
 //                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#outputBuilder.
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(i)
-//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
+//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
-//                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
-//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(i)
     val k2 = parseStringComplex(-k - 1)
 //      ^^ definition local 105
@@ -2211,9 +2211,9 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //         signature_documentation scala k2: Int 
 //         kind Variable
 //           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringComplex().
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringToOutputBuilder().(k)
-//                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
     k2
 //  ^^ reference local 105
   }
@@ -2227,7 +2227,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                  display_name i
 //                  signature_documentation scala i: Int 
 //                  kind Parameter
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitString().(s)
 //                          display_name s
 //                          signature_documentation scala s: CharSequence 
@@ -2265,7 +2265,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                     display_name i
 //                     signature_documentation scala i: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#visitStringKey().(s)
 //                             display_name s
 //                             signature_documentation scala s: CharSequence 
@@ -2313,7 +2313,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                display_name i
 //                                                signature_documentation scala i: Int 
 //                                                kind Parameter
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(facade)
 //                                                             display_name facade
 //                                                             signature_documentation scala facade: Visitor[local112, J[ 
@@ -2321,7 +2321,7 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 113
@@ -2330,10 +2330,10 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 113
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
       val res = facade.visitString(unsafeCharSeqForRange(i + 1, k - i - 2), i)
 //        ^^^ definition local 114
 //            display_name res
@@ -2343,11 +2343,11 @@ abstract class ByteParser[J] extends upickle.core.BufferingByteParser{
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingByteParser#unsafeCharSeqForRange().
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
-//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                              ^ reference local 113
-//                                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
-//                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#parseStringTopLevel().(i)
       (res, k)
 //     ^^^ reference local 114
diff --git a/tests/snapshots/src/main/generated/CharParser.scala b/tests/snapshots/src/main/generated/CharParser.scala
index 793fd5eea..f25ff3dd5 100644
--- a/tests/snapshots/src/main/generated/CharParser.scala
+++ b/tests/snapshots/src/main/generated/CharParser.scala
@@ -26,8 +26,8 @@ import java.nio.charset.Charset
 import scala.annotation.{switch, tailrec}
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
-//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
+//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
+//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
 
 /**
   * A specialized JSON parse that can parse Chars (Chars or Bytes), sending
@@ -80,7 +80,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          display_name i
 //                          signature_documentation scala i: Int 
 //                          kind Parameter
-//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if (requestUntil(i)) throw new IncompleteParseException("exhausted input")
 //      ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#requestUntil().
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().(i)
@@ -97,8 +97,8 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                           display_name i
 //                           signature_documentation scala i: Int 
 //                           kind Parameter
-//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
+//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
     requestUntilOrThrow(i)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().(i)
@@ -119,7 +119,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                            display_name i
 //                            signature_documentation scala i: Int 
 //                            kind Parameter
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#requestUntil().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().(i)
 
@@ -133,56 +133,56 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          kind AbstractMethod
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#close().
 //                          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#close().
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 
   /**
    * Valid parser states.
    */
   @inline private[this] final val ARRBEG = 6
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
 //                                       display_name ARRBEG
 //                                       signature_documentation scala @inline\nprivate[this] final val ARRBEG: 6
 //                                       kind Method
   @inline private[this] final val OBJBEG = 7
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
 //                                       display_name OBJBEG
 //                                       signature_documentation scala @inline\nprivate[this] final val OBJBEG: 7
 //                                       kind Method
   @inline private[this] final val DATA = 1
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
 //                                     display_name DATA
 //                                     signature_documentation scala @inline\nprivate[this] final val DATA: 1
 //                                     kind Method
   @inline private[this] final val KEY = 2
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#KEY.
 //                                    display_name KEY
 //                                    signature_documentation scala @inline\nprivate[this] final val KEY: 2
 //                                    kind Method
   @inline private[this] final val COLON = 3
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#COLON.
 //                                      display_name COLON
 //                                      signature_documentation scala @inline\nprivate[this] final val COLON: 3
 //                                      kind Method
   @inline private[this] final val ARREND = 4
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARREND.
 //                                       display_name ARREND
 //                                       signature_documentation scala @inline\nprivate[this] final val ARREND: 4
 //                                       kind Method
   @inline private[this] final val OBJEND = 5
-// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/inline#`<init>`().
+// ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/inline#`<init>`().
 //                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJEND.
 //                                       display_name OBJEND
 //                                       signature_documentation scala @inline\nprivate[this] final val OBJEND: 5
@@ -225,7 +225,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        kind Variable
 //          ^ reference local 3
     while (!atEof(j)) {
-//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
+//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`unary_!`().
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                ^ reference local 4
       (getCharSafe(j): @switch) match {
@@ -233,14 +233,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                 ^ reference local 4
         case '\n' | ' ' | '\t' | '\r' => j += 1
 //                                       ^ reference local 4
-//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         case _ => die(j, "expected whitespace or eof")
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                    ^ reference local 4
       }
     }
     if (!atEof(j)) die(j, "expected eof")
-//      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`unary_!`().
+//      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`unary_!`().
 //       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //             ^ reference local 4
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
@@ -263,12 +263,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                          display_name i
 //                          signature_documentation scala i: Int 
 //                          kind Parameter
-//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(msg)
 //                                    display_name msg
 //                                    signature_documentation scala msg: String 
 //                                    kind Parameter
-//                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                              ^^^^^^^ reference semanticdb maven . . scala/Nothing#
     val out = new upickle.core.CharBuilder()
 //      ^^^ definition local 6
@@ -292,14 +292,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       out,
 //    ^^^ reference local 6
       new ArrayCharSequence(Array(elemOps.toInt(getCharSafe(i)).toChar)),
-//        ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrayCharSequence#
-//                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrayCharSequence#`<init>`().
-//                          ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array.
+//        ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrayCharSequence#
+//                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrayCharSequence#`<init>`().
+//                          ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array.
 //                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
 //                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharOps.toInt().
 //                                              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(i)
-//                                                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#toChar().
+//                                                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#toChar().
       unicode = false
 //    ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.escapeChar().(unicode)
     )
@@ -308,7 +308,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        display_name s
 //        signature_documentation scala s: String 
 //        kind Variable
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/StringOps#format().
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/StringOps#format().
 //                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().(msg)
 //                                   ^^^ reference local 6
 //                                       ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#makeString().
@@ -337,7 +337,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                     display_name i
 //                                     signature_documentation scala i: Int 
 //                                     kind Parameter
-//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                           ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(ctxt)
 //                                                display_name ctxt
 //                                                signature_documentation scala ctxt: ObjArrVisitor[Any, J] 
@@ -351,7 +351,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                                               kind Parameter
 //                                                                                ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 9
 //        display_name j
@@ -378,10 +378,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == '-') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -389,10 +389,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     }
     if (c == '0') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -410,7 +410,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 10
         j += 1;
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -418,7 +418,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j == j0) die(i, "expected digit")
 //        ^ reference local 9
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //             ^^ reference local 13
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
@@ -426,15 +426,15 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == '.') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       decIndex = j - i
 //    ^^^^^^^^ reference local 11
 //               ^ reference local 9
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -451,7 +451,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 10
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -459,7 +459,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 15
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //              ^ reference local 9
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
@@ -467,31 +467,31 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == 'e' || c == 'E') {
 //      ^ reference local 10
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                  ^ reference local 10
-//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       expIndex = j - i
 //    ^^^^^^^^ reference local 12
 //               ^ reference local 9
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
       j += 1
 //    ^ reference local 9
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 10
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                    ^ reference local 9
       if (c == '+' || c == '-') {
 //        ^ reference local 10
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                    ^ reference local 10
-//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -509,7 +509,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 10
         j += 1
 //      ^ reference local 9
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 10
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -517,7 +517,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j0 == j)  die(i, "expected digit")
 //        ^^ reference local 17
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //              ^ reference local 9
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNum().(i)
@@ -553,25 +553,25 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                display_name decIndex
 //                                                signature_documentation scala decIndex: Int 
 //                                                kind Parameter
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          expIndex: Int,
 //                                       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(expIndex)
 //                                                display_name expIndex
 //                                                signature_documentation scala expIndex: Int 
 //                                                kind Parameter
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          i: Int,
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(i)
 //                                         display_name i
 //                                         signature_documentation scala i: Int 
 //                                         kind Parameter
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                          j: Int) = {
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(j)
 //                                         display_name j
 //                                         signature_documentation scala j: Int 
 //                                         kind Parameter
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     facade.visitFloat64StringParts(
 //  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(facade)
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
@@ -579,7 +579,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //    ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(i)
 //                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(j)
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(i)
       decIndex,
 //    ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitFloat64StringPartsWithWrapper().(decIndex)
@@ -613,7 +613,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                             display_name i
 //                                             signature_documentation scala i: Int 
 //                                             kind Parameter
-//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(facade)
 //                                                          display_name facade
 //                                                          signature_documentation scala facade: Visitor[local20, J[ 
@@ -621,7 +621,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                           ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 21
 //        display_name j
@@ -648,11 +648,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == '-') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       // any valid input will require at least one digit after -
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -660,10 +660,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     }
     if (c == '0') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       if (atEof(j)) {
 //        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //              ^ reference local 21
@@ -693,7 +693,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                ^ reference local 21
@@ -713,7 +713,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 25
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //              ^ reference local 21
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
@@ -721,16 +721,16 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == '.') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       // any valid input will require at least one digit after .
       decIndex = j - i
 //    ^^^^^^^^ reference local 23
 //               ^ reference local 21
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -747,7 +747,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                ^ reference local 21
@@ -767,7 +767,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if(j0 == j) die(i, "expected digit")
 //       ^^ reference local 27
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //             ^ reference local 21
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
@@ -775,32 +775,32 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     if (c == 'e' || c == 'E') {
 //      ^ reference local 22
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                  ^ reference local 22
-//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       // any valid input will require at least one digit after e, e+, etc
       expIndex = j - i
 //    ^^^^^^^^ reference local 24
 //               ^ reference local 21
-//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
       j += 1
 //    ^ reference local 21
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = getCharSafe(j)
 //    ^ reference local 22
 //        ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                    ^ reference local 21
       if (c == '+' || c == '-') {
 //        ^ reference local 22
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                    ^ reference local 22
-//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         c = getCharSafe(j)
 //      ^ reference local 22
 //          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
@@ -818,7 +818,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                               ^ reference local 22
         j += 1
 //      ^ reference local 21
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
         if (atEof(j)) {
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#atEof().
 //                ^ reference local 21
@@ -838,7 +838,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       }
       if (j0 == j) die(i, "expected digit")
 //        ^^ reference local 29
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //              ^ reference local 21
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNumTopLevel().(i)
@@ -869,8 +869,8 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                    display_name i
 //                                    signature_documentation scala i: Int 
 //                                    kind Parameter
-//                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
+//                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
     import upickle.core.RenderUtils.hex
 //         ^^^^^^^ reference semanticdb maven . . upickle/
 //                 ^^^^ reference semanticdb maven . . upickle/core/
@@ -884,46 +884,46 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     x = (x << 4) | hex(getCharSafe(i+2).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#toInt().
     x = (x << 4) | hex(getCharSafe(i+3).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#toInt().
     x = (x << 4) | hex(getCharSafe(i+4).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#toInt().
     x = (x << 4) | hex(getCharSafe(i+5).toInt)
 //  ^ reference local 31
 //       ^ reference local 31
-//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<<`().
-//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`|`(+3).
+//         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<<`().
+//               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`|`(+3).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/RenderUtils.hex().
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#descape().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#toInt().
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                      ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#toInt().
     x.toChar
 //  ^ reference local 31
-//    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#toChar().
+//    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#toChar().
   }
 
 
@@ -941,7 +941,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                      display_name i
 //                                      signature_documentation scala i: Int 
 //                                      kind Parameter
-//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(facade)
 //                                                   display_name facade
 //                                                   signature_documentation scala facade: Visitor[local32, J[ 
@@ -952,22 +952,22 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     requestUntilOrThrow(i + 3)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (getCharUnsafe(i + 1) == 'r' && getCharUnsafe(i + 2) == 'u' && getCharUnsafe(i + 3) == 'e') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       facade.visitTrue(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTrue().(facade)
 //           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitTrue().
@@ -993,7 +993,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                       display_name i
 //                                       signature_documentation scala i: Int 
 //                                       kind Parameter
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(facade)
 //                                                    display_name facade
 //                                                    signature_documentation scala facade: Visitor[local33, J[ 
@@ -1004,28 +1004,28 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     requestUntilOrThrow(i + 4)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
     if (getCharUnsafe(i + 1) == 'a' && getCharUnsafe(i + 2) == 'l' && getCharUnsafe(i + 3) == 's' && getCharUnsafe(i + 4) == 'e') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                                                                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                                                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                                                                                   ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(i)
-//                                                                                                                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                                                                                        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                                                                                                   ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                                                                                        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       facade.visitFalse(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().(facade)
 //           ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFalse().
@@ -1051,7 +1051,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                      display_name i
 //                                      signature_documentation scala i: Int 
 //                                      kind Parameter
-//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(facade)
 //                                                   display_name facade
 //                                                   signature_documentation scala facade: Visitor[local34, J[ 
@@ -1062,22 +1062,22 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     requestUntilOrThrow(i + 3)
 //  ^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#requestUntilOrThrow().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (getCharUnsafe(i + 1) == 'u' && getCharUnsafe(i + 2) == 'l' && getCharUnsafe(i + 3) == 'l') {
 //      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
-//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
-//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`&&`().
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
+//                                                                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`&&`().
 //                                                                    ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#getCharUnsafe().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(i)
-//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#`==`(+2).
+//                                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#`==`(+2).
       facade.visitNull(i)
 //    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().(facade)
 //           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitNull().
@@ -1098,7 +1098,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                          display_name i
 //                                          signature_documentation scala i: Int 
 //                                          kind Parameter
-//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(facade)
 //                                                       display_name facade
 //                                                       signature_documentation scala facade: Visitor[local35, J[ 
@@ -1106,7 +1106,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     try parseTopLevel0(i, facade)
 //      ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel().(i)
@@ -1119,8 +1119,8 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    * Parse and return the next JSON value and the position beyond it.
    */
   @tailrec
-// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#`<init>`().
+// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseTopLevel0(i: Int, facade: Visitor[_, J]): (J, Int) = {
 //                          ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                                         display_name parseTopLevel0
@@ -1130,7 +1130,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                           display_name i
 //                                           signature_documentation scala i: Int 
 //                                           kind Parameter
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                                        display_name facade
 //                                                        signature_documentation scala facade: Visitor[local38, J[ 
@@ -1138,7 +1138,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     (getCharSafe(i): @switch) match {
 //   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
@@ -1146,12 +1146,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
       case ' ' | '\t' | 'r' => parseTopLevel0(i + 1, facade)
 //                             ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                   ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
       case '\n' => parseTopLevel0(i + 1, facade)
 //                 ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                       ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 
       // if we have a recursive top-level structure, we'll delegate the parsing
@@ -1160,20 +1160,20 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                           ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Nil.
+//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Nil.
       case '{' => parseNested(OBJBEG, i + 1, facade.visitObject(-1, i), Nil)
 //                ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                            ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                           ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                                  ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Nil.
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Nil.
 
       // we have a single top-level number
       case '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' => parseNumTopLevel(i, facade)
@@ -1193,19 +1193,19 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
 //                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       case 'f' => (parseFalse(i, facade), i + 5)
 //                 ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseFalse().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       case 'n' => (parseNull(i, facade), i + 4)
 //                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNull().
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
 //                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(facade)
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseTopLevel0().(i)
-//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
       // invalid
       case _ => die(i, "expected json value")
@@ -1223,9 +1223,9 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //             display_name j
 //             signature_documentation scala j: Int 
 //             kind Parameter
-//              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/PartialFunction#
-//                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Throwable#
+//              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/PartialFunction#
+//                                    ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Throwable#
 //                                               ^^^^^^^ reference semanticdb maven . . scala/Nothing#
 //                                                          ^ definition local 39
 //                                                            display_name $anonfun
@@ -1263,8 +1263,8 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
    * @param path the json path in the tree
    */
   @tailrec
-// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#`<init>`().
+// ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#`<init>`().
   protected[this] final def parseNested(state: Int,
 //                          ^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                      display_name parseNested
@@ -1274,13 +1274,13 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                            display_name state
 //                                            signature_documentation scala state: Int 
 //                                            kind Parameter
-//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                         i: Int,
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
 //                                        display_name i
 //                                        signature_documentation scala i: Int 
 //                                        kind Parameter
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                                         stackHead: ObjArrVisitor[_, J],
 //                                      ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                display_name stackHead
@@ -1293,11 +1293,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                display_name stackTail
 //                                                signature_documentation scala stackTail: List[ObjArrVisitor[local51, J[] 
 //                                                kind Parameter
-//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
+//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
 //                                                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     (getCharSafe(i): @switch) match{
 //   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
@@ -1306,7 +1306,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(state)
 //                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
@@ -1369,7 +1369,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
           case _ => dieWithFailureMessage(i, state)
@@ -1403,10 +1403,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#ARRBEG.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                 ^^^ reference local 58
 //                                      ^^^^^^^^^ reference local 62
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#`::`().
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#`::`().
 //                                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
       case '{' =>
@@ -1434,10 +1434,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //      ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                  ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#OBJBEG.
 //                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                 ^^^ reference local 63
 //                                      ^^^^^^^^^ reference local 67
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#`::`().
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#`::`().
 //                                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
       case '-' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' =>
@@ -1499,7 +1499,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
@@ -1531,7 +1531,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
@@ -1563,7 +1563,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 
@@ -1578,7 +1578,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                   ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
           case OBJEND => parseNested(KEY, i + 1, stackHead, stackTail)
@@ -1586,7 +1586,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                                   ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#KEY.
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackHead)
 //                                                          ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
           case _ => dieWithFailureMessage(i, state)
@@ -1607,30 +1607,30 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                        ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
               case Some(t) => t
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                      ^ definition local 77
 //                        display_name t
 //                        signature_documentation scala t: (J, Int) 
 //                        kind Variable
 //                            ^ reference local 77
               case None =>
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 78
 //                                display_name stackTailHead
 //                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
 //                                kind Variable
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
-//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
+//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                           ^^^^^^^^^^^^^ reference local 78
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                                  ^^^^^^^^^^^^^ reference local 78
 //                                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
-//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#tail().
+//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#tail().
             }
           case _ => dieWithFailureMessage(i, state)
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().
@@ -1650,30 +1650,30 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                        ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
               case Some(t) => t
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                      ^ definition local 79
 //                        display_name t
 //                        signature_documentation scala t: (J, Int) 
 //                        kind Variable
 //                            ^ reference local 79
               case None =>
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
                 val stackTailHead = stackTail.head
 //                  ^^^^^^^^^^^^^ definition local 80
 //                                display_name stackTailHead
 //                                signature_documentation scala stackTailHead: ObjArrVisitor[local51, J[ 
 //                                kind Variable
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
-//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
+//                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
                 parseNested(collectionEndFor(stackTailHead), i + 1, stackTailHead, stackTail.tail)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().
 //                          ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#collectionEndFor().
 //                                           ^^^^^^^^^^^^^ reference local 80
 //                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(i)
-//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                                  ^^^^^^^^^^^^^ reference local 80
 //                                                                                 ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseNested().(stackTail)
-//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#tail().
+//                                                                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#tail().
             }
           case _ => dieWithFailureMessage(i, state)
 //                  ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().
@@ -1698,12 +1698,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                            display_name i
 //                            signature_documentation scala i: Int 
 //                            kind Parameter
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(state)
 //                                        display_name state
 //                                        signature_documentation scala state: Int 
 //                                        kind Parameter
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     val expected = state match{
 //      ^^^^^^^^ definition local 81
 //               display_name expected
@@ -1728,7 +1728,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     die(i, s"expected $expected")
 //  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#dieWithFailureMessage().(i)
-//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
 //                     ^^^^^^^^ reference local 81
   }
 
@@ -1741,12 +1741,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                        display_name state
 //                        signature_documentation scala state: Int 
 //                        kind Parameter
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(i)
 //                                display_name i
 //                                signature_documentation scala i: Int 
 //                                kind Parameter
-//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#failIfNotData().(state)
     case DATA | ARRBEG => // do nothing
 //       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#DATA.
@@ -1772,26 +1772,26 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                                 display_name stackTail
 //                                                                 signature_documentation scala stackTail: List[ObjArrVisitor[local83, J[] 
 //                                                                 kind Parameter
-//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.List#
+//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.List#
 //                                                                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
 //                                                                                               display_name i
 //                                                                                               signature_documentation scala i: Int 
 //                                                                                               kind Parameter
-//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if (stackTail.isEmpty) {
 //      ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
-//                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/immutable/List#isEmpty().
+//                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/immutable/List#isEmpty().
       Some(try stackHead.visitEnd(i) catch reject(i), i + 1)
-//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //             ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackHead)
 //                       ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitEnd().
 //                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
 //                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
-//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     } else {
       val ctxt2 = stackTail.head.narrow
 //        ^^^^^ definition local 86
@@ -1799,7 +1799,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //              signature_documentation scala ctxt2: ObjArrVisitor[Any, J] 
 //              kind Variable
 //                ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(stackTail)
-//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#head().
+//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOps#head().
 //                               ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#narrow().
       try ctxt2.visitValue(stackHead.visitEnd(i), i) catch reject(i)
 //        ^^^^^ reference local 86
@@ -1811,7 +1811,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#reject().
 //                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#tryCloseCollection().(i)
       None
-//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
 
     }
   }
@@ -1849,8 +1849,8 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                              display_name i
 //                                              signature_documentation scala i: Int 
 //                                              kind Parameter
-//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var j = i
 //      ^ definition local 91
 //        display_name j
@@ -1868,25 +1868,25 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                            ^ reference local 91
     while (c != '"') {
 //         ^ reference local 92
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+2).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+2).
       if (c < ' ') die(j, s"control char (${c}) in string")
 //        ^ reference local 92
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+2).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+2).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference local 91
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
 //                                          ^ reference local 92
       if (c == '\\' || c > 127) return -1 - j
 //        ^ reference local 92
-//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+2).
-//                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+2).
+//                  ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                     ^ reference local 92
-//                       ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>`(+3).
-//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                       ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>`(+3).
+//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                          ^ reference local 91
       j += 1
 //    ^ reference local 91
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       c = elemOps.toUnsignedInt(getCharSafe(j))
 //    ^ reference local 92
 //        ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#elemOps.
@@ -1896,7 +1896,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
     }
     j + 1
 //  ^ reference local 91
-//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
   }
 
   /**
@@ -1911,8 +1911,8 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                display_name i0
 //                                                signature_documentation scala i0: Int 
 //                                                kind Parameter
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     var i = i0
 //      ^ definition local 94
 //        display_name i
@@ -1930,63 +1930,63 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                            ^ reference local 94
     while (c != '"') {
 //         ^ reference local 95
-//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+2).
+//           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+2).
 
       if (c < ' ') die(i, s"control char (${c}) in string")
 //        ^ reference local 95
-//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+2).
+//          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+2).
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                     ^ reference local 94
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
 //                                          ^ reference local 95
       else if (c == '\\') {
 //             ^ reference local 95
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+2).
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+2).
         (getCharSafe(i + 1): @switch) match {
 //       ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#getCharSafe().
 //                   ^ reference local 94
-//                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 'b' => { outputBuilder.append('\b'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 'f' => { outputBuilder.append('\f'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 'n' => { outputBuilder.append('\n'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 'r' => { outputBuilder.append('\r'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case 't' => { outputBuilder.append('\t'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                  ^ reference local 94
-//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
           case '"' => { outputBuilder.append('"'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                 ^ reference local 94
-//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case '/' => { outputBuilder.append('/'); i += 2 }
 //                      ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                    ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                 ^ reference local 94
-//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
           case '\\' => { outputBuilder.append('\\'); i += 2 }
 //                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#append(+1).
 //                                                   ^ reference local 94
-//                                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
           // if there's a problem then descape will explode
           case 'u' =>
@@ -2004,7 +2004,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
             i += 6
 //          ^ reference local 94
-//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//            ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 
           case c => die(i + 1, s"illegal escape sequence after \\")
 //             ^ definition local 98
@@ -2013,8 +2013,8 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //               kind Variable
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#die().
 //                      ^ reference local 94
-//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
         }
       } else {
         // this case is for "normal" code points that are just one Char.
@@ -2028,7 +2028,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                           ^ reference local 95
         i += 1
 //      ^ reference local 94
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
       }
       c = elemOps.toUnsignedInt(getCharSafe(i))
 //    ^ reference local 95
@@ -2040,7 +2040,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 
     i + 1
 //  ^ reference local 94
-//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
   }
 
   /**
@@ -2060,14 +2060,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                             display_name i
 //                                             signature_documentation scala i: Int 
 //                                             kind Parameter
-//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(stackHead)
 //                                                             display_name stackHead
 //                                                             signature_documentation scala stackHead: ObjArrVisitor[local99, J[ 
 //                                                             kind Parameter
 //                                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 100
@@ -2076,20 +2076,20 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 100
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
       visitString(i, unsafeCharSeqForRange(i + 1, k - i - 2), stackHead)
 //    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().
 //                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
 //                   ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
-//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                ^ reference local 100
-//                                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(i)
-//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                      ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                            ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringValue().(stackHead)
       k
 //    ^ reference local 100
@@ -2122,14 +2122,14 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                           display_name i
 //                                           signature_documentation scala i: Int 
 //                                           kind Parameter
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(stackHead)
 //                                                           display_name stackHead
 //                                                           signature_documentation scala stackHead: ObjArrVisitor[local102, J[ 
 //                                                           kind Parameter
 //                                                            ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#
 //                                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 103
@@ -2138,20 +2138,20 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 103
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
       visitStringKey(i, unsafeCharSeqForRange(i + 1, k - i - 2), stackHead)
 //    ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().
 //                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
 //                      ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
-//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                   ^ reference local 103
-//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                     ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(i)
-//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                               ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringKey().(stackHead)
       k
 //    ^ reference local 103
@@ -2185,12 +2185,12 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                 display_name i
 //                                 signature_documentation scala i: Int 
 //                                 kind Parameter
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
 //                                         display_name k
 //                                         signature_documentation scala k: Int 
 //                                         kind Parameter
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     outputBuilder.reset()
 //  ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                ^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/CharBuilder#reset().
@@ -2198,11 +2198,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //  ^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#appendCharsToBuilder().
 //                       ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#outputBuilder.
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(i)
-//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
-//                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
+//                                        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
+//                                             ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
-//                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
-//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
+//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(i)
     val k2 = parseStringComplex(-k - 1)
 //      ^^ definition local 105
@@ -2210,9 +2210,9 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //         signature_documentation scala k2: Int 
 //         kind Variable
 //           ^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringComplex().
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`unary_-`().
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`unary_-`().
 //                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringToOutputBuilder().(k)
-//                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                 ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
     k2
 //  ^^ reference local 105
   }
@@ -2226,7 +2226,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                  display_name i
 //                  signature_documentation scala i: Int 
 //                  kind Parameter
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                        ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitString().(s)
 //                          display_name s
 //                          signature_documentation scala s: CharSequence 
@@ -2264,7 +2264,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                     display_name i
 //                     signature_documentation scala i: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#visitStringKey().(s)
 //                             display_name s
 //                             signature_documentation scala s: CharSequence 
@@ -2312,7 +2312,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                display_name i
 //                                                signature_documentation scala i: Int 
 //                                                kind Parameter
-//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                      ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(facade)
 //                                                             display_name facade
 //                                                             signature_documentation scala facade: Visitor[local112, J[ 
@@ -2320,7 +2320,7 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                                                              ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#[J]
-//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     val k = parseStringSimple(i + 1)
 //      ^ definition local 113
@@ -2329,10 +2329,10 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //        kind Variable
 //          ^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringSimple().
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
-//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                              ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     if (k >= 0) {
 //      ^ reference local 113
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`>=`(+3).
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`>=`(+3).
       val res = facade.visitString(unsafeCharSeqForRange(i + 1, k - i - 2), i)
 //        ^^^ definition local 114
 //            display_name res
@@ -2342,11 +2342,11 @@ abstract class CharParser[J] extends upickle.core.BufferingCharParser{
 //                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                 ^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/BufferingCharParser#unsafeCharSeqForRange().
 //                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
-//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                         ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                              ^ reference local 113
-//                                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                                ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
-//                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#parseStringTopLevel().(i)
       (res, k)
 //     ^^^ reference local 114
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
index 1e0557745..e9f30b54a 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java
@@ -10,8 +10,6 @@ interface BaseEpoxyTouchCallback<T extends EpoxyModel> {
 //                               display_name BaseEpoxyTouchCallback
 //                               signature_documentation java interface BaseEpoxyTouchCallback<T extends EpoxyModel>
 //                               kind Interface
-//                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxyDragCallback#
-//                               relationship is_reference is_implementation semanticdb maven . . com/airbnb/epoxy/EpoxySwipeCallback#
 //                               ^ definition semanticdb maven . . com/airbnb/epoxy/BaseEpoxyTouchCallback#[T]
 //                                 display_name T
 //                                 signature_documentation java T extends EpoxyModel
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
index 04f934c12..b6eb6e1b4 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
@@ -354,7 +354,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
 //                                 display_name RequestedModelBuildType
 //                                 signature_documentation java @Retention(RetentionPolicy.SOURCE)\n@IntDef({RequestedModelBuildType.NONE, RequestedModelBuildType.NEXT_FRAME, RequestedModelBuildType.DELAYED})\nprivate @interface RequestedModelBuildType
 //                                 kind Interface
-//                                 relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                                 relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 //         ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#
 //                                 ^^^^ reference semanticdb maven . . com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE.
       RequestedModelBuildType.NEXT_FRAME,
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
index afb6e55bb..22055cde6 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java
@@ -48,7 +48,7 @@ class UpdateOp {
 //                display_name Type
 //                signature_documentation java @IntDef({ADD, REMOVE, UPDATE, MOVE})\n@Retention(RetentionPolicy.SOURCE)\n@interface Type
 //                kind Interface
-//                relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
   }
 
   static final int ADD = 0;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
index f7510761a..5f3c5a09b 100644
--- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
+++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java
@@ -50,7 +50,7 @@ public final class VisibilityState {
 //                             display_name Visibility
 //                             signature_documentation java @Retention(RetentionPolicy.SOURCE)\n@IntDef({VISIBLE, INVISIBLE, FOCUSED_VISIBLE, UNFOCUSED_VISIBLE, FULL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_INVISIBLE})\npublic @interface Visibility
 //                             kind Interface
-//                             relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                             relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
   }
 
   /**
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
index 411a1920d..0c3a9db61 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/Annotations.java
@@ -55,7 +55,7 @@
 //                            display_name Annotations
 //                            signature_documentation java @Documented\n@Retention(RetentionPolicy.RUNTIME)\n@Target({CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})\npublic @interface Annotations
 //                            kind Interface
-//                            relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                            relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 
   String value() default "";
 //^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationsOnParameterizedTypes.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationsOnParameterizedTypes.java
index 79922891a..40c1222e0 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationsOnParameterizedTypes.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationsOnParameterizedTypes.java
@@ -28,7 +28,9 @@
 
 public interface AnnotationsOnParameterizedTypes {
 //               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#
-//                                               documentation ```java\npublic interface AnnotationsOnParameterizedTypes\n```
+//                                               display_name AnnotationsOnParameterizedTypes
+//                                               signature_documentation java public interface AnnotationsOnParameterizedTypes
+//                                               kind Interface
 
   public static AnnotationsOnParameterizedTypes getInstance() {
     return new AnnotationsOnParameterizedTypesImpl();
@@ -40,47 +42,66 @@ public static AnnotationsOnParameterizedTypes getInstance() {
 
 class AnnotationsOnParameterizedTypesImpl implements AnnotationsOnParameterizedTypes {
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#
-//                                        documentation ```java\nclass AnnotationsOnParameterizedTypesImpl\n```
+//                                        display_name AnnotationsOnParameterizedTypesImpl
+//                                        signature_documentation java class AnnotationsOnParameterizedTypesImpl
+//                                        kind Class
 //                                        relationship is_implementation semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#
 //    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#`<init>`().
-//                                        documentation ```java\nAnnotationsOnParameterizedTypesImpl()\n```
+//                                        display_name <init>
+//                                        signature_documentation java AnnotationsOnParameterizedTypesImpl()
+//                                        kind Constructor
 //                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#
   private ConcurrentMap<Class<?>, Constructor<?>> proxyConstructors = new ConcurrentHashMap<>();
 //        ^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/ConcurrentMap#
 //                      ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                                                ^^^^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors.
-//                                                                  documentation ```java\nprivate ConcurrentMap<Class<?>, Constructor<?>> proxyConstructors\n```
+//                                                                  display_name proxyConstructors
+//                                                                  signature_documentation java private ConcurrentMap<Class<?>, Constructor<?>> proxyConstructors
+//                                                                  kind Field
 //                                                                        ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/ConcurrentHashMap#`<init>`().
 
   @Override
 // ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Override#
   public <C, W> Function<W, C> adapter(Class<C> contract, Class<W> wrappedClass) {
 //        ^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C]
-//          documentation ```java\nC\n```
+//          display_name C
+//          signature_documentation java C
+//          kind TypeParameter
 //           ^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W]
-//             documentation ```java\nW\n```
+//             display_name W
+//             signature_documentation java W
+//             kind TypeParameter
 //              ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //                       ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W]
 //                          ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C]
 //                             ^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().
-//                                     documentation ```java\n@Override\npublic <C, W> Function<W, C> adapter(Class<C> contract, Class<W> wrappedClass)\n```
+//                                     display_name adapter
+//                                     signature_documentation java @Override\npublic <C, W> Function<W, C> adapter(Class<C> contract, Class<W> wrappedClass)
+//                                     kind Method
 //                                     relationship is_reference is_implementation semanticdb maven . . minimized/AnnotationsOnParameterizedTypes#adapter().
 //                                     ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                           ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C]
 //                                              ^^^^^^^^ definition local 0
-//                                                       documentation ```java\nClass<C> contract\n```
+//                                                       display_name contract
+//                                                       signature_documentation java Class<C> contract
+//                                                       enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().
 //                                                        ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                              ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[W]
 //                                                                 ^^^^^^^^^^^^ definition local 1
-//                                                                              documentation ```java\nClass<W> wrappedClass\n```
+//                                                                              display_name wrappedClass
+//                                                                              signature_documentation java Class<W> wrappedClass
+//                                                                              enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().
 
     Function<InvocationHandler, C> constructor = getConstructor(contract);
 //  ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //           ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationHandler#
 //                              ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().[C]
 //                                 ^^^^^^^^^^^ definition local 2
-//                                             documentation ```java\nFunction<InvocationHandler, C> constructor\n```
+//                                             display_name constructor
+//                                             signature_documentation java Function<InvocationHandler, C> constructor
+//                                             enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#adapter().
+//                                             kind Variable
 //                                               ^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().
 //                                                              ^^^^^^^^ reference local 0
 
@@ -95,30 +116,41 @@ public <C, W> Function<W, C> adapter(Class<C> contract, Class<W> wrappedClass) {
 
   private <T> Function<InvocationHandler, T> getConstructor(Class<T> contract) {
 //         ^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T]
-//           documentation ```java\nT\n```
+//           display_name T
+//           signature_documentation java T
+//           kind TypeParameter
 //            ^^^^^^^^ reference semanticdb maven jdk 11 java/util/function/Function#
 //                     ^^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/InvocationHandler#
 //                                        ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T]
 //                                           ^^^^^^^^^^^^^^ definition semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().
-//                                                          documentation ```java\nprivate <T> Function<InvocationHandler, T> getConstructor(Class<T> contract)\n```
+//                                                          display_name getConstructor
+//                                                          signature_documentation java private <T> Function<InvocationHandler, T> getConstructor(Class<T> contract)
+//                                                          kind Method
 //                                                          ^^^^^ reference semanticdb maven jdk 11 java/lang/Class#
 //                                                                ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T]
 //                                                                   ^^^^^^^^ definition local 3
-//                                                                            documentation ```java\nClass<T> contract\n```
+//                                                                            display_name contract
+//                                                                            signature_documentation java Class<T> contract
+//                                                                            enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().
     @SuppressWarnings("unchecked")
 //   ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
     Constructor<T> constructor = (Constructor<T>) proxyConstructors.computeIfAbsent(contract, c -> {
 //  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //              ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T]
 //                 ^^^^^^^^^^^ definition local 4
-//                             documentation ```java\n@SuppressWarnings("unchecked")\nConstructor<T> constructor\n```
+//                             display_name constructor
+//                             signature_documentation java @SuppressWarnings("unchecked")\nConstructor<T> constructor
+//                             enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().
+//                             kind Variable
 //                                ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/reflect/Constructor#
 //                                            ^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().[T]
 //                                                ^^^^^^^^^^^^^^^^^ reference semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#proxyConstructors.
 //                                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/util/concurrent/ConcurrentMap#computeIfAbsent().
 //                                                                                  ^^^^^^^^ reference local 3
 //                                                                                            ^ definition local 5
-//                                                                                              documentation ```java\nClass<?> c\n```
+//                                                                                              display_name c
+//                                                                                              signature_documentation java Class<?> c
+//                                                                                              enclosing_symbol semanticdb maven . . minimized/AnnotationsOnParameterizedTypesImpl#getConstructor().
       return null;
     });
 
diff --git a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
index 3a913002e..f34cbc70b 100644
--- a/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
+++ b/tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/InnerClasses.java
@@ -105,7 +105,7 @@ public interface InnerInterface<A, B> {
 //                                  display_name InnerAnnotation
 //                                  signature_documentation java public @interface InnerAnnotation
 //                                  kind Interface
-//                                  relationship is_reference is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
+//                                  relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
     int value();
 //      ^^^^^ definition semanticdb maven . . minimized/InnerClasses#InnerAnnotation#value().
 //            display_name value
diff --git a/tests/snapshots/src/main/generated/ujson/AstTransformer.scala b/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
index 2b10aae49..18fd49407 100644
--- a/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
+++ b/tests/snapshots/src/main/generated/ujson/AstTransformer.scala
@@ -56,7 +56,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                              display_name items
 //                                              signature_documentation scala items: Iterable[I] 
 //                                              kind Parameter
-//                                               ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Iterable#
+//                                               ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Iterable#
 //                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
     val ctx = f.visitArray(items.size, -1).narrow
 //      ^^^ definition local 1
@@ -66,7 +66,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(f)
 //              ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitArray().
 //                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformArray().(items)
-//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#size().
+//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#size().
 //                                         ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ArrVisitor#narrow().
     for(item <- items) ctx.visitValue(transform(item, ctx.subVisitor), -1)
 //      ^^^^ definition local 2
@@ -103,8 +103,8 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                               display_name items
 //                                               signature_documentation scala items: Iterable[(String, I)] 
 //                                               kind Parameter
-//                                                ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Iterable#
-//                                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                                ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Iterable#
+//                                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
     val ctx = f.visitObject(items.size, -1).narrow
 //      ^^^ definition local 4
@@ -114,7 +114,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(f)
 //              ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitObject().
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#transformObject().(items)
-//                                ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#size().
+//                                ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#size().
 //                                          ^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#narrow().
     for(kv <- items) {
 //      ^^ definition local 5
@@ -135,13 +135,13 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                      ^^^^^^^^^^ reference local 6
 //                                 ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                             ^^ reference local 5
-//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
+//                                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
       ctx.visitValue(transform(kv._2, ctx.subVisitor), -1)
 //    ^^^ reference local 4
 //        ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#visitValue().
 //                   ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#transform().
 //                             ^^ reference local 5
-//                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_2.
+//                                ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
 //                                    ^^^ reference local 4
 //                                        ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjArrVisitor#subVisitor().
     }
@@ -187,7 +187,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                                        kind Parameter
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
 //                                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/compat/package.Factory#
-//                                                  ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                                  ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#[I]
 //                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#[T]
 //                                                                         ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/ObjVisitor#
@@ -205,14 +205,14 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                        signature_documentation scala private[this] var key_=(x$1: String): Unit
 //                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
-//                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
     private[this] val vs = factory.newBuilder
 //                    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
 //                       display_name vs
 //                       signature_documentation scala private[this] val vs: Builder[(String, I), T]
 //                       kind Method
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#factory.
-//                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/Factory#newBuilder().
+//                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/Factory#newBuilder().
     def subVisitor = AstTransformer.this
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#subVisitor().
 //                 display_name subVisitor
@@ -230,7 +230,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^^^ reference semanticdb maven . . upickle/
 //                                     ^^^^ reference semanticdb maven . . upickle/core/
 //                                          ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/StringVisitor.
@@ -245,7 +245,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                      signature_documentation scala s: Any 
 //                      kind Parameter
 //                       ^^^ reference semanticdb maven . . scala/Any#
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitKeyValue().(s)
 //                                            ^^^^^^^^ reference semanticdb maven . . scala/Any#toString().
@@ -265,12 +265,12 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                             display_name index
 //                             signature_documentation scala index: Int 
 //                             kind Parameter
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 //                                           ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
-//                                              ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
+//                                              ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Growable#`+=`().
 //                                                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#key().
-//                                                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.ArrowAssoc#`->`().
+//                                                      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.ArrowAssoc#`->`().
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#visitValue().(v)
 
     def visitEnd(index: Int) = build(vs.result)
@@ -283,10 +283,10 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#build.
 //                                   ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#vs.
-//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Builder#result().
+//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Builder#result().
   }
   class AstArrVisitor[T[_]](build: T[I] => I)
 //      ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#
@@ -346,7 +346,7 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                       signature_documentation scala private[this] val vs: Builder[I, T[I]]
 //                       kind Method
 //                         ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#factory.
-//                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/Factory#newBuilder().
+//                                 ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/Factory#newBuilder().
     def visitValue(v: I, index: Int): Unit = vs += v
 //      ^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().
 //                 display_name visitValue
@@ -362,10 +362,10 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                             display_name index
 //                             signature_documentation scala index: Int 
 //                             kind Parameter
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 //                                           ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
-//                                              ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
+//                                              ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Growable#`+=`().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#visitValue().(v)
 
     def visitEnd(index: Int) = build(vs.result())
@@ -378,9 +378,9 @@ trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#build.
 //                                   ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#vs.
-//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Builder#result().
+//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Builder#result().
   }
 }
diff --git a/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala b/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
index 22e54c817..492e2db66 100644
--- a/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/ByteArrayParser.scala
@@ -4,8 +4,8 @@ package ujson
 import scala.annotation.{switch, tailrec}
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
-//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
+//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
+//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
 import java.nio.ByteBuffer
 //     ^^^^ reference semanticdb maven . . java/
 //          ^^^ reference semanticdb maven . . java/nio/
@@ -55,8 +55,8 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //                                 signature_documentation scala src: Array[Byte] 
 //                                 kind Parameter
 //                                 relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
-//                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                        ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                        ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                                       ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#[J]
 //                                                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteParser#`<init>`().
@@ -67,7 +67,7 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //              signature_documentation scala val srcLength: Int
 //              kind Method
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#length().
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#length().
   protected[this] final def close() = {}
 //                          ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#close().
 //                                display_name close
@@ -86,8 +86,8 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //                              display_name until
 //                              signature_documentation scala until: Int 
 //                              kind Parameter
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 
   def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().
@@ -99,19 +99,19 @@ final class ByteArrayParser[J](src: Array[Byte]) extends ByteParser[J]{
 //                              display_name buffer
 //                              signature_documentation scala buffer: Array[Byte] 
 //                              kind Parameter
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
 //                                                         signature_documentation scala bufferOffset: Int 
 //                                                         kind Parameter
-//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if(buffer == null) (src, srcLength == 0, srcLength)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#readDataIntoBuffer().(buffer)
 //            ^^ reference semanticdb maven jdk 11 java/lang/Object#`==`().
 //                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
 //                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
-//                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//                                     ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //                                           ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#srcLength.
     else (src, true, -1)
 //        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser#src.
@@ -124,8 +124,8 @@ object ByteArrayParser extends Transformer[Array[Byte]]{
 //                     signature_documentation scala object ByteArrayParser
 //                     kind Object
 //                             ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
-//                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: Array[Byte], f: Visitor[_, T]) = new ByteArrayParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().
@@ -141,8 +141,8 @@ object ByteArrayParser extends Transformer[Array[Byte]]{
 //                   display_name j
 //                   signature_documentation scala j: Array[Byte] 
 //                   kind Parameter
-//                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                          ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteArrayParser.transform().(f)
 //                                   display_name f
 //                                   signature_documentation scala f: Visitor[local0, T[ 
diff --git a/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala b/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
index 1d996bb33..2713eced7 100644
--- a/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/ByteBufferParser.scala
@@ -10,8 +10,8 @@ import upickle.core.{ObjArrVisitor, Visitor}
 import scala.annotation.{switch, tailrec}
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/annotation/
-//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/switch#
-//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/annotation/tailrec#
+//                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/switch#
+//                               ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/annotation/tailrec#
 import java.nio.ByteBuffer
 //     ^^^^ reference semanticdb maven . . java/
 //          ^^^ reference semanticdb maven . . java/nio/
@@ -73,7 +73,7 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                              kind Method
 //                                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                    ^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#limit().
-//                                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`-`(+3).
+//                                            ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`-`(+3).
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#start.
 
 
@@ -96,8 +96,8 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                              display_name until
 //                              signature_documentation scala until: Int 
 //                              kind Parameter
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Byte], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
@@ -108,13 +108,13 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                              display_name buffer
 //                              signature_documentation scala buffer: Array[Byte] 
 //                              kind Parameter
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
 //                                                         signature_documentation scala bufferOffset: Int 
 //                                                         kind Parameter
-//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 
     if(buffer == null) (java.util.Arrays.copyOfRange(src.array(), start, src.limit()), limit == 0, limit)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#readDataIntoBuffer().(buffer)
@@ -129,7 +129,7 @@ final class ByteBufferParser[J](src: ByteBuffer) extends ByteParser[J]{
 //                                                                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
 //                                                                           ^^^^^ reference semanticdb maven jdk 11 java/nio/Buffer#limit().
 //                                                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
-//                                                                                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//                                                                                           ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //                                                                                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#limit.
     else (src.array(), true, -1)
 //        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ByteBufferParser#src.
diff --git a/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala b/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
index 0d7bf8486..04e613ef9 100644
--- a/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/CharSequenceParser.scala
@@ -50,8 +50,8 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //                              display_name until
 //                              signature_documentation scala until: Int 
 //                              kind Parameter
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
@@ -62,13 +62,13 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //                              display_name buffer
 //                              signature_documentation scala buffer: Array[Char] 
 //                              kind Parameter
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
 //                                                         signature_documentation scala bufferOffset: Int 
 //                                                         kind Parameter
-//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if(buffer == null) (cs.toString.toCharArray, cs.length == 0, cs.length)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#readDataIntoBuffer().(buffer)
 //            ^^ reference semanticdb maven jdk 11 java/lang/Object#`==`().
@@ -77,7 +77,7 @@ private[ujson] final class CharSequenceParser[J](cs: CharSequence) extends CharP
 //                                  ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/String#toCharArray().
 //                                               ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
-//                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//                                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //                                                               ^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharSequenceParser#cs.
 //                                                                  ^^^^^^ reference semanticdb maven jdk 11 java/lang/CharSequence#length().
     else (buffer, true, -1)
diff --git a/tests/snapshots/src/main/generated/ujson/Exceptions.scala b/tests/snapshots/src/main/generated/ujson/Exceptions.scala
index ed3d08998..daeeeec9a 100644
--- a/tests/snapshots/src/main/generated/ujson/Exceptions.scala
+++ b/tests/snapshots/src/main/generated/ujson/Exceptions.scala
@@ -7,7 +7,7 @@ sealed trait ParsingFailedException extends Exception
 //                                  display_name ParsingFailedException
 //                                  signature_documentation scala sealed trait ParsingFailedException
 //                                  kind Trait
-//                                          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
+//                                          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
 
 case class ParseException(clue: String, index: Int)
 //         ^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
@@ -22,13 +22,13 @@ case class ParseException(clue: String, index: Int)
 //                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
-//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
 //                        display_name apply
 //                        signature_documentation scala def apply(clue: String, index: Int): ParseException
 //                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
-//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
+//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //         ______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.
 //                        display_name ParseException
 //                        signature_documentation scala object ParseException
@@ -47,7 +47,7 @@ case class ParseException(clue: String, index: Int)
 //                        kind Method
 //                        relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().
-//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                        relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().
 //                         display_name <init>
 //                         signature_documentation scala def this(clue: String, index: Int)
@@ -80,7 +80,7 @@ case class ParseException(clue: String, index: Int)
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                             relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#clue.
 //                             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(clue)
-//                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            display_name index
 //                                            signature_documentation scala val index: Int
@@ -109,9 +109,9 @@ case class ParseException(clue: String, index: Int)
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(index)
 //                                            relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#index.
 //                                            relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException.apply().(index)
-//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
   extends Exception(clue + " at index " + index) with ParsingFailedException
-//        ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
+//        ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
 //                 ^ reference semanticdb maven jdk 11 java/lang/Exception#`<init>`(+1).
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParseException#`<init>`().(clue)
 //                       ^ reference semanticdb maven jdk 11 java/lang/String#`+`().
@@ -132,13 +132,13 @@ case class IncompleteParseException(msg: String)
 //                                  kind Method
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
-//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
 //                                  display_name apply
 //                                  signature_documentation scala def apply(msg: String): IncompleteParseException
 //                                  kind Method
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
-//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
+//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().
 //                                  display_name copy
 //                                  signature_documentation scala def copy(msg: String): IncompleteParseException
@@ -151,7 +151,7 @@ case class IncompleteParseException(msg: String)
 //                                  kind Method
 //                                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#
 //                                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().
-//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//                                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ________________________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.
 //                                  display_name IncompleteParseException
 //                                  signature_documentation scala object IncompleteParseException
@@ -190,9 +190,9 @@ case class IncompleteParseException(msg: String)
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#copy().(msg)
 //                                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#msg.
 //                                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException.apply().(msg)
-//                                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                       ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
   extends Exception(msg) with ParsingFailedException
-//        ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
+//        ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
 //                 ^ reference semanticdb maven jdk 11 java/lang/Exception#`<init>`(+1).
 //                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IncompleteParseException#`<init>`().(msg)
 //                            ^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/ParsingFailedException#
diff --git a/tests/snapshots/src/main/generated/ujson/IndexedValue.scala b/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
index 12f210a34..e8f98b83a 100644
--- a/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
+++ b/tests/snapshots/src/main/generated/ujson/IndexedValue.scala
@@ -46,7 +46,7 @@ sealed trait IndexedValue {
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
-//           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 }
 
 object IndexedValue extends Transformer[IndexedValue]{
@@ -76,7 +76,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               signature_documentation scala def apply(index: Int, value0: CharSequence): Str
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //               display_name Str
 //               signature_documentation scala object Str
@@ -89,14 +89,14 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#productElementName().
 //               display_name productElementName
 //               signature_documentation scala def productElementName(x$1: Int): String
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().
 //                display_name <init>
 //                signature_documentation scala def this(index: Int, value0: CharSequence)
@@ -130,7 +130,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#index.
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str#value0.
 //                                  display_name value0
 //                                  signature_documentation scala val value0: CharSequence
@@ -176,14 +176,14 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               signature_documentation scala def apply(index: Int, value0: (CharSequence, IndexedValue)*): Obj
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#productElement().
 //               display_name productElement
 //               signature_documentation scala def productElement(x$1: Int): Any
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //               display_name Obj
 //               signature_documentation scala object Obj
@@ -196,7 +196,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().
 //                display_name <init>
 //                signature_documentation scala def this(index: Int, value0: (CharSequence, IndexedValue)*)
@@ -220,7 +220,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                     kind Parameter
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#`<init>`().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#index.
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#value0.
 //                                  display_name value0
 //                                  signature_documentation scala val value0: (CharSequence, IndexedValue)*
@@ -258,14 +258,14 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#productElement().
 //               display_name productElement
 //               signature_documentation scala def productElement(x$1: Int): Any
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //               display_name Arr
 //               signature_documentation scala object Arr
@@ -277,7 +277,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               signature_documentation scala def apply(index: Int, value: IndexedValue*): Arr
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#`<init>`().
 //                display_name <init>
 //                signature_documentation scala def this(index: Int, value: IndexedValue*)
@@ -301,7 +301,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                     kind Parameter
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#index.
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.apply().(index)
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#value.
 //                                 display_name value
 //                                 signature_documentation scala val value: IndexedValue*
@@ -348,20 +348,20 @@ object IndexedValue extends Transformer[IndexedValue]{
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#productElementName().
 //               display_name productElementName
 //               signature_documentation scala def productElementName(x$1: Int): String
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
 //               relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().
 //               display_name apply
 //               signature_documentation scala def apply(index: Int, s: CharSequence, decIndex: Int, expIndex: Int): Num
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function4#apply().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function4#apply().
 //              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().
 //                display_name <init>
 //                signature_documentation scala def this(index: Int, s: CharSequence, decIndex: Int, expIndex: Int)
@@ -395,7 +395,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(index)
 //                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(index)
 //                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#index.
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#s.
 //                             display_name s
 //                             signature_documentation scala val s: CharSequence
@@ -453,7 +453,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#copy().(decIndex)
 //                                                     relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#decIndex.
 //                                                     relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(decIndex)
-//                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                           ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    display_name expIndex
 //                                                                    signature_documentation scala val expIndex: Int
@@ -482,7 +482,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#`<init>`().(expIndex)
 //                                                                    relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num#expIndex.
 //                                                                    relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.apply().(expIndex)
-//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                                  ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                                                              ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class NumRaw(index: Int, d: Double) extends IndexedValue
@@ -510,20 +510,20 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
-//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
 //                  display_name apply
 //                  signature_documentation scala def apply(index: Int, d: Double): NumRaw
 //                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
-//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
+//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //           ______ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#productElementName().
 //                  display_name productElementName
 //                  signature_documentation scala def productElementName(x$1: Int): String
 //                  kind Method
 //                  relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#
 //                  relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().
-//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//                  relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //                 ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().
 //                   display_name <init>
 //                   signature_documentation scala def this(index: Int, d: Double)
@@ -557,7 +557,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#`<init>`().(index)
 //                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#index.
 //                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(index)
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                display_name d
 //                                signature_documentation scala val d: Double
@@ -586,7 +586,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#copy().(d)
 //                                relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw#d.
 //                                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.apply().(d)
-//                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
+//                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                             ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   case class False(index: Int) extends IndexedValue{
@@ -608,20 +608,20 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                 kind Method
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
-//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
 //                 display_name apply
 //                 signature_documentation scala def apply(index: Int): False
 //                 kind Method
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
-//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
+//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#productElement().
 //                 display_name productElement
 //                 signature_documentation scala def productElement(x$1: Int): Any
 //                 kind Method
 //                 relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#
 //                 relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().
-//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                 relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           _____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().
 //                 display_name copy
 //                 signature_documentation scala def copy(index: Int): False
@@ -661,7 +661,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#copy().(index)
 //                       relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False#index.
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.apply().(index)
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                 ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = false
@@ -683,7 +683,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                display_name True
 //                signature_documentation scala object True
@@ -701,14 +701,14 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                signature_documentation scala def apply(index: Int): True
 //                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#productElementName().
 //                display_name productElementName
 //                signature_documentation scala def productElementName(x$1: Int): String
 //                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().
 //                 display_name <init>
 //                 signature_documentation scala def this(index: Int)
@@ -742,7 +742,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#`<init>`().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.apply().(index)
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = true
@@ -770,20 +770,20 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#productElementName().
 //                display_name productElementName
 //                signature_documentation scala def productElementName(x$1: Int): String
 //                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
 //                relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().
 //                display_name apply
 //                signature_documentation scala def apply(index: Int): Null
 //                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //           ____ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                display_name Null
 //                signature_documentation scala object Null
@@ -823,7 +823,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#`<init>`().(index)
 //                      relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null#index.
 //                      relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.apply().(index)
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
 //                                                ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
     def value = null
@@ -1010,7 +1010,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                   display_name item
 //                   signature_documentation scala item: IndexedValue 
 //                   kind Variable
-//                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOps#withFilter().
+//                       ^^^^^ reference local 35
           val keyVisitor = try ctx.visitKey(i) catch reject(i)
 //            ^^^^^^^^^^ definition local 40
 //                       display_name keyVisitor
@@ -1072,12 +1072,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                        display_name length
 //                        signature_documentation scala length: Int 
 //                        kind Parameter
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(i)
 //                                display_name i
 //                                signature_documentation scala i: Int 
 //                                kind Parameter
-//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                 ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^ definition local 49
 //                                              display_name $anon
 //                                              signature_documentation scala final class $anon
@@ -1093,8 +1093,8 @@ object IndexedValue extends Transformer[IndexedValue]{
 //            signature_documentation scala private val out: Buffer[IndexedValue]
 //            kind Method
 //              ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer.
-//                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/SeqFactory.Delegate#empty().
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer.
+//                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/SeqFactory.Delegate#empty().
 //                                   ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
       def subVisitor = Builder
 //        ^^^^^^^^^^ definition local 48
@@ -1118,11 +1118,11 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                          display_name index
 //                                          signature_documentation scala index: Int 
 //                                          kind Parameter
-//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
         out.append(v)
 //      ^^^ reference local 50
-//          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer#append().
+//          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer#append().
 //                 ^ reference local 53
       }
       def visitEnd(index: Int): IndexedValue.Arr = IndexedValue.Arr(i, out.toSeq:_*)
@@ -1135,14 +1135,14 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                       display_name index
 //                       signature_documentation scala index: Int 
 //                       kind Parameter
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Arr.
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitArray().(i)
 //                                                                     ^^^ reference local 50
-//                                                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#toSeq().
+//                                                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#toSeq().
     }
 
     def visitObject(length: Int, i: Int) = new ObjVisitor[IndexedValue, IndexedValue.Obj] {
@@ -1155,12 +1155,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                         display_name length
 //                         signature_documentation scala length: Int 
 //                         kind Parameter
-//                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                               ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(i)
 //                                 display_name i
 //                                 signature_documentation scala i: Int 
 //                                 kind Parameter
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^ definition local 59
 //                                               display_name $anon
 //                                               signature_documentation scala final class $anon
@@ -1176,16 +1176,16 @@ object IndexedValue extends Transformer[IndexedValue]{
 //            signature_documentation scala private val out: Buffer[(String, IndexedValue)]
 //            kind Method
 //              ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer.
-//                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/SeqFactory.Delegate#empty().
-//                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer.
+//                             ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/SeqFactory.Delegate#empty().
+//                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                            ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue#
       var currentKey: String = _
 //        ^^^^^^^^^^ definition local 61
 //                   display_name currentKey
 //                   signature_documentation scala private var currentKey: String
 //                   kind Method
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
       def subVisitor = Builder
 //        ^^^^^^^^^^ definition local 56
 //                   display_name subVisitor
@@ -1203,7 +1203,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                       display_name index
 //                       signature_documentation scala index: Int 
 //                       kind Parameter
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                               ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                            ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.
       def visitKeyValue(s: Any): Unit = currentKey = s.asInstanceOf[IndexedValue.Str].value0.toString
@@ -1217,7 +1217,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                        signature_documentation scala s: Any 
 //                        kind Parameter
 //                         ^^^ reference semanticdb maven . . scala/Any#
-//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 //                                      ^^^^^^^^^^ reference local 62
 //                                                   ^ reference local 67
 //                                                     ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
@@ -1240,11 +1240,11 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                          display_name index
 //                                          signature_documentation scala index: Int 
 //                                          kind Parameter
-//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
         out.append((currentKey, v))
 //      ^^^ reference local 60
-//          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Buffer#append().
+//          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Buffer#append().
 //                  ^^^^^^^^^^ reference local 61
 //                              ^ reference local 68
       }
@@ -1258,14 +1258,14 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                       display_name index
 //                       signature_documentation scala index: Int 
 //                       kind Parameter
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                              ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Obj.
 //                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitObject().(i)
 //                                                                     ^^^ reference local 60
-//                                                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#toSeq().
+//                                                                         ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#toSeq().
     }
 
     def visitNull(i: Int) = IndexedValue.Null(i)
@@ -1278,7 +1278,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                  display_name i
 //                  signature_documentation scala i: Int 
 //                  kind Parameter
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                          ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Null.
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitNull().(i)
@@ -1293,7 +1293,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                   display_name i
 //                   signature_documentation scala i: Int 
 //                   kind Parameter
-//                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                           ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.False.
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFalse().(i)
@@ -1308,7 +1308,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                  display_name i
 //                  signature_documentation scala i: Int 
 //                  kind Parameter
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                          ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.True.
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitTrue().(i)
@@ -1328,17 +1328,17 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                                        display_name decIndex
 //                                                        signature_documentation scala decIndex: Int 
 //                                                        kind Parameter
-//                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                              ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(expIndex)
 //                                                                       display_name expIndex
 //                                                                       signature_documentation scala expIndex: Int 
 //                                                                       kind Parameter
-//                                                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                             ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(i)
 //                                                                               display_name i
 //                                                                               signature_documentation scala i: Int 
 //                                                                               kind Parameter
-//                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                                       ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                                                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Num.
 //                                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64StringParts().(i)
@@ -1356,12 +1356,12 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                              display_name d
 //                              signature_documentation scala d: Double 
 //                              kind Parameter
-//                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
+//                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                       ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(i)
 //                                         display_name i
 //                                         signature_documentation scala i: Int 
 //                                         kind Parameter
-//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                              ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.NumRaw.
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitFloat64().(i)
@@ -1382,7 +1382,7 @@ object IndexedValue extends Transformer[IndexedValue]{
 //                                     display_name i
 //                                     signature_documentation scala i: Int 
 //                                     kind Parameter
-//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.
 //                                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Str.
 //                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/IndexedValue.Builder.visitString().(i)
diff --git a/tests/snapshots/src/main/generated/ujson/JsVisitor.scala b/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
index 854a9e16c..aff0389d9 100644
--- a/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
+++ b/tests/snapshots/src/main/generated/ujson/JsVisitor.scala
@@ -43,12 +43,12 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                   display_name d
 //                   signature_documentation scala d: Double 
 //                   kind Parameter
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(index)
 //                                  display_name index
 //                                  signature_documentation scala index: Int 
 //                                  kind Parameter
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val i = d.toLong
 //      ^ definition local 0
@@ -56,10 +56,10 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //        signature_documentation scala i: Long 
 //        kind Variable
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
-//            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#toLong().
+//            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#toLong().
     if(i == d) visitFloat64StringParts(i.toString, -1, -1, index)
 //     ^ reference local 0
-//       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`==`(+6).
+//       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`==`(+6).
 //          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().(d)
 //             ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                     ^ reference local 0
@@ -83,12 +83,12 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                   display_name d
 //                   signature_documentation scala d: Float 
 //                   kind Parameter
-//                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Float#
+//                    ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Float#
 //                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(index)
 //                                 display_name index
 //                                 signature_documentation scala index: Int 
 //                                 kind Parameter
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                            ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat32().(d)
@@ -103,12 +103,12 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                 display_name i
 //                 signature_documentation scala i: Int 
 //                 kind Parameter
-//                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(index)
 //                             display_name index
 //                             signature_documentation scala index: Int 
 //                             kind Parameter
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                    ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                        ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64().
 //                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt32().(i)
@@ -123,23 +123,23 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                 display_name i
 //                 signature_documentation scala i: Long 
 //                 kind Parameter
-//                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
+//                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(index)
 //                              display_name index
 //                              signature_documentation scala index: Int 
 //                              kind Parameter
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     if (math.abs(i) > math.pow(2, 53) || i == -9223372036854775808L) visitString(i.toString, index)
 //      ^^^^ reference semanticdb maven . . scala/math/
-//           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/math/package.abs(+1).
+//           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/math/package.abs(+1).
 //               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
-//                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`>`(+6).
+//                  ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`>`(+6).
 //                    ^^^^ reference semanticdb maven . . scala/math/
-//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/math/package.pow().
-//                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/math/package.pow().
+//                                    ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
-//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`==`(+4).
+//                                         ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`==`(+4).
 //                                                                   ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitInt64().(i)
 //                                                                                 ^^^^^^^^ reference semanticdb maven . . scala/Any#toString().
@@ -159,21 +159,21 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                  display_name i
 //                  signature_documentation scala i: Long 
 //                  kind Parameter
-//                   ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
+//                   ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
 //                         ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(index)
 //                               display_name index
 //                               signature_documentation scala index: Int 
 //                               kind Parameter
-//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     if (i > math.pow(2, 53) || i < 0) visitString(java.lang.Long.toUnsignedString(i), index)
 //      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(i)
-//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`>`(+6).
+//        ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`>`(+6).
 //          ^^^^ reference semanticdb maven . . scala/math/
-//               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/math/package.pow().
-//                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/math/package.pow().
+//                          ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitUInt64().(i)
-//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#`<`(+3).
+//                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#`<`(+3).
 //                                    ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                ^^^^ reference semanticdb maven . . java/
 //                                                     ^^^^ reference semanticdb maven . . java/lang/
@@ -197,12 +197,12 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                         display_name s
 //                         signature_documentation scala s: String 
 //                         kind Parameter
-//                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                  ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64String().(index)
 //                                        display_name index
 //                                        signature_documentation scala index: Int 
 //                                        kind Parameter
-//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     visitFloat64StringParts(
 //  ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
@@ -238,23 +238,23 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                      display_name bytes
 //                      signature_documentation scala bytes: Array[Byte] 
 //                      kind Parameter
-//                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                       ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                    ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(offset)
 //                                           display_name offset
 //                                           signature_documentation scala offset: Int 
 //                                           kind Parameter
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                 ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
 //                                                     display_name len
 //                                                     signature_documentation scala len: Int 
 //                                                     kind Parameter
-//                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
 //                                                                 display_name index
 //                                                                 signature_documentation scala index: Int 
 //                                                                 kind Parameter
-//                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val arr = visitArray(len, index)
 //      ^^^ definition local 2
@@ -271,7 +271,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //        kind Variable
     while (i < len){
 //         ^ reference local 3
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`<`(+3).
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`<`(+3).
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(len)
       arr.visitValue(arr.subVisitor.visitInt32(bytes(offset + i), index).asInstanceOf[T], index)
 //    ^^^ reference local 2
@@ -281,7 +281,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                                  ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitInt32().
 //                                             ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(bytes)
 //                                                   ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(offset)
-//                                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//                                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
 //                                                            ^ reference local 3
 //                                                                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
 //                                                                       ^^^^^^^^^^^^ reference semanticdb maven . . scala/Any#asInstanceOf().
@@ -289,7 +289,7 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                                                                                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitBinary().(index)
       i += 1
 //    ^ reference local 3
-//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`+`(+4).
+//      ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`+`(+4).
     }
     arr.visitEnd(index)
 //  ^^^ reference local 2
@@ -311,12 +311,12 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                                                      display_name decIndex
 //                                                      signature_documentation scala decIndex: Int 
 //                                                      kind Parameter
-//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                            ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(expIndex)
 //                                                                     display_name expIndex
 //                                                                     signature_documentation scala expIndex: Int 
 //                                                                     kind Parameter
-//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
 //                                                                                ^^^^^^^^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitFloat64StringParts().
 //                                                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitFloat64StringParts().(s)
@@ -333,28 +333,28 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                 display_name tag
 //                 signature_documentation scala tag: Byte 
 //                 kind Parameter
-//                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                        ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(bytes)
 //                              display_name bytes
 //                              signature_documentation scala bytes: Array[Byte] 
 //                              kind Parameter
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                            ^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(offset)
 //                                                   display_name offset
 //                                                   signature_documentation scala offset: Int 
 //                                                   kind Parameter
-//                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(len)
 //                                                             display_name len
 //                                                             signature_documentation scala len: Int 
 //                                                             kind Parameter
-//                                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                   ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitExt().(index)
 //                                                                         display_name index
 //                                                                         signature_documentation scala index: Int 
 //                                                                         kind Parameter
-//                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#[J]
     val arr = visitArray(-1, index)
 //      ^^^ definition local 5
@@ -396,12 +396,12 @@ trait JsVisitor[-T, +J] extends Visitor[T, J]{
 //                display_name s
 //                signature_documentation scala s: Char 
 //                kind Parameter
-//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
+//                 ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
 //                       ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(index)
 //                             display_name index
 //                             signature_documentation scala index: Int 
 //                             kind Parameter
-//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                              ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                     ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Visitor#visitString().
 //                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/JsVisitor#visitChar().(s)
 //                                                   ^^^^^^^^ reference semanticdb maven . . scala/Any#toString().
diff --git a/tests/snapshots/src/main/generated/ujson/Readable.scala b/tests/snapshots/src/main/generated/ujson/Readable.scala
index 0e9f05d59..588cae043 100644
--- a/tests/snapshots/src/main/generated/ujson/Readable.scala
+++ b/tests/snapshots/src/main/generated/ujson/Readable.scala
@@ -67,7 +67,7 @@ object Readable extends ReadableLowPri{
 //                           kind Method
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
-//                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //           _______________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
 //                           display_name apply
 //                           signature_documentation scala def apply(t: T, w: Transformer[T]): fromTransformer[T]
@@ -85,7 +85,7 @@ object Readable extends ReadableLowPri{
 //                           kind Method
 //                           relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                           relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer.apply().
-//                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//                           relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //                           ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#[T]
 //                             display_name T
 //                             signature_documentation scala T
@@ -188,9 +188,9 @@ object Readable extends ReadableLowPri{
 //                          display_name s
 //                          signature_documentation scala s: String 
 //                          kind Parameter
-//                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
-//                                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                                  ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                                                 ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().
 //                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromString().(s)
@@ -309,11 +309,11 @@ object Readable extends ReadableLowPri{
 //                             display_name s
 //                             signature_documentation scala s: Array[Byte] 
 //                             kind Parameter
-//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
-//                                                            ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                                                            ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                                                               ^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#
 //                                                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromTransformer#`<init>`().
 //                                                                                               ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable.fromByteArray().(s)
diff --git a/tests/snapshots/src/main/generated/ujson/StringParser.scala b/tests/snapshots/src/main/generated/ujson/StringParser.scala
index 42f5aa1fd..a32dc6390 100644
--- a/tests/snapshots/src/main/generated/ujson/StringParser.scala
+++ b/tests/snapshots/src/main/generated/ujson/StringParser.scala
@@ -44,7 +44,7 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //                                           signature_documentation scala s: String 
 //                                           kind Parameter
 //                                           relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
-//                                            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                            ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                            ^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#
 //                                                                       ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#[J]
 //                                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/CharParser#`<init>`().
@@ -65,8 +65,8 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //                              display_name until
 //                              signature_documentation scala until: Int 
 //                              kind Parameter
-//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
   def readDataIntoBuffer(buffer: Array[Char], bufferOffset: Int) = {
 //    ^^^^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().
 //                       display_name readDataIntoBuffer
@@ -77,20 +77,20 @@ private[ujson] final class StringParser[J](s: String) extends CharParser[J]{
 //                              display_name buffer
 //                              signature_documentation scala buffer: Array[Char] 
 //                              kind Parameter
-//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Array#
-//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Char#
+//                               ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Array#
+//                                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Char#
 //                                            ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(bufferOffset)
 //                                                         display_name bufferOffset
 //                                                         signature_documentation scala bufferOffset: Int 
 //                                                         kind Parameter
-//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     if(buffer == null) (s.toCharArray, sLength == 0, sLength)
 //     ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(buffer)
 //            ^^ reference semanticdb maven jdk 11 java/lang/Object#`==`().
 //                      ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#s.
 //                        ^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/String#toCharArray().
 //                                     ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#sLength.
-//                                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`==`(+3).
+//                                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`==`(+3).
 //                                                   ^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#sLength.
     else (buffer, true, -1)
 //        ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser#readDataIntoBuffer().(buffer)
@@ -109,7 +109,7 @@ object StringParser extends Transformer[String]{
 //                  signature_documentation scala object StringParser
 //                  kind Object
 //                          ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Transformer#
-//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                             ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def transform[T](j: String, f: Visitor[_, T]) = new StringParser(j).parse(f)
 //    ^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().
@@ -125,7 +125,7 @@ object StringParser extends Transformer[String]{
 //                   display_name j
 //                   signature_documentation scala j: String 
 //                   kind Parameter
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringParser.transform().(f)
 //                              display_name f
 //                              signature_documentation scala f: Visitor[local0, T[ 
diff --git a/tests/snapshots/src/main/generated/ujson/Value.scala b/tests/snapshots/src/main/generated/ujson/Value.scala
index 9f067f892..5624d46d0 100644
--- a/tests/snapshots/src/main/generated/ujson/Value.scala
+++ b/tests/snapshots/src/main/generated/ujson/Value.scala
@@ -26,8 +26,8 @@ import scala.collection.mutable.ArrayBuffer
 //     ^^^^^ reference semanticdb maven . . scala/
 //           ^^^^^^^^^^ reference semanticdb maven . . scala/collection/
 //                      ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                              ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
-//                              ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer.
+//                              ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
+//                              ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer.
 
 sealed trait Value extends Readable with geny.Writable{
 //           ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -43,7 +43,7 @@ sealed trait Value extends Readable with geny.Writable{
 //                             signature_documentation scala def httpContentType: Some[String]
 //                             kind Method
 //                             relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/geny_2.13 0.6.10 geny/Writable#httpContentType().
-//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
   def value: Any
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
 //          display_name value
@@ -95,10 +95,10 @@ sealed trait Value extends Readable with geny.Writable{
 //                 display_name value
 //                 signature_documentation scala value: String 
 //                 kind Variable
-//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                          ^^^^^ reference local 1
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
   }
 
   /**
@@ -136,10 +136,10 @@ sealed trait Value extends Readable with geny.Writable{
 //                 display_name value
 //                 signature_documentation scala value: LinkedHashMap[String, Value] 
 //                 kind Variable
-//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                          ^^^^^ reference local 3
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
   }
   /**
     * Returns the elements of this [[Value]], fails if it is not
@@ -176,10 +176,10 @@ sealed trait Value extends Readable with geny.Writable{
 //                 display_name value
 //                 signature_documentation scala value: ArrayBuffer[Value] 
 //                 kind Variable
-//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                          ^^^^^ reference local 5
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
   }
   /**
     * Returns the `Double` value of this [[Value]], fails if it is not
@@ -216,10 +216,10 @@ sealed trait Value extends Readable with geny.Writable{
 //                 display_name value
 //                 signature_documentation scala value: Double 
 //                 kind Variable
-//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                     ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                          ^^^^^ reference local 7
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
   }
   /**
     * Returns the `Boolean` value of this [[Value]], fails if it is not
@@ -256,10 +256,10 @@ sealed trait Value extends Readable with geny.Writable{
 //                  display_name value
 //                  signature_documentation scala value: Boolean 
 //                  kind Variable
-//                      ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                      ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                           ^^^^^ reference local 9
     case _ => None
-//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/None.
+//            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/None.
   }
   /**
     * Returns true if the value of this [[Value]] is ujson.Null, false otherwise
@@ -304,7 +304,7 @@ sealed trait Value extends Readable with geny.Writable{
 //                                signature_documentation scala v: Value 
 //                                kind Parameter
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(s)
 //                                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update().(v)
 
@@ -332,7 +332,7 @@ sealed trait Value extends Readable with geny.Writable{
 //                                kind Parameter
 //                                 ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(s)
 //                                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(f)
 //                                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#update(+1).(s)
@@ -373,12 +373,12 @@ sealed trait Value extends Readable with geny.Writable{
 //                  display_name indent
 //                  signature_documentation scala default indent: Int 
 //                  kind Parameter
-//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(escapeUnicode)
 //                                           display_name escapeUnicode
 //                                           signature_documentation scala default escapeUnicode: Boolean 
 //                                           kind Parameter
-//                                            ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                            ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                                                    ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //                                                                              ^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/StringRenderer.
 //                                                                                             ^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#render().(indent)
@@ -401,13 +401,13 @@ sealed trait Value extends Readable with geny.Writable{
 //                                                   display_name indent
 //                                                   signature_documentation scala default indent: Int 
 //                                                   kind Parameter
-//                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                              ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().(escapeUnicode)
 //                                                                            display_name escapeUnicode
 //                                                                            signature_documentation scala default escapeUnicode: Boolean 
 //                                                                            kind Parameter
-//                                                                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
-//                                                                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                                                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                                                                               ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
     this.transform(new ujson.BaseByteRenderer(out, indent, escapeUnicode))
 //       ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#transform().
 //                     ^^^^^ reference semanticdb maven . . ujson/
@@ -430,7 +430,7 @@ sealed trait Value extends Readable with geny.Writable{
 //                      ^^^^ reference semanticdb maven . . java/
 //                           ^^ reference semanticdb maven . . java/io/
 //                              ^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/io/OutputStream#
-//                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 //                                                    ^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo().
 //                                                                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#writeBytesTo(+1).(out)
 }
@@ -491,7 +491,7 @@ object Value extends AstTransformer[Value]{
 //                         signature_documentation scala y: Value 
 //                         kind Parameter
 //                          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
-//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                  ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
   }
   object Selector{
 //       ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.
@@ -517,7 +517,7 @@ object Value extends AstTransformer[Value]{
 //                               signature_documentation scala i: Int 
 //                               kind Parameter
 //                               relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.IntSelector#i.
-//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                             ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                                                     ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       def apply(x: Value): Value = x.arr(i)
@@ -575,7 +575,7 @@ object Value extends AstTransformer[Value]{
 //                                  signature_documentation scala i: String 
 //                                  kind Parameter
 //                                  relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector.StringSelector#i.
-//                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                   ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Selector#
 //                                                           ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
       def apply(x: Value): Value = x.obj(i)
@@ -617,8 +617,8 @@ object Value extends AstTransformer[Value]{
   }
 
   @deprecated("use ujson.Str")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Str = ujson.Str
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
 //        display_name Str
@@ -627,8 +627,8 @@ object Value extends AstTransformer[Value]{
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
   @deprecated("use ujson.Str")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Str = ujson.Str
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
 //         display_name Str
@@ -637,8 +637,8 @@ object Value extends AstTransformer[Value]{
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
   @deprecated("use ujson.Obj")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Obj = ujson.Obj
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj.
 //        display_name Obj
@@ -647,8 +647,8 @@ object Value extends AstTransformer[Value]{
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
   @deprecated("use ujson.Obj")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Obj = ujson.Obj
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj#
 //         display_name Obj
@@ -657,8 +657,8 @@ object Value extends AstTransformer[Value]{
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
   @deprecated("use ujson.Arr")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Arr = ujson.Arr
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr.
 //        display_name Arr
@@ -667,8 +667,8 @@ object Value extends AstTransformer[Value]{
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.
   @deprecated("use ujson.Arr")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Arr = ujson.Arr
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr#
 //         display_name Arr
@@ -677,8 +677,8 @@ object Value extends AstTransformer[Value]{
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
   @deprecated("use ujson.Num")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Num = ujson.Num
 //    ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //        display_name Num
@@ -687,8 +687,8 @@ object Value extends AstTransformer[Value]{
 //          ^^^^^ reference semanticdb maven . . ujson/
 //                ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
   @deprecated("use ujson.Num")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Num = ujson.Num
 //     ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //         display_name Num
@@ -697,8 +697,8 @@ object Value extends AstTransformer[Value]{
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
   @deprecated("use ujson.Bool")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Bool = ujson.Bool
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool.
 //         display_name Bool
@@ -707,8 +707,8 @@ object Value extends AstTransformer[Value]{
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
   @deprecated("use ujson.Bool")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Bool = ujson.Bool
 //     ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool#
 //          display_name Bool
@@ -717,8 +717,8 @@ object Value extends AstTransformer[Value]{
 //            ^^^^^ reference semanticdb maven . . ujson/
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
   @deprecated("use ujson.True")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val True = ujson.True
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.True.
 //         display_name True
@@ -727,8 +727,8 @@ object Value extends AstTransformer[Value]{
 //           ^^^^^ reference semanticdb maven . . ujson/
 //                 ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
   @deprecated("use ujson.False")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val False = ujson.False
 //    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.False.
 //          display_name False
@@ -737,8 +737,8 @@ object Value extends AstTransformer[Value]{
 //            ^^^^^ reference semanticdb maven . . ujson/
 //                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
   @deprecated("use ujson.Null")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Null = ujson.Null
 //    ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Null.
 //         display_name Null
@@ -759,7 +759,7 @@ object Value extends AstTransformer[Value]{
 //                                  display_name items
 //                                  signature_documentation scala items: TraversableOnce[T] 
 //                                  kind Parameter
-//                                   ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
+//                                   ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
 //                                                   ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().[T]
                              (implicit f: T => Value): Arr = Arr.from(items.map(f))
 //                                     ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(f)
@@ -772,7 +772,7 @@ object Value extends AstTransformer[Value]{
 //                                                           ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Arr.
 //                                                               ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().
 //                                                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(items)
-//                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceExtensionMethods#map().
+//                                                                          ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#map().
 //                                                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableSeq().(f)
   implicit def JsonableDict[T](items: TraversableOnce[(String, T)])
 //             ^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().
@@ -787,8 +787,8 @@ object Value extends AstTransformer[Value]{
 //                                   display_name items
 //                                   signature_documentation scala items: TraversableOnce[(String, T)] 
 //                                   kind Parameter
-//                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
-//                                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                    ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
+//                                                     ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().[T]
                               (implicit f: T => Value): Obj = Obj.from(items.map(x => (x._1, f(x._2))))
 //                                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(f)
@@ -801,16 +801,16 @@ object Value extends AstTransformer[Value]{
 //                                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Obj.
 //                                                                ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().
 //                                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(items)
-//                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceExtensionMethods#map().
+//                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#map().
 //                                                                               ^ definition local 11
 //                                                                                 display_name x
 //                                                                                 signature_documentation scala x: (String, T) 
 //                                                                                 kind Parameter
 //                                                                                     ^ reference local 11
-//                                                                                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
+//                                                                                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
 //                                                                                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDict().(f)
 //                                                                                             ^ reference local 11
-//                                                                                               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_2.
+//                                                                                               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
   implicit def JsonableBoolean(i: Boolean): Bool = if (i) ujson.True else ujson.False
 //             ^^^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().
 //                             display_name JsonableBoolean
@@ -820,7 +820,7 @@ object Value extends AstTransformer[Value]{
 //                               display_name i
 //                               signature_documentation scala i: Boolean 
 //                               kind Parameter
-//                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                          ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Bool#
 //                                                     ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableBoolean().(i)
 //                                                        ^^^^^ reference semanticdb maven . . ujson/
@@ -836,7 +836,7 @@ object Value extends AstTransformer[Value]{
 //                            display_name i
 //                            signature_documentation scala i: Byte 
 //                            kind Parameter
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Byte#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Byte#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableByte().(i)
@@ -849,7 +849,7 @@ object Value extends AstTransformer[Value]{
 //                             display_name i
 //                             signature_documentation scala i: Short 
 //                             kind Parameter
-//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Short#
+//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Short#
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableShort().(i)
@@ -862,7 +862,7 @@ object Value extends AstTransformer[Value]{
 //                           display_name i
 //                           signature_documentation scala i: Int 
 //                           kind Parameter
-//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableInt().(i)
@@ -875,7 +875,7 @@ object Value extends AstTransformer[Value]{
 //                            display_name i
 //                            signature_documentation scala i: Long 
 //                            kind Parameter
-//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Long#
+//                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Long#
 //                                    ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str#
 //                                          ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Str.
 //                                              ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableLong().(i)
@@ -889,7 +889,7 @@ object Value extends AstTransformer[Value]{
 //                             display_name i
 //                             signature_documentation scala i: Float 
 //                             kind Parameter
-//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Float#
+//                              ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Float#
 //                                      ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                                ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableFloat().(i)
@@ -902,7 +902,7 @@ object Value extends AstTransformer[Value]{
 //                              display_name i
 //                              signature_documentation scala i: Double 
 //                              kind Parameter
-//                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
+//                               ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num#
 //                                              ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Num.
 //                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.JsonableDouble().(i)
@@ -1026,14 +1026,14 @@ object Value extends AstTransformer[Value]{
 //                      display_name length
 //                      signature_documentation scala length: Int 
 //                      kind Parameter
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitArray().(index)
 //                                  display_name index
 //                                  signature_documentation scala index: Int 
 //                                  kind Parameter
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                              ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#
-//                                                            ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
+//                                                            ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
 //                                                                        ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstArrVisitor#`<init>`().
 //                                                                         ^^ definition local 17
 //                                                                            display_name xs
@@ -1053,16 +1053,16 @@ object Value extends AstTransformer[Value]{
 //                       display_name length
 //                       signature_documentation scala length: Int 
 //                       kind Parameter
-//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitObject().(index)
 //                                   display_name index
 //                                   signature_documentation scala index: Int 
 //                                   kind Parameter
-//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#
 //                                                             ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                                                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
-//                                                                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                                                     ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
+//                                                                                   ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                                                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
 //                                                                                                  ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/AstTransformer#AstObjVisitor#`<init>`().
 //                                                                                                   ^^ definition local 18
@@ -1083,7 +1083,7 @@ object Value extends AstTransformer[Value]{
 //                    display_name index
 //                    signature_documentation scala index: Int 
 //                    kind Parameter
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^^ reference semanticdb maven . . ujson/
 //                                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
 
@@ -1097,7 +1097,7 @@ object Value extends AstTransformer[Value]{
 //                     display_name index
 //                     signature_documentation scala index: Int 
 //                     kind Parameter
-//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                             ^^^^^ reference semanticdb maven . . ujson/
 //                                   ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
 
@@ -1111,7 +1111,7 @@ object Value extends AstTransformer[Value]{
 //                    display_name index
 //                    signature_documentation scala index: Int 
 //                    kind Parameter
-//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                     ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                            ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.True.
 
 
@@ -1130,29 +1130,29 @@ object Value extends AstTransformer[Value]{
 //                                                               display_name decIndex
 //                                                               signature_documentation scala decIndex: Int 
 //                                                               kind Parameter
-//                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                     ^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(expIndex)
 //                                                                              display_name expIndex
 //                                                                              signature_documentation scala expIndex: Int 
 //                                                                              kind Parameter
-//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                               ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                                    ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(index)
 //                                                                                          display_name index
 //                                                                                          signature_documentation scala index: Int 
 //                                                                                          kind Parameter
-//                                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                                                           ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
     ujson.Num(
 //  ^^^^^ reference semanticdb maven . . ujson/
 //        ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
       if (decIndex != -1 || expIndex != -1) s.toString.toDouble
 //        ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(decIndex)
-//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+3).
-//                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#`||`().
+//                 ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+3).
+//                       ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#`||`().
 //                          ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(expIndex)
-//                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#`!=`(+3).
+//                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#`!=`(+3).
 //                                          ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64StringParts().(s)
 //                                            ^^^^^^^^ reference semanticdb maven jdk 11 java/lang/Object#toString().
-//                                                     ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/StringOps#toDouble().
+//                                                     ^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/StringOps#toDouble().
       else Util.parseIntegralNum(s, decIndex, expIndex, index)
 //         ^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Util.
 //              ^^^^^^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/Util.parseIntegralNum().
@@ -1174,12 +1174,12 @@ object Value extends AstTransformer[Value]{
 //                            display_name d
 //                            signature_documentation scala d: Double 
 //                            kind Parameter
-//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
+//                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                     ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(index)
 //                                           display_name index
 //                                           signature_documentation scala index: Int 
 //                                           kind Parameter
-//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                            ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                   ^^^^^ reference semanticdb maven . . ujson/
 //                                                         ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //                                                             ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitFloat64().(d)
@@ -1199,7 +1199,7 @@ object Value extends AstTransformer[Value]{
 //                                       display_name index
 //                                       signature_documentation scala index: Int 
 //                                       kind Parameter
-//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                        ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                               ^^^^^ reference semanticdb maven . . ujson/
 //                                                     ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.
 //                                                         ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.visitString().(s)
@@ -1237,21 +1237,21 @@ object Value extends AstTransformer[Value]{
 //                       signature_documentation scala def apply(data: Value, msg: String): InvalidData
 //                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
-//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function2#apply().
+//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function2#apply().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#productElementName().
 //                       display_name productElementName
 //                       signature_documentation scala def productElementName(x$1: Int): String
 //                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
-//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //           ___________ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#productElement().
 //                       display_name productElement
 //                       signature_documentation scala def productElement(x$1: Int): Any
 //                       kind Method
 //                       relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#
 //                       relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData.apply().
-//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                       relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                      ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().
 //                        display_name <init>
 //                        signature_documentation scala def this(data: Value, msg: String)
@@ -1313,11 +1313,11 @@ object Value extends AstTransformer[Value]{
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                        relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#copy().(msg)
 //                                        relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#msg.
-//                                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
     extends Exception(s"$msg (data: $data)")
-//          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.Exception#
+//          ^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.Exception#
 //                   ^ reference semanticdb maven jdk 11 java/lang/Exception#`<init>`(+1).
-//                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/StringContext#s().
+//                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/StringContext#s().
 //                       ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(msg)
 //                                   ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.InvalidData#`<init>`().(data)
 }
@@ -1335,7 +1335,7 @@ case class Str(value: String) extends Value
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#copy().
 //             display_name copy
 //             signature_documentation scala def copy(value: String): Str
@@ -1354,13 +1354,13 @@ case class Str(value: String) extends Value
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().
 //             display_name apply
 //             signature_documentation scala def apply(value: String): Str
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //            ^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().
 //              display_name <init>
 //              signature_documentation scala def this(value: String)
@@ -1394,7 +1394,7 @@ case class Str(value: String) extends Value
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#`<init>`().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Str.apply().(value)
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
@@ -1407,13 +1407,13 @@ case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
 //             signature_documentation scala def productElementName(x$1: Int): String
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#productElement().
 //             display_name productElement
 //             signature_documentation scala def productElement(x$1: Int): Any
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#copy().
 //             display_name copy
 //             signature_documentation scala def copy(value: LinkedHashMap[String, Value]): Obj
@@ -1453,8 +1453,8 @@ case class Obj(value: mutable.LinkedHashMap[String, Value]) extends Value
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply(+2).(value)
 //                    ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                            ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
-//                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                            ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
+//                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 
@@ -1478,16 +1478,16 @@ object Obj{
 //                        display_name items
 //                        signature_documentation scala items: TraversableOnce[(String, Value)] 
 //                        kind Parameter
-//                         ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
-//                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                         ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
+//                                          ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                            ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
     Obj(mutable.LinkedHashMap(items.toSeq:_*))
 //  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //      ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//              ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap.
+//              ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap.
 //                            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.from().(items)
-//                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceExtensionMethods#toSeq().
+//                                  ^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#toSeq().
   }
   // Weird telescoped version of `apply(items: (String, Value)*)`, to avoid
   // type inference issues due to overloading the existing `apply` method
@@ -1506,14 +1506,14 @@ object Obj{
 //                  display_name item
 //                  signature_documentation scala item: (String, V) 
 //                  kind Parameter
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().[V]
                         items: (String, Value)*)(implicit conv: V => Value): Obj = {
 //                      ^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(items)
 //                            display_name items
 //                            signature_documentation scala items: (String, Value)* 
 //                            kind Parameter
-//                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                              ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                        ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(conv)
 //                                                             display_name conv
@@ -1528,18 +1528,18 @@ object Obj{
 //          signature_documentation scala map: LinkedHashMap[String, Value] 
 //          kind Variable
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                        ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
-//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                        ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
+//                                      ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                              ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#`<init>`().
+//                                                    ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#`<init>`().
     map.put(item._1, conv(item._2))
 //  ^^^ reference local 22
-//      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#put().
+//      ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#put().
 //          ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(item)
-//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
+//               ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
 //                   ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(conv)
 //                        ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(item)
-//                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_2.
+//                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
     for (i <- items) map.put(i._1, i._2)
 //       ^ definition local 23
 //         display_name i
@@ -1547,11 +1547,11 @@ object Obj{
 //         kind Parameter
 //            ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.apply().(items)
 //                   ^^^ reference local 22
-//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#put().
+//                       ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#put().
 //                           ^ reference local 23
-//                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_1.
+//                             ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_1.
 //                                 ^ reference local 23
-//                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Tuple2#_2.
+//                                   ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Tuple2#_2.
     Obj(map)
 //  ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //      ^^^ reference local 22
@@ -1565,10 +1565,10 @@ object Obj{
 //             ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj#
 //                   ^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Obj.
 //                           ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                                   ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#
-//                                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                   ^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#
+//                                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
 //                                                         ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/LinkedHashMap#`<init>`().
+//                                                               ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/LinkedHashMap#`<init>`().
 }
 case class Arr(value: ArrayBuffer[Value]) extends Value
 //         ^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
@@ -1580,13 +1580,13 @@ case class Arr(value: ArrayBuffer[Value]) extends Value
 //             signature_documentation scala def productElement(x$1: Int): Any
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#productElementName().
 //             display_name productElementName
 //             signature_documentation scala def productElementName(x$1: Int): String
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().
 //             display_name copy
 //             signature_documentation scala def copy(value: ArrayBuffer[Value]): Arr
@@ -1625,7 +1625,7 @@ case class Arr(value: ArrayBuffer[Value]) extends Value
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#`<init>`().(value)
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr#value.
-//                    ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
+//                    ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
 //                                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                                ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 
@@ -1653,7 +1653,7 @@ object Arr{
 //                           display_name items
 //                           signature_documentation scala items: TraversableOnce[T] 
 //                           kind Parameter
-//                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/package.TraversableOnce#
+//                            ^^^^^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/package.TraversableOnce#
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().[T]
 //                                                         ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(conv)
 //                                                              display_name conv
@@ -1668,19 +1668,19 @@ object Arr{
 //          signature_documentation scala buf: ArrayBuffer[Value] 
 //          kind Variable
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
+//                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#`<init>`(+1).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#`<init>`(+1).
     items.foreach{ item =>
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(items)
-//        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceExtensionMethods#foreach().
+//        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceExtensionMethods#foreach().
 //                 ^^^^ definition local 26
 //                      display_name item
 //                      signature_documentation scala item: T 
 //                      kind Parameter
       buf += (conv(item): Value)
 //    ^^^ reference local 25
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Growable#`+=`().
 //            ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.from().(conv)
 //                 ^^^^ reference local 26
 //                        ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
@@ -1707,21 +1707,21 @@ object Arr{
 //          signature_documentation scala buf: ArrayBuffer[Value] 
 //          kind Variable
 //                ^^^^^^^ reference semanticdb maven . . scala/collection/mutable/
-//                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#
+//                        ^^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
-//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/ArrayBuffer#`<init>`(+2).
+//                                          ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/ArrayBuffer#`<init>`(+2).
 //                                           ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().(items)
-//                                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/SeqOps#length().
+//                                                 ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/SeqOps#length().
     items.foreach{ item =>
 //  ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Arr.apply().(items)
-//        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/IterableOnceOps#foreach().
+//        ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/IterableOnceOps#foreach().
 //                 ^^^^ definition local 28
 //                      display_name item
 //                      signature_documentation scala item: Value 
 //                      kind Parameter
       buf += item
 //    ^^^ reference local 27
-//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/collection/mutable/Growable#`+=`().
+//        ^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/collection/mutable/Growable#`+=`().
 //           ^^^^ reference local 28
     }
     Arr(buf)
@@ -1742,7 +1742,7 @@ case class Num(value: Double) extends Value
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().
 //             display_name copy
 //             signature_documentation scala def copy(value: Double): Num
@@ -1754,14 +1754,14 @@ case class Num(value: Double) extends Value
 //             signature_documentation scala def apply(value: Double): Num
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Function1#apply().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Function1#apply().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#productElementName().
 //             display_name productElementName
 //             signature_documentation scala def productElementName(x$1: Int): String
 //             kind Method
 //             relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#
 //             relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().
-//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElementName().
+//             relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElementName().
 //         ___ synthetic_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.
 //             display_name Num
 //             signature_documentation scala object Num
@@ -1801,7 +1801,7 @@ case class Num(value: Double) extends Value
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#copy().(value)
 //                   relationship is_reference is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num#value.
 //                   relationship is_reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Num.apply().(value)
-//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Double#
+//                    ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Double#
 //                                    ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                                         ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
 sealed abstract class Bool extends Value{
@@ -1823,7 +1823,7 @@ sealed abstract class Bool extends Value{
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.value().
 //          relationship is_reference is_implementation semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#value().
-//           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 }
 object Bool{
 //     ^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.
@@ -1839,7 +1839,7 @@ object Bool{
 //                display_name value
 //                signature_documentation scala value: Boolean 
 //                kind Parameter
-//                 ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                 ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                           ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                                      ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.apply().(value)
 //                                             ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
@@ -1854,9 +1854,9 @@ object Bool{
 //                 signature_documentation scala bool: Bool 
 //                 kind Parameter
 //                  ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
-//                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Option#
-//                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
-//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Some.
+//                         ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Option#
+//                                ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Some.
 //                                                ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool.unapply().(bool)
 //                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#value().
 }
@@ -1870,7 +1870,7 @@ case object False extends Bool{
 //                signature_documentation scala def productElement(x$1: Int): Any
 //                kind Method
 //                relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/False.
-//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//                relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                        ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
   def value = false
@@ -1891,7 +1891,7 @@ case object True extends Bool{
 //               signature_documentation scala def productElement(x$1: Int): Any
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/True.
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                       ^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#
 //                           ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Bool#`<init>`().
   def value = true
@@ -1912,7 +1912,7 @@ case object Null extends Value{
 //               signature_documentation scala def productElement(x$1: Int): Any
 //               kind Method
 //               relationship is_definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Null.
-//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Product#productElement().
+//               relationship is_reference is_implementation semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Product#productElement().
 //                       ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
 //                            ^ reference semanticdb maven jdk 11 java/lang/Object#`<init>`().
   def value = null
diff --git a/tests/snapshots/src/main/generated/ujson/package.scala b/tests/snapshots/src/main/generated/ujson/package.scala
index 24fe9c184..e7a607f02 100644
--- a/tests/snapshots/src/main/generated/ujson/package.scala
+++ b/tests/snapshots/src/main/generated/ujson/package.scala
@@ -51,7 +51,7 @@ package object ujson{
 //                            display_name trace
 //                            signature_documentation scala default trace: Boolean 
 //                            kind Parameter
-//                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                             ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
 //                                               ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.
 //                                                     ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value.Value#
     upickle.core.TraceVisitor.withTrace(trace, Value)(transform(s, _))
@@ -100,14 +100,14 @@ package object ujson{
 //                 display_name indent
 //                 signature_documentation scala default indent: Int 
 //                 kind Parameter
-//                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
             escapeUnicode: Boolean = false): String = {
 //          ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.write().(escapeUnicode)
 //                        display_name escapeUnicode
 //                        signature_documentation scala default escapeUnicode: Boolean 
 //                        kind Parameter
-//                         ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
-//                                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                         ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                           ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
     val writer = new java.io.StringWriter
 //      ^^^^^^ definition local 1
 //             display_name writer
@@ -155,14 +155,14 @@ package object ujson{
 //                   display_name indent
 //                   signature_documentation scala default indent: Int 
 //                   kind Parameter
-//                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                    ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
               escapeUnicode: Boolean = false): Unit = {
 //            ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(escapeUnicode)
 //                          display_name escapeUnicode
 //                          signature_documentation scala default escapeUnicode: Boolean 
 //                          kind Parameter
-//                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
-//                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                             ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
     transform(t, Renderer(out, indent, escapeUnicode))
 //  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeTo().(t)
@@ -195,14 +195,14 @@ package object ujson{
 //                               display_name indent
 //                               signature_documentation scala default indent: Int 
 //                               kind Parameter
-//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                           escapeUnicode: Boolean = false): Unit = {
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(escapeUnicode)
 //                                      display_name escapeUnicode
 //                                      signature_documentation scala default escapeUnicode: Boolean 
 //                                      kind Parameter
-//                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
-//                                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                                         ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
     transform(t, new BaseByteRenderer(out, indent, escapeUnicode))
 //  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToOutputStream().(t)
@@ -229,13 +229,13 @@ package object ujson{
 //                            display_name indent
 //                            signature_documentation scala default indent: Int 
 //                            kind Parameter
-//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                             ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                        escapeUnicode: Boolean = false) = {
 //                     ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.writeToByteArray().(escapeUnicode)
 //                                   display_name escapeUnicode
 //                                   signature_documentation scala default escapeUnicode: Boolean 
 //                                   kind Parameter
-//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                    ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
     val baos = new java.io.ByteArrayOutputStream
 //      ^^^^ definition local 2
 //           display_name baos
@@ -269,7 +269,7 @@ package object ujson{
 //               signature_documentation scala s: Readable 
 //               kind Parameter
 //                ^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Readable#
-//                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                           ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
 //                                  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //                                            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.validate().(s)
 //                                               ^^^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/upickle-core_2.13 1.4.0 upickle/core/NoOpVisitor.
@@ -291,13 +291,13 @@ package object ujson{
 //                                 display_name indent
 //                                 signature_documentation scala default indent: Int 
 //                                 kind Parameter
-//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                  ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                            ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformat().(escapeUnicode)
 //                                                          display_name escapeUnicode
 //                                                          signature_documentation scala default escapeUnicode: Boolean 
 //                                                          kind Parameter
-//                                                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
-//                                                                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Predef.String#
+//                                                           ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                                                             ^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Predef.String#
     val writer = new java.io.StringWriter()
 //      ^^^^^^ definition local 3
 //             display_name writer
@@ -342,13 +342,13 @@ package object ujson{
 //                                                        display_name indent
 //                                                        signature_documentation scala default indent: Int 
 //                                                        kind Parameter
-//                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                                         ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
 //                                                                   ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(escapeUnicode)
 //                                                                                 display_name escapeUnicode
 //                                                                                 signature_documentation scala default escapeUnicode: Boolean 
 //                                                                                 kind Parameter
-//                                                                                  ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
-//                                                                                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                                                                  ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                                                                                    ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
     transform(s, Renderer(out, indent, escapeUnicode))
 //  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatTo().(s)
@@ -384,14 +384,14 @@ package object ujson{
 //                                  display_name indent
 //                                  signature_documentation scala default indent: Int 
 //                                  kind Parameter
-//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                   ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                              escapeUnicode: Boolean = false): Unit = {
 //                           ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(escapeUnicode)
 //                                         display_name escapeUnicode
 //                                         signature_documentation scala default escapeUnicode: Boolean 
 //                                         kind Parameter
-//                                          ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
-//                                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Unit#
+//                                          ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
+//                                                            ^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Unit#
     transform(s, new BaseByteRenderer(out, indent, escapeUnicode))
 //  ^^^^^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.transform().
 //            ^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToOutputStream().(s)
@@ -416,13 +416,13 @@ package object ujson{
 //                               display_name indent
 //                               signature_documentation scala default indent: Int 
 //                               kind Parameter
-//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Int#
+//                                ^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Int#
                           escapeUnicode: Boolean = false) = {
 //                        ^^^^^^^^^^^^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.reformatToByteArray().(escapeUnicode)
 //                                      display_name escapeUnicode
 //                                      signature_documentation scala default escapeUnicode: Boolean 
 //                                      kind Parameter
-//                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/Boolean#
+//                                       ^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/Boolean#
     val baos = new java.io.ByteArrayOutputStream
 //      ^^^^ definition local 4
 //           display_name baos
@@ -444,8 +444,8 @@ package object ujson{
   }
   // End ujson
   @deprecated("use ujson.Value")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   type Js = Value
 //     ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.Js#
 //        display_name Js
@@ -453,8 +453,8 @@ package object ujson{
 //        kind Type
 //          ^^^^^ reference semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/Value#
   @deprecated("use ujson.Value")
-// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#
-//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.10 scala/deprecated#`<init>`().
+// ^^^^^^^^^^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#
+//           ^ reference semanticdb maven maven/org.scala-lang/scala-library 2.13.13 scala/deprecated#`<init>`().
   val Js = Value
 //    ^^ definition semanticdb maven maven/com.lihaoyi/ujson_2.13 1.4.0 ujson/package.Js.
 //       display_name Js

From 44c275c66c3ab7c188cd31a86ab3e7dedee03038 Mon Sep 17 00:00:00 2001
From: Anton Sviridov <keynmol@gmail.com>
Date: Mon, 20 May 2024 14:26:40 +0100
Subject: [PATCH 11/11] Fix snapshot tests

---
 .../sourcegraph/scip_java/ScipPrinters.scala  | 14 ++++----
 .../scala/tests/SnapshotCommandSuite.scala    | 33 +++++++++++++++----
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
index 53fafcb18..af78536ab 100644
--- a/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
+++ b/scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala
@@ -183,7 +183,13 @@ object ScipPrinters {
             .append("signature_documentation ")
             .append(info.getSignatureDocumentation.getLanguage)
             .append(" ")
-            .append(info.getSignatureDocumentation.getText.replace("\n", "\\n").replace("\t", "\\t"))
+            .append(
+              info
+                .getSignatureDocumentation
+                .getText
+                .replace("\n", "\\n")
+                .replace("\t", "\\t")
+            )
             .append("\n")
         }
         if (!info.getEnclosingSymbol.isEmpty) {
@@ -194,11 +200,7 @@ object ScipPrinters {
             .append("\n")
         }
         if (info.getKind != Scip.SymbolInformation.Kind.UnspecifiedKind) {
-          out
-            .append(prefix)
-            .append("kind ")
-            .append(info.getKind)
-            .append("\n")
+          out.append(prefix).append("kind ").append(info.getKind).append("\n")
         }
         0.until(info.getDocumentationCount)
           .foreach { n =>
diff --git a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala
index 7fc0eeb91..061841ed5 100644
--- a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala
+++ b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala
@@ -13,8 +13,13 @@ class SnapshotCommandSuite extends MopedSuite(ScipJava.app) {
     FileLayout.fromString(
       """/main/Sample.java
         |package main;
-        |
+        | /**
+        |  * Sample class
+        |  */
         |public class Sample {
+        |   /**
+        |    * Main application entry point
+        |    */
         |   public static void main(String[] asdf) {}
         |}
         |""".stripMargin,
@@ -37,6 +42,7 @@ class SnapshotCommandSuite extends MopedSuite(ScipJava.app) {
         targetroot.toString
       )
     )
+
     assertEquals(indexExit, 0, clues(app.capturedOutput))
 
     val snapshotExit = app().run(
@@ -47,18 +53,33 @@ class SnapshotCommandSuite extends MopedSuite(ScipJava.app) {
       FileLayout.asString(generatedpath),
       """|/main/Sample.java
          |package main;
-         |
+         | /**
+         |  * Sample class
+         |  */
          |public class Sample {
          |//           ^^^^^^ definition semanticdb maven . . main/Sample#
-         |//                  documentation ```java\npublic class Sample\n```
+         |//                  display_name Sample
+         |//                  signature_documentation java public class Sample
+         |//                  kind Class
+         |//                  documentation  Sample class\n
          |//           ^^^^^^ definition semanticdb maven . . main/Sample#`<init>`().
-         |//                  documentation ```java\npublic Sample()\n```
+         |//                  display_name <init>
+         |//                  signature_documentation java public Sample()
+         |//                  kind Constructor
+         |   /**
+         |    * Main application entry point
+         |    */
          |   public static void main(String[] asdf) {}
          |//                    ^^^^ definition semanticdb maven . . main/Sample#main().
-         |//                         documentation ```java\npublic static void main(String[] asdf)\n```
+         |//                         display_name main
+         |//                         signature_documentation java public static void main(String[] asdf)
+         |//                         kind StaticMethod
+         |//                         documentation  Main application entry point\n
          |//                         ^^^^^^ reference semanticdb maven jdk 11 java/lang/String#
          |//                                  ^^^^ definition local 0
-         |//                                       documentation ```java\nString[] asdf\n```
+         |//                                       display_name asdf
+         |//                                       signature_documentation java String[] asdf
+         |//                                       enclosing_symbol semanticdb maven . . main/Sample#main().
          |}
          |""".stripMargin
     )