Skip to content

Commit a18abde

Browse files
committed
always get diagnostics after caching
1 parent e7d2a92 commit a18abde

File tree

1 file changed

+33
-4
lines changed

1 file changed

+33
-4
lines changed

tests/integration/lsp_tests.rs

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ fn lsp_import_map_remote() {
383383
"arguments": [[], temp_dir.url().join("file.ts").unwrap()],
384384
}),
385385
);
386+
client.read_diagnostics();
386387

387388
let diagnostics = client.did_open(json!({
388389
"textDocument": {
@@ -829,6 +830,7 @@ fn lsp_deno_json_imports_comments_cache() {
829830
"arguments": [[], temp_dir.url().join("file.ts").unwrap()],
830831
}),
831832
);
833+
client.read_diagnostics();
832834

833835
let diagnostics = client.did_open(json!({
834836
"textDocument": {
@@ -920,6 +922,7 @@ fn lsp_format_vendor_path() {
920922
"arguments": [[], temp_dir.url().join("file.ts").unwrap()],
921923
}),
922924
);
925+
client.read_diagnostics();
923926
assert!(temp_dir
924927
.path()
925928
.join("vendor/http_localhost_4545/run/002_hello.ts")
@@ -2781,6 +2784,7 @@ fn lsp_hover_dependency() {
27812784
"arguments": [[], "file:///a/file.ts"],
27822785
}),
27832786
);
2787+
client.read_diagnostics();
27842788
let res = client.write_request(
27852789
"textDocument/hover",
27862790
json!({
@@ -3165,6 +3169,7 @@ fn lsp_hover_typescript_types() {
31653169
],
31663170
}),
31673171
);
3172+
client.read_diagnostics();
31683173
let res = client.write_request(
31693174
"textDocument/hover",
31703175
json!({
@@ -3214,6 +3219,7 @@ fn lsp_hover_jsr() {
32143219
"arguments": [[], temp_dir.url().join("file.ts").unwrap()],
32153220
}),
32163221
);
3222+
client.read_diagnostics();
32173223
let res = client.write_request(
32183224
"textDocument/hover",
32193225
json!({
@@ -5736,6 +5742,7 @@ fn lsp_jsr_auto_import_completion() {
57365742
],
57375743
}),
57385744
);
5745+
client.read_diagnostics();
57395746
client.did_open(json!({
57405747
"textDocument": {
57415748
"uri": temp_dir.url().join("file.ts").unwrap(),
@@ -5815,6 +5822,7 @@ fn lsp_jsr_auto_import_completion_import_map() {
58155822
],
58165823
}),
58175824
);
5825+
client.read_diagnostics();
58185826
client.did_open(json!({
58195827
"textDocument": {
58205828
"uri": temp_dir.url().join("file.ts").unwrap(),
@@ -5954,6 +5962,7 @@ fn lsp_jsr_code_action_missing_declaration() {
59545962
"arguments": [[], file.url()],
59555963
}),
59565964
);
5965+
client.read_diagnostics();
59575966
client.did_open_file(&file);
59585967
let res = client.write_request(
59595968
"textDocument/codeAction",
@@ -6074,6 +6083,7 @@ fn lsp_jsr_code_action_move_to_new_file() {
60746083
"arguments": [[], file.url()],
60756084
}),
60766085
);
6086+
client.read_diagnostics();
60776087
client.did_open_file(&file);
60786088
let list = client
60796089
.write_request_with_res_as::<Option<lsp::CodeActionResponse>>(
@@ -6493,6 +6503,7 @@ fn lsp_code_actions_deno_types_for_npm() {
64936503
],
64946504
}),
64956505
);
6506+
client.read_diagnostics();
64966507
let res = client.write_request(
64976508
"textDocument/codeAction",
64986509
json!({
@@ -6660,6 +6671,7 @@ fn lsp_cache_then_definition() {
66606671
],
66616672
}),
66626673
);
6674+
client.read_diagnostics();
66636675
let res = client.write_request(
66646676
"textDocument/definition",
66656677
json!({
@@ -8093,6 +8105,7 @@ fn lsp_completions_auto_import_node_builtin() {
80938105
"arguments": [[], temp_dir.url().join("file.ts").unwrap()],
80948106
}),
80958107
);
8108+
client.read_diagnostics();
80968109
let list = client.get_completion_list(
80978110
temp_dir.url().join("file.ts").unwrap(),
80988111
(2, 21),
@@ -8887,6 +8900,7 @@ fn lsp_npm_types_nested_js_dts() {
88878900
"arguments": [[], file.url()],
88888901
}),
88898902
);
8903+
client.read_diagnostics();
88908904
let diagnostics = client.did_open_file(&file);
88918905
assert_eq!(
88928906
json!(diagnostics.all()),
@@ -8986,6 +9000,7 @@ fn lsp_npm_always_caches() {
89869000
],
89879001
}),
89889002
);
9003+
client.read_diagnostics();
89899004

89909005
// now open a new file and chalk should be working
89919006
let new_file_uri = temp_dir_path.join("new_file.ts").url_file();
@@ -9961,6 +9976,7 @@ fn lsp_auto_imports_remote_dts() {
99619976
"arguments": [[], temp_dir.url().join("file.ts").unwrap()],
99629977
}),
99639978
);
9979+
client.read_diagnostics();
99649980
let list = client.get_completion_list(
99659981
temp_dir.url().join("file.ts").unwrap(),
99669982
(2, 21),
@@ -10263,6 +10279,7 @@ fn lsp_completions_node_builtin() {
1026310279
"arguments": [["npm:@types/node"], "file:///a/file.ts"],
1026410280
}),
1026510281
);
10282+
client.read_diagnostics();
1026610283

