Skip to content

Nested record definitions #7241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 20, 2025
Merged

Nested record definitions #7241

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
42fac3a
poc of nested record definitions
zth Jan 10, 2025
0706f6c
tests
zth Jan 11, 2025
bee6305
fix reanalyze suggestions
zth Jan 11, 2025
c118a04
allow inline records in constrs
zth Jan 11, 2025
f1a8a5c
basic inline printing of nested records
zth Mar 13, 2025
9fe845e
update errors
zth Mar 13, 2025
77c6295
output
zth Mar 13, 2025
6560a83
make hovers a bit nicer
zth Mar 13, 2025
0f88be3
refactor away the need for res.inlineRecordReference
zth Mar 14, 2025
c98809e
refactor away unecessary dot check
zth Mar 14, 2025
f6129ac
refactor inline types context
zth Mar 19, 2025
35d95b5
support type params
zth Mar 19, 2025
4097443
add tests
zth Mar 19, 2025
653c81f
try disabling reanalyze
zth Mar 19, 2025
e6598ee
remove file
zth Mar 19, 2025
04847f7
changelog
zth Mar 19, 2025
ed4cd0f
comments
zth Mar 19, 2025
ce287c4
remove reanalyze from ci
zth Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ jobs:
- os: ubuntu-24.04
ocaml_compiler: ocaml-variants.5.2.1+options,ocaml-option-static
# Reanalyze does not work on OCaml 5.3.0 anymore, therefore run it on 5.2.1
# disabled for now, since Reanalyze will stop working going forward. Can likely be removed entirely soon
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is the only use of reanalyze, how about removing it entirely.
No point in bringing it back later, as it would immediately give an error.
CC @cknitt

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cknitt you agree? I'll remove it before merging this, if so.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, go ahead!

run_reanalyze: false
- os: ubuntu-24.04
ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
- Add `inert` attribute to `JsxDOM.domProps`. https://github.com/rescript-lang/rescript/pull/7326
- Make reanalyze exception tracking work with the new stdlib. https://github.com/rescript-lang/rescript/pull/7328
- Fix Pervasive.max using boolean comparison for floats. https://github.com/rescript-lang/rescript/pull/7333
- Support nested/inline record types - records defined inside of other records, without needing explicit separate type definitions. https://github.com/rescript-lang/rescript/pull/7241
- Experimental: Support nested/inline record types - records defined inside of other records, without needing explicit separate type definitions. https://github.com/rescript-lang/rescript/pull/7241

#### :boom: Breaking Change

Expand Down
2 changes: 2 additions & 0 deletions analysis/src/Hover.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ let expandTypes ~file ~package ~supportsMarkdownLinks typ =
| {decl; path} :: _
when Res_parsetree_viewer.has_inline_record_definition_attribute
decl.type_attributes ->
(* We print inline record types just with their definition, not the constr pointing
to them, since that doesn't make sense to show the user. *)
( [
Markdown.codeBlock
(decl
Expand Down
1 change: 1 addition & 0 deletions compiler/ml/printtyp.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ let rec tree_of_typexp ?(printing_context : printing_context option) sch ty =
find_inlined_type (Path.name p) printing_context |> Option.get
with
| Record {labels} ->
(* Print inlined records as actual inlined record structures, not a reference to the inlined type only. *)
Otyp_record (List.map (tree_of_label ?printing_context) labels))
| Tconstr (p, tyl, _abbrev) ->
let p', s = best_type_path p in
Expand Down
1 change: 1 addition & 0 deletions compiler/ml/printtyp.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ open Types
open Outcometree

type printing_context = {inlined_types: type_inlined_type list}
(** Tracks things like inlined records, to help with printing. *)

val print_res_poly_identifier : (string -> string) ref
val longident : formatter -> Longident.t -> unit
Expand Down