artin/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-02-06 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 19eebe984a into 7d01aa0417

Browse Source
This commit is contained in:
Damien Levac 2026-02-05 17:17:55 -03:00 committed by GitHub
commit 2421fa4380
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/change-pr-14652.md Normal file
View File

@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
---
Adjust `Pbxproj::set_build_settings` to ensure we are not writing lines outside
configuration blocks.

63
crates/tauri-cli/src/helpers/pbxproj.rs
View File

@ -233,29 +233,54 @@ impl Pbxproj {
.iter_mut()
.find(|s| s.key == key)
{
if build_setting.value != value {
let Some(line) = self.raw_lines.get_mut(build_setting.line_number) else {
return;
};
if build_setting.value == value {
return;
}
*line = format!("{}{key} = {value};", build_setting.identation);
let new_line_content = format!("{}{key} = {value};", build_setting.identation);
if let Some(line) = self.additions.get_mut(&build_setting.line_number) {
line.push_str(&format!("\n{}", new_line_content));
} else if let Some(line) = self.raw_lines.get_mut(build_setting.line_number) {
*line = new_line_content;
self.has_changes = true;
}
} else {
let Some(last_build_setting) = build_configuration.build_settings.last().cloned() else {
return;
};
build_configuration.build_settings.push(BuildSettings {
identation: last_build_setting.identation.clone(),
line_number: last_build_setting.line_number + 1,
key: key.to_string(),
value: value.to_string(),
});
self.additions.insert(
last_build_setting.line_number + 1,
format!("{}{key} = {value};", last_build_setting.identation),
);
build_setting.value = value.to_string();
return;
}
let Some(last_build_setting) = build_configuration.build_settings.last() else {
log::error!("cannot add '{key}' to an empty build configuration");
return;
};
let mut new_line_number = last_build_setting.line_number + 1;
if self.additions.contains_key(&last_build_setting.line_number) {
new_line_number = last_build_setting.line_number;
}
let identation = last_build_setting.identation.clone();
let new_entry = format!("{}{key} = {value};", identation);
build_configuration.build_settings.push(BuildSettings {
identation: identation.clone(),
line_number: new_line_number,
key: key.to_string(),
value: value.to_string(),
});
self
.additions
.entry(new_line_number)
.and_modify(|current| {
current.push('\n');
current.push_str(&new_entry);
})
.or_insert(new_entry);
self.has_changes = true;
}
}