@@ -1333,14 +1333,32 @@ fn test_deglob() {
1333
1333
ls_server:: LsService :: handle_message( & mut server) ,
1334
1334
ls_server:: ServerStateChange :: Continue
1335
1335
) ;
1336
+
1337
+ {
1338
+ wait_for_n_results ! ( 1 , results) ;
1339
+ let response = json:: parse ( & results. lock ( ) . unwrap ( ) . remove ( 0 ) ) . unwrap ( ) ;
1340
+ println ! ( "{}" , response. pretty( 2 ) ) ;
1341
+ assert_eq ! ( response[ "id" ] , 0x0100_0002 ) ;
1342
+ assert_eq ! ( response[ "method" ] , "workspace/applyEdit" ) ;
1343
+ let ( key, changes) = response[ "params" ] [ "edit" ] [ "changes" ] . entries ( ) . next ( ) . unwrap ( ) ;
1344
+ assert ! ( key. ends_with( "deglob/src/main.rs" ) ) ;
1345
+ let change = & changes[ 0 ] ;
1346
+ assert_eq ! ( change[ "range" ] [ "start" ] [ "line" ] , 15 ) ;
1347
+ assert_eq ! ( change[ "range" ] [ "start" ] [ "character" ] , 14 ) ;
1348
+ assert_eq ! ( change[ "range" ] [ "end" ] [ "line" ] , 15 ) ;
1349
+ assert_eq ! ( change[ "range" ] [ "end" ] [ "character" ] , 15 ) ;
1350
+ assert_eq ! ( change[ "newText" ] , "size_of" ) ;
1351
+ let change = & changes[ 1 ] ;
1352
+ assert_eq ! ( change[ "range" ] [ "start" ] [ "line" ] , 15 ) ;
1353
+ assert_eq ! ( change[ "range" ] [ "start" ] [ "character" ] , 31 ) ;
1354
+ assert_eq ! ( change[ "range" ] [ "end" ] [ "line" ] , 15 ) ;
1355
+ assert_eq ! ( change[ "range" ] [ "end" ] [ "character" ] , 32 ) ;
1356
+ assert_eq ! ( change[ "newText" ] , "max" ) ;
1357
+ }
1358
+
1336
1359
expect_messages (
1337
1360
results. clone ( ) ,
1338
1361
& [
1339
- ExpectedMessage :: new ( Some ( 0x0100_0002 ) )
1340
- . expect_contains ( r#""method":"workspace/applyEdit""# )
1341
- . expect_contains ( r#"deglob/src/main.rs""# )
1342
- . expect_contains ( r#"{"range":{"start":{"line":15,"character":14},"end":{"line":15,"character":15}},"newText":"size_of"}"# )
1343
- . expect_contains ( r#"{"range":{"start":{"line":15,"character":31},"end":{"line":15,"character":32}},"newText":"max"}"# ) ,
1344
1362
ExpectedMessage :: new ( Some ( 1200 ) ) . expect_contains ( r#"null"# ) ,
1345
1363
] ,
1346
1364
) ;
0 commit comments