diff options
author | Laurențiu Nicola <[email protected]> | 2021-06-15 07:32:53 +0100 |
---|---|---|
committer | Laurențiu Nicola <[email protected]> | 2021-06-15 07:40:43 +0100 |
commit | 41949748a6123fd6061eb984a47f4fe780525e63 (patch) | |
tree | 237eaf8e189c2bc20aa9251d1c901645abacd311 | |
parent | 447d849c9ecb3d0f7783a56db429ccc526d0d8dc (diff) |
Use objects instead of bools for markers in package.json
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 4 | ||||
-rw-r--r-- | editors/code/package.json | 4 | ||||
-rw-r--r-- | xtask/src/dist.rs | 4 |
3 files changed, 6 insertions, 6 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(); |
diff --git a/editors/code/package.json b/editors/code/package.json index 0f3ed48a0..a88a5c44e 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -389,7 +389,7 @@ | |||
389 | "default": {}, | 389 | "default": {}, |
390 | "markdownDescription": "Optional settings passed to the debug engine. Example: `{ \"lldb\": { \"terminal\":\"external\"} }`" | 390 | "markdownDescription": "Optional settings passed to the debug engine. Example: `{ \"lldb\": { \"terminal\":\"external\"} }`" |
391 | }, | 391 | }, |
392 | "$generated-start": false, | 392 | "$generated-start": {}, |
393 | "rust-analyzer.assist.importGranularity": { | 393 | "rust-analyzer.assist.importGranularity": { |
394 | "markdownDescription": "How imports should be grouped into use statements.", | 394 | "markdownDescription": "How imports should be grouped into use statements.", |
395 | "default": "crate", | 395 | "default": "crate", |
@@ -841,7 +841,7 @@ | |||
841 | "Search for all symbols kinds" | 841 | "Search for all symbols kinds" |
842 | ] | 842 | ] |
843 | }, | 843 | }, |
844 | "$generated-end": false | 844 | "$generated-end": {} |
845 | } | 845 | } |
846 | }, | 846 | }, |
847 | "problemPatterns": [ | 847 | "problemPatterns": [ |
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs index 3a67294c5..c7363688a 100644 --- a/xtask/src/dist.rs +++ b/xtask/src/dist.rs | |||
@@ -45,8 +45,8 @@ fn dist_client(version: &str, release_tag: &str) -> Result<()> { | |||
45 | patch | 45 | patch |
46 | .replace(r#""version": "0.4.0-dev""#, &format!(r#""version": "{}""#, version)) | 46 | .replace(r#""version": "0.4.0-dev""#, &format!(r#""version": "{}""#, version)) |
47 | .replace(r#""releaseTag": null"#, &format!(r#""releaseTag": "{}""#, release_tag)) | 47 | .replace(r#""releaseTag": null"#, &format!(r#""releaseTag": "{}""#, release_tag)) |
48 | .replace(r#""$generated-start": false,"#, "") | 48 | .replace(r#""$generated-start": {},"#, "") |
49 | .replace(",\n \"$generated-end\": false", ""); | 49 | .replace(",\n \"$generated-end\": {}", ""); |
50 | 50 | ||
51 | if nightly { | 51 | if nightly { |
52 | patch.replace( | 52 | patch.replace( |