@@ -36,7 +36,7 @@ include("test_vscode_example_functions.jl")
36
36
37
37
fake_terminal () do term, in, out, _
38
38
t = @async begin
39
- @test_nowarn descend (fib, (Int64 ,); terminal= term, iswarn, hide_type_stable, inlay_types_vscode, diagnostics_vscode)
39
+ @test_nowarn descend (fib, (Int ,); terminal= term, iswarn, hide_type_stable, inlay_types_vscode, diagnostics_vscode)
40
40
end
41
41
write (in, ' q' )
42
42
wait (t)
@@ -60,18 +60,18 @@ include("test_vscode_example_functions.jl")
60
60
61
61
if ! hide_type_stable && inlay_types_vscode
62
62
@test equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
63
- TypedSyntax. InlayHint (1 , 14 , " ::Int64 " , 1 )
64
- TypedSyntax. InlayHint (1 , 15 , " ::Int64 " , 1 )
63
+ TypedSyntax. InlayHint (1 , 14 , " ::$Int " , 1 )
64
+ TypedSyntax. InlayHint (1 , 15 , " ::$Int " , 1 )
65
65
TypedSyntax. InlayHint (3 , 11 , " (" , 1 )
66
66
TypedSyntax. InlayHint (3 , 15 , " (" , 1 )
67
- TypedSyntax. InlayHint (3 , 16 , " ::Int64 " , 1 )
68
- TypedSyntax. InlayHint (3 , 20 , " )::Int64 " , 1 )
69
- TypedSyntax. InlayHint (3 , 21 , " ::Int64 " , 1 )
67
+ TypedSyntax. InlayHint (3 , 16 , " ::$Int " , 1 )
68
+ TypedSyntax. InlayHint (3 , 20 , " )::$Int " , 1 )
69
+ TypedSyntax. InlayHint (3 , 21 , " ::$Int " , 1 )
70
70
TypedSyntax. InlayHint (3 , 28 , " (" , 1 )
71
- TypedSyntax. InlayHint (3 , 29 , " ::Int64 " , 1 )
72
- TypedSyntax. InlayHint (3 , 33 , " )::Int64 " , 1 )
73
- TypedSyntax. InlayHint (3 , 34 , " ::Int64 " , 1 )
74
- TypedSyntax. InlayHint (3 , 34 , " )::Int64 " , 1 )
71
+ TypedSyntax. InlayHint (3 , 29 , " ::$Int " , 1 )
72
+ TypedSyntax. InlayHint (3 , 33 , " )::$Int " , 1 )
73
+ TypedSyntax. InlayHint (3 , 34 , " ::$Int " , 1 )
74
+ TypedSyntax. InlayHint (3 , 34 , " )::$Int " , 1 )
75
75
])
76
76
elseif hide_type_stable && inlay_types_vscode
77
77
@test isempty (VSCodeServer. inlay_hints[1 ])
@@ -85,7 +85,7 @@ include("test_vscode_example_functions.jl")
85
85
86
86
fake_terminal () do term, in, out, _
87
87
t = @async begin
88
- @test_nowarn descend (fVSCode, (Int64 ,); terminal= term, iswarn, hide_type_stable, inlay_types_vscode, diagnostics_vscode)
88
+ @test_nowarn descend (fVSCode, (Int ,); terminal= term, iswarn, hide_type_stable, inlay_types_vscode, diagnostics_vscode)
89
89
end
90
90
write (in, ' q' )
91
91
wait (t)
@@ -114,60 +114,60 @@ include("test_vscode_example_functions.jl")
114
114
if ! hide_type_stable && inlay_types_vscode
115
115
if iswarn
116
116
@test equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
117
- TypedSyntax. InlayHint (7 , 18 , " ::Int64 " , 1 )
118
- TypedSyntax. InlayHint (7 , 19 , " ::Union{Float64, Int64 }" , nothing )
119
- TypedSyntax. InlayHint (8 , 5 , " ::Int64 " , 1 )
117
+ TypedSyntax. InlayHint (7 , 18 , " ::$Int " , 1 )
118
+ TypedSyntax. InlayHint (7 , 19 , " ::Union{Float64, $Int }" , nothing )
119
+ TypedSyntax. InlayHint (8 , 5 , " ::$Int " , 1 )
120
120
TypedSyntax. InlayHint (8 , 8 , " (" , 1 )
121
- TypedSyntax. InlayHint (8 , 9 , " ::Int64 " , 1 )
122
- TypedSyntax. InlayHint (8 , 13 , " )::Int64 " , 1 )
123
- TypedSyntax. InlayHint (9 , 5 , " ::Int64 " , 1 )
121
+ TypedSyntax. InlayHint (8 , 9 , " ::$Int " , 1 )
122
+ TypedSyntax. InlayHint (8 , 13 , " )::$Int " , 1 )
123
+ TypedSyntax. InlayHint (9 , 5 , " ::$Int " , 1 )
124
124
TypedSyntax. InlayHint (9 , 8 , " (" , 1 )
125
- TypedSyntax. InlayHint (9 , 13 , " ::Int64 " , 1 )
126
- TypedSyntax. InlayHint (9 , 13 , " )::Int64 " , 1 )
125
+ TypedSyntax. InlayHint (9 , 13 , " ::$Int " , 1 )
126
+ TypedSyntax. InlayHint (9 , 13 , " )::$Int " , 1 )
127
127
TypedSyntax. InlayHint (10 , 11 , " (" , 1 )
128
- TypedSyntax. InlayHint (10 , 12 , " ::Int64 " , 1 )
128
+ TypedSyntax. InlayHint (10 , 12 , " ::$Int " , 1 )
129
129
TypedSyntax. InlayHint (10 , 16 , " (" , 1 )
130
- TypedSyntax. InlayHint (10 , 17 , " ::Int64 " , 1 )
130
+ TypedSyntax. InlayHint (10 , 17 , " ::$Int " , 1 )
131
131
TypedSyntax. InlayHint (10 , 21 , " )::Bool" , 1 )
132
- TypedSyntax. InlayHint (10 , 26 , " ::Int64 " , 1 )
132
+ TypedSyntax. InlayHint (10 , 26 , " ::$Int " , 1 )
133
133
TypedSyntax. InlayHint (10 , 32 , " ::Float64" , 1 )
134
- TypedSyntax. InlayHint (10 , 33 , " )::Union{Float64, Int64 }" , nothing )
134
+ TypedSyntax. InlayHint (10 , 33 , " )::Union{Float64, $Int }" , nothing )
135
135
])
136
136
137
137
else
138
138
@test equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
139
- TypedSyntax. InlayHint (7 , 18 , " ::Int64 " , 1 )
140
- TypedSyntax. InlayHint (7 , 19 , " ::Union{Float64, Int64 }" , 1 )
141
- TypedSyntax. InlayHint (8 , 5 , " ::Int64 " , 1 )
139
+ TypedSyntax. InlayHint (7 , 18 , " ::$Int " , 1 )
140
+ TypedSyntax. InlayHint (7 , 19 , " ::Union{Float64, $Int }" , 1 )
141
+ TypedSyntax. InlayHint (8 , 5 , " ::$Int " , 1 )
142
142
TypedSyntax. InlayHint (8 , 8 , " (" , 1 )
143
- TypedSyntax. InlayHint (8 , 9 , " ::Int64 " , 1 )
144
- TypedSyntax. InlayHint (8 , 13 , " )::Int64 " , 1 )
145
- TypedSyntax. InlayHint (9 , 5 , " ::Int64 " , 1 )
143
+ TypedSyntax. InlayHint (8 , 9 , " ::$Int " , 1 )
144
+ TypedSyntax. InlayHint (8 , 13 , " )::$Int " , 1 )
145
+ TypedSyntax. InlayHint (9 , 5 , " ::$Int " , 1 )
146
146
TypedSyntax. InlayHint (9 , 8 , " (" , 1 )
147
- TypedSyntax. InlayHint (9 , 13 , " ::Int64 " , 1 )
148
- TypedSyntax. InlayHint (9 , 13 , " )::Int64 " , 1 )
147
+ TypedSyntax. InlayHint (9 , 13 , " ::$Int " , 1 )
148
+ TypedSyntax. InlayHint (9 , 13 , " )::$Int " , 1 )
149
149
TypedSyntax. InlayHint (10 , 11 , " (" , 1 )
150
- TypedSyntax. InlayHint (10 , 12 , " ::Int64 " , 1 )
150
+ TypedSyntax. InlayHint (10 , 12 , " ::$Int " , 1 )
151
151
TypedSyntax. InlayHint (10 , 16 , " (" , 1 )
152
- TypedSyntax. InlayHint (10 , 17 , " ::Int64 " , 1 )
152
+ TypedSyntax. InlayHint (10 , 17 , " ::$Int " , 1 )
153
153
TypedSyntax. InlayHint (10 , 21 , " )::Bool" , 1 )
154
- TypedSyntax. InlayHint (10 , 26 , " ::Int64 " , 1 )
154
+ TypedSyntax. InlayHint (10 , 26 , " ::$Int " , 1 )
155
155
TypedSyntax. InlayHint (10 , 32 , " ::Float64" , 1 )
156
- TypedSyntax. InlayHint (10 , 33 , " )::Union{Float64, Int64 }" , 1 )
156
+ TypedSyntax. InlayHint (10 , 33 , " )::Union{Float64, $Int }" , 1 )
157
157
])
158
158
end
159
159
elseif hide_type_stable && inlay_types_vscode
160
160
if iswarn
161
161
@test equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
162
- TypedSyntax. InlayHint (7 , 19 , " ::Union{Float64, Int64 }" , nothing )
162
+ TypedSyntax. InlayHint (7 , 19 , " ::Union{Float64, $Int }" , nothing )
163
163
TypedSyntax. InlayHint (10 , 11 , " (" , 1 )
164
- TypedSyntax. InlayHint (10 , 33 , " )::Union{Float64, Int64 }" , nothing )
164
+ TypedSyntax. InlayHint (10 , 33 , " )::Union{Float64, $Int }" , nothing )
165
165
])
166
166
else
167
167
@test equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
168
- TypedSyntax. InlayHint (7 , 19 , " ::Union{Float64, Int64 }" , 1 )
168
+ TypedSyntax. InlayHint (7 , 19 , " ::Union{Float64, $Int }" , 1 )
169
169
TypedSyntax. InlayHint (10 , 11 , " (" , 1 )
170
- TypedSyntax. InlayHint (10 , 33 , " )::Union{Float64, Int64 }" , 1 )
170
+ TypedSyntax. InlayHint (10 , 33 , " )::Union{Float64, $Int }" , 1 )
171
171
])
172
172
end
173
173
end
@@ -206,25 +206,33 @@ include("test_vscode_example_functions.jl")
206
206
if ! hide_type_stable && inlay_types_vscode
207
207
@test equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
208
208
TypedSyntax. InlayHint (14 , 18 , " ::Float64" , 1 )
209
- TypedSyntax. InlayHint (14 , 19 , " ::Int64" , 1 )
210
- TypedSyntax. InlayHint (15 , 15 , " ::Float64" , 1 )
211
- TypedSyntax. InlayHint (15 , 16 , " ::Int64" , 1 )
209
+ TypedSyntax. InlayHint (14 , 19 , " ::$Int " , 1 )
210
+ TypedSyntax. InlayHint (15 , 11 , " ::Type{$Int }" , 1 )
211
+ TypedSyntax. InlayHint (15 , 13 , " ::Float64" , 1 )
212
+ TypedSyntax. InlayHint (15 , 14 , " ::$Int " , 1 )
212
213
TypedSyntax. InlayHint (16 , 9 , " ::Float64" , 1 )
213
- TypedSyntax. InlayHint (16 , 10 , " ::Int64" , 1 )
214
- ])
214
+ TypedSyntax. InlayHint (16 , 10 , " ::$Int " , 1 )
215
+ ]) || equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
216
+ TypedSyntax. InlayHint (14 , 18 , " ::Float64" , 1 )
217
+ TypedSyntax. InlayHint (14 , 19 , " ::$Int " , 1 )
218
+ TypedSyntax. InlayHint (15 , 13 , " ::Float64" , 1 )
219
+ TypedSyntax. InlayHint (15 , 14 , " ::$Int " , 1 )
220
+ TypedSyntax. InlayHint (16 , 9 , " ::Float64" , 1 )
221
+ TypedSyntax. InlayHint (16 , 10 , " ::$Int " , 1 )
222
+ ]) # Workaround for #530
215
223
elseif hide_type_stable && inlay_types_vscode
216
224
@test isempty (VSCodeServer. inlay_hints[1 ])
217
225
end
218
226
end
219
227
end
220
228
221
229
for inlay_types_vscode in (true , false ), diagnostics_vscode in (true , false ), iswarn in (true , false ), hide_type_stable in (true , false )
222
- @testset " fibcall Int64 inlay_types_vscode=$inlay_types_vscode , diagnostics_vscode=$diagnostics_vscode , iswarn=$iswarn , hide_type_stable=$hide_type_stable " begin
230
+ @testset " fibcall Int inlay_types_vscode=$inlay_types_vscode , diagnostics_vscode=$diagnostics_vscode , iswarn=$iswarn , hide_type_stable=$hide_type_stable " begin
223
231
VSCodeServer. reset_test_containers ()
224
232
225
233
fake_terminal () do term, in, out, _
226
234
t = @async begin
227
- @test_nowarn descend (fibcall, (Int64 ,); terminal= term, iswarn, hide_type_stable, inlay_types_vscode, diagnostics_vscode)
235
+ @test_nowarn descend (fibcall, (Int ,); terminal= term, iswarn, hide_type_stable, inlay_types_vscode, diagnostics_vscode)
228
236
end
229
237
write (in, ' q' )
230
238
wait (t)
@@ -248,30 +256,50 @@ include("test_vscode_example_functions.jl")
248
256
249
257
if ! hide_type_stable && inlay_types_vscode
250
258
@test equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
251
- TypedSyntax. InlayHint (14 , 18 , " ::Int64" , 1 )
252
- TypedSyntax. InlayHint (14 , 19 , " ::Int64" , 1 )
253
- TypedSyntax. InlayHint (15 , 15 , " ::Int64" , 1 )
254
- TypedSyntax. InlayHint (15 , 16 , " ::Int64" , 1 )
255
- TypedSyntax. InlayHint (16 , 9 , " ::Int64" , 1 )
256
- TypedSyntax. InlayHint (16 , 10 , " ::Int64" , 1 )
257
- TypedSyntax. InlayHint (1 , 14 , " ::Int64" , 1 )
258
- TypedSyntax. InlayHint (1 , 15 , " ::Int64" , 1 )
259
+ TypedSyntax. InlayHint (14 , 18 , " ::$Int " , 1 )
260
+ TypedSyntax. InlayHint (14 , 19 , " ::$Int " , 1 )
261
+ TypedSyntax. InlayHint (15 , 11 , " ::Type{$Int }" , 1 )
262
+ TypedSyntax. InlayHint (15 , 13 , " ::$Int " , 1 )
263
+ TypedSyntax. InlayHint (15 , 14 , " ::$Int " , 1 )
264
+ TypedSyntax. InlayHint (16 , 9 , " ::$Int " , 1 )
265
+ TypedSyntax. InlayHint (16 , 10 , " ::$Int " , 1 )
266
+ TypedSyntax. InlayHint (1 , 14 , " ::$Int " , 1 )
267
+ TypedSyntax. InlayHint (1 , 15 , " ::$Int " , 1 )
259
268
TypedSyntax. InlayHint (3 , 11 , " (" , 1 )
260
269
TypedSyntax. InlayHint (3 , 15 , " (" , 1 )
261
- TypedSyntax. InlayHint (3 , 16 , " ::Int64 " , 1 )
262
- TypedSyntax. InlayHint (3 , 20 , " )::Int64 " , 1 )
263
- TypedSyntax. InlayHint (3 , 21 , " ::Int64 " , 1 )
270
+ TypedSyntax. InlayHint (3 , 16 , " ::$Int " , 1 )
271
+ TypedSyntax. InlayHint (3 , 20 , " )::$Int " , 1 )
272
+ TypedSyntax. InlayHint (3 , 21 , " ::$Int " , 1 )
264
273
TypedSyntax. InlayHint (3 , 28 , " (" , 1 )
265
- TypedSyntax. InlayHint (3 , 29 , " ::Int64" , 1 )
266
- TypedSyntax. InlayHint (3 , 33 , " )::Int64" , 1 )
267
- TypedSyntax. InlayHint (3 , 34 , " ::Int64" , 1 )
268
- TypedSyntax. InlayHint (3 , 34 , " )::Int64" , 1 )
269
- ])
274
+ TypedSyntax. InlayHint (3 , 29 , " ::$Int " , 1 )
275
+ TypedSyntax. InlayHint (3 , 33 , " )::$Int " , 1 )
276
+ TypedSyntax. InlayHint (3 , 34 , " ::$Int " , 1 )
277
+ TypedSyntax. InlayHint (3 , 34 , " )::$Int " , 1 )
278
+ ]) || equal_upto_ordering (first (values (VSCodeServer. inlay_hints[1 ])), [
279
+ TypedSyntax. InlayHint (14 , 18 , " ::$Int " , 1 )
280
+ TypedSyntax. InlayHint (14 , 19 , " ::$Int " , 1 )
281
+ TypedSyntax. InlayHint (15 , 13 , " ::$Int " , 1 )
282
+ TypedSyntax. InlayHint (15 , 14 , " ::$Int " , 1 )
283
+ TypedSyntax. InlayHint (16 , 9 , " ::$Int " , 1 )
284
+ TypedSyntax. InlayHint (16 , 10 , " ::$Int " , 1 )
285
+ TypedSyntax. InlayHint (1 , 14 , " ::$Int " , 1 )
286
+ TypedSyntax. InlayHint (1 , 15 , " ::$Int " , 1 )
287
+ TypedSyntax. InlayHint (3 , 11 , " (" , 1 )
288
+ TypedSyntax. InlayHint (3 , 15 , " (" , 1 )
289
+ TypedSyntax. InlayHint (3 , 16 , " ::$Int " , 1 )
290
+ TypedSyntax. InlayHint (3 , 20 , " )::$Int " , 1 )
291
+ TypedSyntax. InlayHint (3 , 21 , " ::$Int " , 1 )
292
+ TypedSyntax. InlayHint (3 , 28 , " (" , 1 )
293
+ TypedSyntax. InlayHint (3 , 29 , " ::$Int " , 1 )
294
+ TypedSyntax. InlayHint (3 , 33 , " )::$Int " , 1 )
295
+ TypedSyntax. InlayHint (3 , 34 , " ::$Int " , 1 )
296
+ TypedSyntax. InlayHint (3 , 34 , " )::$Int " , 1 )
297
+ ]) # Workaround for #530
270
298
elseif hide_type_stable && inlay_types_vscode
271
299
@test isempty (VSCodeServer. inlay_hints[1 ])
272
300
end
273
301
end
274
302
end
275
303
end
276
304
277
- end
305
+ end
0 commit comments