Merge pull request #55 from Demonthos/fix_single_line_rsx_hot_reloading

fix single line rsx hot reloading
This commit is contained in:
YuKun Liu authored and GitHub committed 2022-07-14 21:30:11 +08:00
commit 66862e2310
2 files changed
+14 -2

No files matched your search

+7 -1
View File
@@ -114,7 +114,13 @@ pub async fn hot_reload_handler(
*first = first.split_at(start.column).1;
}
if let Some(last) = lines.last_mut() {
*last = last.split_at(end.column).0;
// if there is only one line the start index of last line will be the start of the rsx!, not the start of the line
if start.line == end.line {
*last =
last.split_at(end.column - start.column).0;
} else {
*last = last.split_at(end.column).0;
}
}
let rsx = lines.join("\n");
messages.push(SetRsxMessage {
+7 -1
View File
@@ -144,7 +144,13 @@ pub async fn startup_hot_reload(port: u16, config: CrateConfig) -> Result<()> {
*first = first.split_at(start.column).1;
}
if let Some(last) = lines.last_mut() {
*last = last.split_at(end.column).0;
// if there is only one line the start index of last line will be the start of the rsx!, not the start of the line
if start.line == end.line {
*last =
last.split_at(end.column - start.column).0;
} else {
*last = last.split_at(end.column).0;
}
}
let rsx = lines.join("\n");
messages.push(SetRsxMessage {