1026710284
client.write_notification(
1026810285
"textDocument/didChange",
@@ -10330,6 +10347,7 @@ fn lsp_completions_node_specifier_node_modules_dir() {
1033010347
"arguments": [[], temp_dir.url().join("file.ts").unwrap()],
1033110348
}),
1033210349
);
10350+
client.read_diagnostics();
1033310351
client.write_notification(
1033410352
"textDocument/didChange",
1033510353
json!({
@@ -10565,6 +10583,7 @@ fn lsp_cache_location() {
1056510583
"arguments": [[], "file:///a/file.ts"],
1056610584
}),
1056710585
);
10586+
client.read_diagnostics();
1056810587
let res = client.write_request(
1056910588
"textDocument/hover",
1057010589
json!({
@@ -10659,6 +10678,7 @@ fn lsp_tls_cert() {
1065910678
"arguments": [[], "file:///a/file.ts"],
1066010679
}),
1066110680
);
10681+
client.read_diagnostics();
1066210682
let res = client.write_request(
1066310683
"textDocument/hover",
1066410684
json!({
@@ -10757,6 +10777,7 @@ fn lsp_npmrc() {
1075710777
"arguments": [[], file.url()],
1075810778
}),
1075910779
);
10780+
client.read_diagnostics();
1076010781
let diagnostics = client.did_open_file(&file);
1076110782
assert_eq!(
1076210783
json!(diagnostics.all()),
@@ -11153,6 +11174,7 @@ fn lsp_root_with_global_reference_types() {
1115311174
"arguments": [[], file2.url()],
1115411175
}),
1115511176
);
11177+
client.read_diagnostics();
1115611178
let diagnostics = client.did_open_file(&file);
1115711179
assert_eq!(json!(diagnostics.all()), json!([]));
1115811180
}
@@ -13194,6 +13216,7 @@ export function B() {
1319413216
],
1319513217
}),
1319613218
);
13219+
client.read_diagnostics();
1319713220
let res = client.write_request(
1319813221
"textDocument/hover",
1319913222
json!({
@@ -13216,10 +13239,6 @@ export function B() {
1321613239
}
1321713240
})
1321813241
);
13219-
13220-
let diagnostics = client.read_diagnostics();
13221-
println!("{:?}", diagnostics);
13222-
1322313242
client.shutdown();
1322413243
}
1322513244

