@@ -13,14 +13,18 @@ defmodule ElixirLS.LanguageServer.ServerTest do
13
13
end )
14
14
end
15
15
16
- defp initialize ( server ) do
16
+ defp initialize ( server , config \\ nil ) do
17
17
Server . receive_packet ( server , initialize_req ( 1 , root_uri ( ) , % { } ) )
18
18
Server . receive_packet ( server , notification ( "initialized" ) )
19
19
20
+ config = ( config || % { } ) |> Map . merge ( % { "dialyzerEnabled" => false } )
21
+
20
22
Server . receive_packet (
21
23
server ,
22
- did_change_configuration ( % { "elixirLS" => % { "dialyzerEnabled" => false } } )
24
+ did_change_configuration ( % { "elixirLS" => config } )
23
25
)
26
+
27
+ wait_until_compiled ( server )
24
28
end
25
29
26
30
defp fake_initialize ( server ) do
@@ -968,8 +972,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
968
972
969
973
# File is already formatted
970
974
assert response ( 3 , [ ] ) == resp
971
-
972
- wait_until_compiled ( server )
973
975
end )
974
976
end
975
977
@@ -1048,8 +1050,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1048
1050
]
1049
1051
} ) ,
1050
1052
1000
1051
-
1052
- wait_until_compiled ( server )
1053
1053
end )
1054
1054
end
1055
1055
@@ -1071,8 +1071,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1071
1071
]
1072
1072
} ) ,
1073
1073
1000
1074
-
1075
- wait_until_compiled ( server )
1076
1074
end )
1077
1075
end
1078
1076
@@ -1094,8 +1092,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1094
1092
]
1095
1093
} ) ,
1096
1094
2000
1097
-
1098
- wait_until_compiled ( server )
1099
1095
end )
1100
1096
end
1101
1097
@@ -1110,7 +1106,7 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1110
1106
Build . set_compiler_options ( )
1111
1107
1112
1108
initialize ( server )
1113
- wait_until_compiled ( server )
1109
+
1114
1110
Server . receive_packet ( server , did_open ( file_uri , "elixir" , 1 , text ) )
1115
1111
1116
1112
Server . receive_packet (
@@ -1126,8 +1122,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1126
1122
"uri" => ^ reference_uri
1127
1123
}
1128
1124
] ) = resp
1129
-
1130
- wait_until_compiled ( server )
1131
1125
end )
1132
1126
after
1133
1127
Code . put_compiler_option ( :tracers , [ ] )
@@ -1144,7 +1138,7 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1144
1138
Build . set_compiler_options ( )
1145
1139
1146
1140
initialize ( server )
1147
- wait_until_compiled ( server )
1141
+
1148
1142
Server . receive_packet ( server , did_open ( file_uri , "elixir" , 1 , text ) )
1149
1143
1150
1144
Server . receive_packet (
@@ -1160,8 +1154,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1160
1154
"uri" => ^ reference_uri
1161
1155
}
1162
1156
] ) = resp
1163
-
1164
- wait_until_compiled ( server )
1165
1157
end )
1166
1158
after
1167
1159
Code . put_compiler_option ( :tracers , [ ] )
@@ -1176,7 +1168,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1176
1168
with_new_server ( fn server ->
1177
1169
{ :ok , _pid } = Tracer . start_link ( [ ] )
1178
1170
initialize ( server )
1179
- wait_until_compiled ( server )
1180
1171
end )
1181
1172
1182
1173
# unload App2.Foo
@@ -1185,7 +1176,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1185
1176
# re-visiting the same project
1186
1177
with_new_server ( fn server ->
1187
1178
initialize ( server )
1188
- wait_until_compiled ( server )
1189
1179
1190
1180
file_path = "apps/app1/lib/bar.ex"
1191
1181
uri = SourceFile.Path . to_uri ( file_path )
@@ -1230,12 +1220,7 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1230
1220
1231
1221
project_dir = SourceFile.Path . absolute_from_uri ( root_uri ( ) )
1232
1222
1233
- initialize ( server )
1234
-
1235
- Server . receive_packet (
1236
- server ,
1237
- did_change_configuration ( % { "elixirLS" => % { "enableTestLenses" => true } } )
1238
- )
1223
+ initialize ( server , % { "enableTestLenses" => true } )
1239
1224
1240
1225
Server . receive_packet ( server , did_open ( file_uri , "elixir" , 1 , text ) )
1241
1226
@@ -1282,8 +1267,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1282
1267
}
1283
1268
}
1284
1269
] ) = resp
1285
-
1286
- wait_until_compiled ( server )
1287
1270
end )
1288
1271
end
1289
1272
@@ -1299,17 +1282,10 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1299
1282
text = File . read! ( file_path )
1300
1283
project_dir = SourceFile.Path . from_uri ( "#{ root_uri ( ) } /apps/app1" )
1301
1284
1302
- initialize ( server )
1303
-
1304
- Server . receive_packet (
1305
- server ,
1306
- did_change_configuration ( % { "elixirLS" => % { "enableTestLenses" => true } } )
1307
- )
1285
+ initialize ( server , % { "enableTestLenses" => true } )
1308
1286
1309
1287
Server . receive_packet ( server , did_open ( file_uri , "elixir" , 1 , text ) )
1310
1288
1311
- wait_until_compiled ( server )
1312
-
1313
1289
Server . receive_packet (
1314
1290
server ,
1315
1291
code_lens_req ( 4 , file_uri )
@@ -1391,17 +1367,10 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1391
1367
text = File . read! ( file_path )
1392
1368
project_dir = SourceFile.Path . from_uri ( root_uri ( ) )
1393
1369
1394
- initialize ( server )
1395
-
1396
- Server . receive_packet (
1397
- server ,
1398
- did_change_configuration ( % { "elixirLS" => % { "enableTestLenses" => true } } )
1399
- )
1370
+ initialize ( server , % { "enableTestLenses" => true } )
1400
1371
1401
1372
Server . receive_packet ( server , did_open ( file_uri , "elixir" , 1 , text ) )
1402
1373
1403
- wait_until_compiled ( server )
1404
-
1405
1374
Server . receive_packet (
1406
1375
server ,
1407
1376
code_lens_req ( 4 , file_uri )
@@ -1460,23 +1429,14 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1460
1429
text = File . read! ( file_path )
1461
1430
project_dir = SourceFile.Path . from_uri ( "#{ root_uri ( ) } /apps/app1" )
1462
1431
1463
- initialize ( server )
1464
-
1465
- Server . receive_packet (
1466
- server ,
1467
- did_change_configuration ( % {
1468
- "elixirLS" => % {
1469
- "enableTestLenses" => true ,
1470
- "testPaths" => % { "app1" => [ "custom_path" ] } ,
1471
- "testPattern" => % { "app1" => "*_custom_test.exs" }
1472
- }
1473
- } )
1474
- )
1432
+ initialize ( server , % {
1433
+ "enableTestLenses" => true ,
1434
+ "testPaths" => % { "app1" => [ "custom_path" ] } ,
1435
+ "testPattern" => % { "app1" => "*_custom_test.exs" }
1436
+ } )
1475
1437
1476
1438
Server . receive_packet ( server , did_open ( file_uri , "elixir" , 1 , text ) )
1477
1439
1478
- wait_until_compiled ( server )
1479
-
1480
1440
Server . receive_packet (
1481
1441
server ,
1482
1442
code_lens_req ( 4 , file_uri )
@@ -1541,8 +1501,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
1541
1501
assert_receive notification ( "window/logMessage" , % {
1542
1502
"message" => "Compile took" <> _
1543
1503
} )
1544
-
1545
- wait_until_compiled ( server )
1546
1504
end )
1547
1505
end
1548
1506
0 commit comments