Don't produce duplicate type definitions for recursive types #7524
Conversation
| @@ -115,7 +117,18 @@ let expandTypes ~file ~package ~supportsMarkdownLinks typ = | |||
| ], | |||
| `InlineType ) | |||
| | all -> | |||
| let typesSeen = ref StringSet.empty in | |||
| let typeId ~(env : QueryEnv.t) ~name = | |||
| env.file.moduleName :: List.rev (name :: env.pathRev) |> String.concat "." | |||
There was a problem hiding this comment.
This is based on Debug.debugPrintEnv
There was a problem hiding this comment.
There's TypeUtils.findRootTypeId already, I wonder if that could cover this use case? It works on type_expr though.
There was a problem hiding this comment.
Its full type is
TypeUtils.findRootTypeId ~(full : full) ~(env : QueryEnv.t) (t : Types.type_expr)with type full = {extra: extra; file: File.t; package: package} and
type extra = {
internalReferences: (int, Location.t list) Hashtbl.t;
externalReferences:
(string, (string list * Tip.t * Location.t) list) Hashtbl.t;
fileReferences: (string, LocationSet.t) Hashtbl.t;
mutable locItems: locItem list;
}So my first question is would I need to build an extra value or would a dummy value like the following work?
{internalReferences: Hashtbl.empty, externalReferences: Hashtbl.empty, fileReferences: Hashtbl.empty, locItems: []}As for getting type_expr values instead of Hover.extractedType values, I would need to modify Hover.findRelevantTypesFromType right? Or do you think I should be able to convert an extractedType to a type_expr?
type extractedType = {
name: string;
path: Path.t;
decl: Types.type_declaration;
env: SharedTypes.QueryEnv.t;
loc: Warnings.loc;
}There was a problem hiding this comment.
Let's stick with your current approach!
rescript
@rescript/darwin-arm64
@rescript/darwin-x64
@rescript/linux-arm64
@rescript/linux-x64
@rescript/win32-x64
commit: |
|
ping @zth |
Hover.expandTypeswas creating duplicate entries for recursive types. By combining the type'senvandname, I was able to create IDs for types and filter out those we've already seen.