@@ -14045,6 +14064,7 @@ fn lsp_node_modules_dir() {
1404514064
};
1404614065

1404714066
cache(&mut client);
14067+
client.read_diagnostics();
1404814068

1404914069
assert!(!temp_dir.path().join("node_modules").exists());
1405014070

@@ -14083,6 +14103,7 @@ fn lsp_node_modules_dir() {
1408314103
assert_eq!(diagnostics.all().len(), 2, "{:#?}", diagnostics); // not cached
1408414104

1408514105
cache(&mut client);
14106+
client.read_diagnostics();
1408614107

1408714108
assert!(temp_dir.path().join("node_modules/chalk").exists());
1408814109
assert!(temp_dir.path().join("node_modules/@types/node").exists());
@@ -14542,6 +14563,7 @@ fn lsp_deno_json_scopes_vendor_dir() {
1454214563
"arguments": [[], temp_dir.url().join("project1/file.ts").unwrap()],
1454314564
}),
1454414565
);
14566+
client.read_diagnostics();
1454514567
let res = client.write_request(
1454614568
"textDocument/definition",
1454714569
json!({
@@ -14592,6 +14614,7 @@ fn lsp_deno_json_scopes_vendor_dir() {
1459214614
"arguments": [[], temp_dir.url().join("project2/file.ts").unwrap()],
1459314615
}),
1459414616
);
14617+
client.read_diagnostics();
1459514618
let res = client.write_request(
1459614619
"textDocument/definition",
1459714620
json!({
@@ -14642,6 +14665,7 @@ fn lsp_deno_json_scopes_vendor_dir() {
1464214665
"arguments": [[], temp_dir.url().join("project2/project3/file.ts").unwrap()],
1464314666
}),
1464414667
);
14668+
client.read_diagnostics();
1464514669
let res = client.write_request(
1464614670
"textDocument/definition",
1464714671
json!({
@@ -14725,6 +14749,7 @@ fn lsp_deno_json_scopes_node_modules_dir() {
1472514749
"arguments": [[], temp_dir.url().join("project1/file.ts").unwrap()],
1472614750
}),
1472714751
);
14752+
client.read_diagnostics();
1472814753
let res = client.write_request(
1472914754
"textDocument/definition",
1473014755
json!({
@@ -14778,6 +14803,7 @@ fn lsp_deno_json_scopes_node_modules_dir() {
1477814803
"arguments": [[], temp_dir.url().join("project2/file.ts").unwrap()],
1477914804
}),
1478014805
);
14806+
client.read_diagnostics();
1478114807
let res = client.write_request(
1478214808
"textDocument/definition",
1478314809
json!({
@@ -14828,6 +14854,7 @@ fn lsp_deno_json_scopes_node_modules_dir() {
1482814854
"arguments": [[], temp_dir.url().join("project2/project3/file.ts").unwrap()],
1482914855
}),
1483014856
);
14857+
client.read_diagnostics();
1483114858
let res = client.write_request(
1483214859
"textDocument/definition",
1483314860
json!({
@@ -15807,6 +15834,7 @@ fn lsp_deno_json_workspace_vendor_dir() {
1580715834
"arguments": [[], temp_dir.url().join("project1/project2/file.ts").unwrap()],
1580815835
}),
1580915836
);
15837+
client.read_diagnostics();
1581015838
let res = client.write_request(
1581115839
"textDocument/definition",
1581215840
json!({
@@ -15878,6 +15906,7 @@ fn lsp_deno_json_workspace_node_modules_dir() {
1587815906
"arguments": [[], temp_dir.url().join("project1/project2/file.ts").unwrap()],
1587915907
}),
1588015908
);
15909+
client.read_diagnostics();
1588115910
let res = client.write_request(
1588215911
"textDocument/definition",
1588315912
json!({

0 commit comments

Comments
 (0)