@@ -1049,191 +1049,6 @@ fn lsp_workspace_enable_paths_no_workspace_configuration() {
1049
1049
client. shutdown ( ) ;
1050
1050
}
1051
1051
1052
- #[ test]
1053
- fn lsp_did_refresh_deno_configuration_tree_notification ( ) {
1054
- let context = TestContextBuilder :: new ( ) . use_temp_cwd ( ) . build ( ) ;
1055
- let temp_dir = context. temp_dir ( ) ;
1056
- temp_dir. create_dir_all ( "workspace/member1" ) ;
1057
- temp_dir. create_dir_all ( "workspace/member2" ) ;
1058
- temp_dir. create_dir_all ( "non_workspace1" ) ;
1059
- temp_dir. create_dir_all ( "non_workspace2" ) ;
1060
- temp_dir. write (
1061
- "workspace/deno.json" ,
1062
- json ! ( {
1063
- "workspace" : [
1064
- "member1" ,
1065
- "member2" ,
1066
- ] ,
1067
- } )
1068
- . to_string ( ) ,
1069
- ) ;
1070
- temp_dir. write ( "workspace/member1/deno.json" , json ! ( { } ) . to_string ( ) ) ;
1071
- temp_dir. write ( "workspace/member1/package.json" , json ! ( { } ) . to_string ( ) ) ;
1072
- temp_dir. write ( "workspace/member2/package.json" , json ! ( { } ) . to_string ( ) ) ;
1073
- temp_dir. write ( "non_workspace1/deno.json" , json ! ( { } ) . to_string ( ) ) ;
1074
- let mut client = context. new_lsp_command ( ) . build ( ) ;
1075
- client. initialize_default ( ) ;
1076
- let res = client
1077
- . read_notification_with_method :: < Value > (
1078
- "deno/didRefreshDenoConfigurationTree" ,
1079
- )
1080
- . unwrap ( ) ;
1081
- assert_eq ! (
1082
- res,
1083
- json!( {
1084
- "data" : [
1085
- {
1086
- "scopeUri" : temp_dir. url( ) . join( "non_workspace1/" ) . unwrap( ) ,
1087
- "workspaceRootScopeUri" : null,
1088
- "denoJson" : {
1089
- "uri" : temp_dir. url( ) . join( "non_workspace1/deno.json" ) . unwrap( ) ,
1090
- } ,
1091
- "packageJson" : null,
1092
- } ,
1093
- {
1094
- "scopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1095
- "workspaceRootScopeUri" : null,
1096
- "denoJson" : {
1097
- "uri" : temp_dir. url( ) . join( "workspace/deno.json" ) . unwrap( ) ,
1098
- } ,
1099
- "packageJson" : null,
1100
- } ,
1101
- {
1102
- "scopeUri" : temp_dir. url( ) . join( "workspace/member1/" ) . unwrap( ) ,
1103
- "workspaceRootScopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1104
- "denoJson" : {
1105
- "uri" : temp_dir. url( ) . join( "workspace/member1/deno.json" ) . unwrap( ) ,
1106
- } ,
1107
- "packageJson" : {
1108
- "uri" : temp_dir. url( ) . join( "workspace/member1/package.json" ) . unwrap( ) ,
1109
- } ,
1110
- } ,
1111
- {
1112
- "scopeUri" : temp_dir. url( ) . join( "workspace/member2/" ) . unwrap( ) ,
1113
- "workspaceRootScopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1114
- "denoJson" : null,
1115
- "packageJson" : {
1116
- "uri" : temp_dir. url( ) . join( "workspace/member2/package.json" ) . unwrap( ) ,
1117
- } ,
1118
- } ,
1119
- ] ,
1120
- } ) ,
1121
- ) ;
1122
- temp_dir. write ( "non_workspace2/deno.json" , json ! ( { } ) . to_string ( ) ) ;
1123
- client. did_change_watched_files ( json ! ( {
1124
- "changes" : [ {
1125
- "uri" : temp_dir. url( ) . join( "non_workspace2/deno.json" ) . unwrap( ) ,
1126
- "type" : 1 ,
1127
- } ] ,
1128
- } ) ) ;
1129
- let res = client
1130
- . read_notification_with_method :: < Value > (
1131
- "deno/didRefreshDenoConfigurationTree" ,
1132
- )
1133
- . unwrap ( ) ;
1134
- assert_eq ! (
1135
- res,
1136
- json!( {
1137
- "data" : [
1138
- {
1139
- "scopeUri" : temp_dir. url( ) . join( "non_workspace1/" ) . unwrap( ) ,
1140
- "workspaceRootScopeUri" : null,
1141
- "denoJson" : {
1142
- "uri" : temp_dir. url( ) . join( "non_workspace1/deno.json" ) . unwrap( ) ,
1143
- } ,
1144
- "packageJson" : null,
1145
- } ,
1146
- {
1147
- "scopeUri" : temp_dir. url( ) . join( "non_workspace2/" ) . unwrap( ) ,
1148
- "workspaceRootScopeUri" : null,
1149
- "denoJson" : {
1150
- "uri" : temp_dir. url( ) . join( "non_workspace2/deno.json" ) . unwrap( ) ,
1151
- } ,
1152
- "packageJson" : null,
1153
- } ,
1154
- {
1155
- "scopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1156
- "workspaceRootScopeUri" : null,
1157
- "denoJson" : {
1158
- "uri" : temp_dir. url( ) . join( "workspace/deno.json" ) . unwrap( ) ,
1159
- } ,
1160
- "packageJson" : null,
1161
- } ,
1162
- {
1163
- "scopeUri" : temp_dir. url( ) . join( "workspace/member1/" ) . unwrap( ) ,
1164
- "workspaceRootScopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1165
- "denoJson" : {
1166
- "uri" : temp_dir. url( ) . join( "workspace/member1/deno.json" ) . unwrap( ) ,
1167
- } ,
1168
- "packageJson" : {
1169
- "uri" : temp_dir. url( ) . join( "workspace/member1/package.json" ) . unwrap( ) ,
1170
- } ,
1171
- } ,
1172
- {
1173
- "scopeUri" : temp_dir. url( ) . join( "workspace/member2/" ) . unwrap( ) ,
1174
- "workspaceRootScopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1175
- "denoJson" : null,
1176
- "packageJson" : {
1177
- "uri" : temp_dir. url( ) . join( "workspace/member2/package.json" ) . unwrap( ) ,
1178
- } ,
1179
- } ,
1180
- ] ,
1181
- } ) ,
1182
- ) ;
1183
- client. change_configuration ( json ! ( {
1184
- "deno" : {
1185
- "disablePaths" : [ "non_workspace1" ] ,
1186
- } ,
1187
- } ) ) ;
1188
- let res = client
1189
- . read_notification_with_method :: < Value > (
1190
- "deno/didRefreshDenoConfigurationTree" ,
1191
- )
1192
- . unwrap ( ) ;
1193
- assert_eq ! (
1194
- res,
1195
- json!( {
1196
- "data" : [
1197
- {
1198
- "scopeUri" : temp_dir. url( ) . join( "non_workspace2/" ) . unwrap( ) ,
1199
- "workspaceRootScopeUri" : null,
1200
- "denoJson" : {
1201
- "uri" : temp_dir. url( ) . join( "non_workspace2/deno.json" ) . unwrap( ) ,
1202
- } ,
1203
- "packageJson" : null,
1204
- } ,
1205
- {
1206
- "scopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1207
- "workspaceRootScopeUri" : null,
1208
- "denoJson" : {
1209
- "uri" : temp_dir. url( ) . join( "workspace/deno.json" ) . unwrap( ) ,
1210
- } ,
1211
- "packageJson" : null,
1212
- } ,
1213
- {
1214
- "scopeUri" : temp_dir. url( ) . join( "workspace/member1/" ) . unwrap( ) ,
1215
- "workspaceRootScopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1216
- "denoJson" : {
1217
- "uri" : temp_dir. url( ) . join( "workspace/member1/deno.json" ) . unwrap( ) ,
1218
- } ,
1219
- "packageJson" : {
1220
- "uri" : temp_dir. url( ) . join( "workspace/member1/package.json" ) . unwrap( ) ,
1221
- } ,
1222
- } ,
1223
- {
1224
- "scopeUri" : temp_dir. url( ) . join( "workspace/member2/" ) . unwrap( ) ,
1225
- "workspaceRootScopeUri" : temp_dir. url( ) . join( "workspace/" ) . unwrap( ) ,
1226
- "denoJson" : null,
1227
- "packageJson" : {
1228
- "uri" : temp_dir. url( ) . join( "workspace/member2/package.json" ) . unwrap( ) ,
1229
- } ,
1230
- } ,
1231
- ] ,
1232
- } ) ,
1233
- ) ;
1234
- client. shutdown ( ) ;
1235
- }
1236
-
1237
1052
#[ test]
1238
1053
fn lsp_did_change_deno_configuration_notification ( ) {
1239
1054
let context = TestContextBuilder :: new ( ) . use_temp_cwd ( ) . build ( ) ;
@@ -9588,15 +9403,14 @@ fn lsp_auto_discover_registry() {
9588
9403
"triggerCharacter" : "@"
9589
9404
} ) ,
9590
9405
) ;
9591
- let res = client
9592
- . read_notification_with_method :: < Value > ( "deno/registryState" )
9593
- . unwrap ( ) ;
9406
+ let ( method, res) = client. read_notification ( ) ;
9407
+ assert_eq ! ( method, "deno/registryState" ) ;
9594
9408
assert_eq ! (
9595
9409
res,
9596
- json!( {
9410
+ Some ( json!( {
9597
9411
"origin" : "http://localhost:4545" ,
9598
9412
"suggestions" : true ,
9599
- } ) ,
9413
+ } ) )
9600
9414
) ;
9601
9415
client. shutdown ( ) ;
9602
9416
}
@@ -10303,6 +10117,7 @@ fn lsp_diagnostics_refresh_dependents() {
10303
10117
assert_eq ! ( json!( diagnostics. all( ) ) , json!( [ ] ) ) ; // no diagnostics now
10304
10118
10305
10119
client. shutdown ( ) ;
10120
+ assert_eq ! ( client. queue_len( ) , 0 ) ;
10306
10121
}
10307
10122
10308
10123
// Regression test for https://github.com/denoland/deno/issues/10897.
0 commit comments