diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-15 07:47:33 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-15 07:47:33 +0100 |
| commit | 7d363755a27f3bc89a5c7f5d15c8664299436bb4 (patch) | |
| tree | 62b8686a37ebba21fbf7a61ed7d9b866b29db871 /crates | |
| parent | bd8788241d668994ba660b9753443f6a7a40660c (diff) | |
| parent | 41949748a6123fd6061eb984a47f4fe780525e63 (diff) | |
Merge #9282
9282: fix: Use objects instead of bools for markers in package.json r=lnicola a=lnicola
Addresses https://github.com/rust-analyzer/rust-analyzer/issues/9174#issue-913980665.
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/rust-analyzer/src/config.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 3b20d741a..5588c15da 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
| @@ -1062,8 +1062,8 @@ mod tests { | |||
| 1062 | let package_json_path = project_root().join("editors/code/package.json"); | 1062 | let package_json_path = project_root().join("editors/code/package.json"); |
| 1063 | let mut package_json = fs::read_to_string(&package_json_path).unwrap(); | 1063 | let mut package_json = fs::read_to_string(&package_json_path).unwrap(); |
| 1064 | 1064 | ||
| 1065 | let start_marker = " \"$generated-start\": false,\n"; | 1065 | let start_marker = " \"$generated-start\": {},\n"; |
| 1066 | let end_marker = " \"$generated-end\": false\n"; | 1066 | let end_marker = " \"$generated-end\": {}\n"; |
| 1067 | 1067 | ||
| 1068 | let start = package_json.find(start_marker).unwrap() + start_marker.len(); | 1068 | let start = package_json.find(start_marker).unwrap() + start_marker.len(); |
| 1069 | let end = package_json.find(end_marker).unwrap(); | 1069 | let end = package_json.find(end_marker).unwrap(); |