Add managed Window resource and native shell operations
Verify Tessera GUI / verify (push) Failing after 7m25s
Verify Tessera GUI / verify (push) Failing after 7m25s
This commit is contained in:
@@ -454,6 +454,7 @@ impl ReplSession {
|
||||
})
|
||||
})();
|
||||
if result.is_err() {
|
||||
self.take_window_commands()?;
|
||||
self.bridge.discard_pending(&mut self.candidate.vm)?;
|
||||
if let Some(node) = self.nodes.last_mut() {
|
||||
node.name
|
||||
@@ -510,6 +511,10 @@ impl ReplSession {
|
||||
result
|
||||
}
|
||||
|
||||
pub fn take_window_commands(&self) -> Result<Vec<crate::window::Command>> {
|
||||
self.bridge.take_window_commands(&self.candidate.vm)
|
||||
}
|
||||
|
||||
pub fn resize(
|
||||
&mut self,
|
||||
viewport: Option<crate::layout::Size>,
|
||||
@@ -522,6 +527,7 @@ impl ReplSession {
|
||||
}
|
||||
let result = self.refresh_document();
|
||||
if result.is_err() {
|
||||
self.take_window_commands()?;
|
||||
self.bridge.discard_pending(&mut self.candidate.vm)?;
|
||||
}
|
||||
self.bridge
|
||||
@@ -556,6 +562,7 @@ impl ReplSession {
|
||||
})
|
||||
})();
|
||||
if result.is_err() {
|
||||
self.take_window_commands()?;
|
||||
self.faulted = true;
|
||||
self.bridge.discard_pending(&mut self.candidate.vm)?;
|
||||
}
|
||||
@@ -838,6 +845,143 @@ mod tests {
|
||||
const EXAMPLE: &str = include_str!("../examples/hello.endor");
|
||||
const PAGE: &str = include_str!("../examples/page.endor");
|
||||
|
||||
#[test]
|
||||
fn managed_window_requests_are_coalesced_and_failed_input_discards_pending_requests() {
|
||||
let mut session = ReplSession::new(111).unwrap();
|
||||
session
|
||||
.execute(
|
||||
r#"window = ui.window()
|
||||
window.resize(900,600)
|
||||
window.resize(1000,700)
|
||||
window.setTitle("Endor")
|
||||
window.focus()"#,
|
||||
"app.main",
|
||||
)
|
||||
.unwrap();
|
||||
let requests = session.take_window_commands().unwrap();
|
||||
assert_eq!(requests.len(), 3);
|
||||
assert!(matches!(
|
||||
requests[0].action,
|
||||
crate::window::Action::Resize {
|
||||
width: 1000.0,
|
||||
height: 700.0
|
||||
}
|
||||
));
|
||||
assert!(
|
||||
matches!(&requests[1].action,crate::window::Action::SetTitle(title) if title=="Endor")
|
||||
);
|
||||
assert!(session.take_window_commands().unwrap().is_empty());
|
||||
assert!(
|
||||
session
|
||||
.execute("window.resize(1400,900)\nwindow.resize(0,600)", "app.main")
|
||||
.is_err()
|
||||
);
|
||||
assert!(session.take_window_commands().unwrap().is_empty());
|
||||
assert!(session.execute("window.resize(0,600)", "app.main").is_err());
|
||||
assert!(session.take_window_commands().unwrap().is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn window_page_roots_follow_open_close_and_creation_order() {
|
||||
let source = r#"first = Page()
|
||||
second = Page()
|
||||
first.render(TextBlock("first"))
|
||||
second.render(TextBlock("second"))
|
||||
window = ui.window()"#;
|
||||
let (mut session, _) = ReplSession::load(source, "app.main", 112, 1).unwrap();
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("window.pages().count", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
"2"
|
||||
);
|
||||
let first = session.execute("first.window()", "app.main").unwrap().value;
|
||||
assert_eq!(
|
||||
first,
|
||||
session
|
||||
.execute("second.window()", "app.main")
|
||||
.unwrap()
|
||||
.value
|
||||
);
|
||||
session.execute("first.close()", "app.main").unwrap();
|
||||
assert_eq!(
|
||||
session.execute("first.window()", "app.main").unwrap().value,
|
||||
"nil"
|
||||
);
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("window.pages().count", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
"1"
|
||||
);
|
||||
session.execute("first.open(window)", "app.main").unwrap();
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("window.pages().count", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
"2"
|
||||
);
|
||||
assert_eq!(
|
||||
session
|
||||
.execute("window.pages().at(0)", "app.main")
|
||||
.unwrap()
|
||||
.value,
|
||||
session.execute("second", "app.main").unwrap().value
|
||||
);
|
||||
assert!(session.execute("first.open(Object())", "app.main").is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn closed_page_is_not_kept_alive_by_window_page_order() {
|
||||
let (mut session, _) = ReplSession::load(
|
||||
"page = Page()\npage.render(TextBlock(\"page\"))",
|
||||
"app.main",
|
||||
113,
|
||||
1,
|
||||
)
|
||||
.unwrap();
|
||||
let globals = session.candidate.globals.unwrap();
|
||||
let Value::Object(page) = session
|
||||
.candidate
|
||||
.vm
|
||||
.dict_get(globals, &Value::Text("page".into()))
|
||||
.unwrap()
|
||||
.unwrap()
|
||||
else {
|
||||
panic!("Page")
|
||||
};
|
||||
let weak = session.candidate.vm.downgrade(page).unwrap();
|
||||
session.execute("page.close()", "app.main").unwrap();
|
||||
session
|
||||
.candidate
|
||||
.vm
|
||||
.dict_delete(globals, &Value::Text("page".into()))
|
||||
.unwrap();
|
||||
session.candidate.vm.collect_cycles();
|
||||
assert!(session.candidate.vm.upgrade(weak).unwrap().is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rendering_cannot_enqueue_native_window_side_effects() {
|
||||
let source = r##"class BadRect: RectBlock {
|
||||
function measure(self: BadRect, mount: Mount, constraints: Constraints): MeasureResult {
|
||||
ui.window().resize(900,600)
|
||||
return MeasureResult(80,20)
|
||||
}
|
||||
}
|
||||
page = Page()
|
||||
page.render(BadRect(80,20,0,"#DDEEFF"))"##;
|
||||
let error = ReplSession::load(source, "app.main", 114, 1).err().unwrap();
|
||||
assert!(
|
||||
error
|
||||
.to_string()
|
||||
.contains("window operations are forbidden")
|
||||
);
|
||||
}
|
||||
|
||||
fn source_measure_stat(session: &mut ReplSession, name: &str) -> i64 {
|
||||
let Value::Object(function) = session
|
||||
.candidate
|
||||
|
||||
Reference in New Issue
Block a user