Skip to content

Commit bd14ef9

Browse files
authored
Merge branch 'master' into fix-fragment-def-jsx4
2 parents 9af6b6a + 77334f7 commit bd14ef9

File tree

5 files changed

+26
-24
lines changed

5 files changed

+26
-24
lines changed

.github/stale.yml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,8 @@ daysUntilStale: 720
33
# Number of days of inactivity before a stale issue is closed
44
daysUntilClose: 7
55
# Issues with these labels will never be considered stale
6-
exemptLabels:
7-
- "PRIORITY:HIGH"
8-
- bug
9-
- non-critical-bug
10-
- security
11-
- enhancement
12-
- optimization
13-
- v8-breaking-changes
14-
- documentation
15-
- "need feedback"
16-
- "GOOD FIRST TASK"
17-
- "BREAKING CHANGES"
18-
- APPROVED
19-
- discussion
20-
- BUILD
21-
- "help wanted"
22-
- "GOOD FOR PR"
23-
- "TO REPRODUCE"
24-
- FFI
25-
- internal
26-
- ideas
27-
- playground
28-
- Syntax
29-
- test
6+
# exemptLabels:
7+
# - test
308
# Label to use when marking an issue as stale
319
staleLabel: stale
3210
# Comment to post when marking an issue as stale. Set to `false` to disable

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
- Remove unnecessary require and import statements when using dynamic imports. https://github.com/rescript-lang/rescript-compiler/pull/6232
2222
- Fix option unboxing logic in the presence of untagged variants. https://github.com/rescript-lang/rescript-compiler/pull/6233
23+
- Fix printing of local module with type. https://github.com/rescript-lang/rescript-compiler/issues/6212
2324
- Adapting JSX4 to React.fragment's children type change (`'children` -> `React.element`) https://github.com/rescript-lang/rescript-compiler/pull/6238
2425

2526
#### :nail_care: Polish

jscomp/syntax/src/res_printer.ml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4965,6 +4965,15 @@ and printExpressionBlock ~state ~braces expr cmtTbl =
49654965
let doc = Doc.text modName.txt in
49664966
printComments doc cmtTbl modName.loc
49674967
in
4968+
let name, modExpr =
4969+
match modExpr.pmod_desc with
4970+
| Pmod_constraint (modExpr, modType) ->
4971+
let name =
4972+
Doc.concat [name; Doc.text ": "; printModType ~state modType cmtTbl]
4973+
in
4974+
(name, modExpr)
4975+
| _ -> (name, modExpr)
4976+
in
49684977
let letModuleDoc =
49694978
Doc.concat
49704979
[

jscomp/syntax/tests/printer/modExpr/expected/structure.res.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,10 @@ module Empty = {/* test */}
1515
module EmptyModule = {
1616
/* TODO: management on vacation */
1717
}
18+
19+
module type T = {}
20+
21+
let g = {
22+
module M: T = {}
23+
0
24+
}

jscomp/syntax/tests/printer/modExpr/structure.res

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,10 @@ module Empty = {/* test */}
1515
module EmptyModule = {
1616
/* TODO: management on vacation */
1717
}
18+
19+
module type T = {}
20+
21+
let g = {
22+
module M: T = {}
23+
0
24+
}

0 commit comments

Comments
 (0)