From a2f1b80c360a22a8d59eee7ec4077c5b7682ffbd Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Sun, 12 Feb 2023 22:09:04 -0500 Subject: [PATCH] Assistant+Spreadsheet: Convert usages of Value::TDSWOSE to Value::TSWOSE --- Userland/Applications/Assistant/Providers.cpp | 2 +- Userland/Applications/Spreadsheet/Cell.cpp | 2 +- Userland/Applications/Spreadsheet/Spreadsheet.cpp | 6 +++--- Userland/Applications/Spreadsheet/SpreadsheetModel.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Userland/Applications/Assistant/Providers.cpp b/Userland/Applications/Assistant/Providers.cpp index ee4bb0988c..fc3b7dfc97 100644 --- a/Userland/Applications/Assistant/Providers.cpp +++ b/Userland/Applications/Assistant/Providers.cpp @@ -105,7 +105,7 @@ void CalculatorProvider::query(DeprecatedString const& query, Function results; diff --git a/Userland/Applications/Spreadsheet/Cell.cpp b/Userland/Applications/Spreadsheet/Cell.cpp index e308f74afb..6cbcfab66c 100644 --- a/Userland/Applications/Spreadsheet/Cell.cpp +++ b/Userland/Applications/Spreadsheet/Cell.cpp @@ -41,7 +41,7 @@ void Cell::set_data(JS::Value new_data) StringBuilder builder; - builder.append(new_data.to_deprecated_string_without_side_effects()); + builder.append(new_data.to_string_without_side_effects().release_value_but_fixme_should_propagate_errors()); m_data = builder.to_deprecated_string(); m_evaluated_data = move(new_data); diff --git a/Userland/Applications/Spreadsheet/Spreadsheet.cpp b/Userland/Applications/Spreadsheet/Spreadsheet.cpp index cc6d8034c1..7dc6b22282 100644 --- a/Userland/Applications/Spreadsheet/Spreadsheet.cpp +++ b/Userland/Applications/Spreadsheet/Spreadsheet.cpp @@ -64,7 +64,7 @@ Sheet::Sheet(Workbook& workbook) if (result.is_error()) { warnln("Spreadsheet: Failed to run runtime code:"); auto thrown_value = *result.throw_completion().value(); - warn("Threw: {}", thrown_value.to_deprecated_string_without_side_effects()); + warn("Threw: {}", MUST(thrown_value.to_string_without_side_effects())); if (thrown_value.is_object() && is(thrown_value.as_object())) { auto& error = static_cast(thrown_value.as_object()); warnln(" with message '{}'", error.get_without_side_effects(interpreter().vm().names.message)); @@ -562,7 +562,7 @@ JsonObject Sheet::to_json() const auto json = interpreter().realm().global_object().get_without_side_effects("JSON"); auto stringified_or_error = JS::call(vm, json.as_object().get_without_side_effects("stringify").as_function(), json, it.value->evaluated_data()); VERIFY(!stringified_or_error.is_error()); - data.set("value", stringified_or_error.release_value().to_deprecated_string_without_side_effects()); + data.set("value", stringified_or_error.release_value().to_string_without_side_effects().release_value_but_fixme_should_propagate_errors().to_deprecated_string()); } else { data.set("value", it.value->data()); } @@ -693,7 +693,7 @@ JsonObject Sheet::gather_documentation() const if (!doc.is_string()) return; - JsonParser parser(doc.to_deprecated_string_without_side_effects()); + JsonParser parser(doc.to_string_without_side_effects().release_value_but_fixme_should_propagate_errors()); auto doc_object = parser.parse(); if (!doc_object.is_error()) diff --git a/Userland/Applications/Spreadsheet/SpreadsheetModel.cpp b/Userland/Applications/Spreadsheet/SpreadsheetModel.cpp index 3f90b4e2c3..80254b40e7 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetModel.cpp +++ b/Userland/Applications/Spreadsheet/SpreadsheetModel.cpp @@ -33,7 +33,7 @@ GUI::Variant SheetModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) auto message = object.get_without_side_effects("message"); auto error = message.to_deprecated_string(vm); if (error.is_throw_completion()) - builder.append(message.to_deprecated_string_without_side_effects()); + builder.append(message.to_string_without_side_effects().release_value_but_fixme_should_propagate_errors()); else builder.append(error.release_value()); return builder.to_deprecated_string(); @@ -120,7 +120,7 @@ GUI::Variant SheetModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) auto& error = static_cast(object); auto const& trace = error.traceback(); StringBuilder builder; - builder.appendff("{}\n", error.get_without_side_effects(object.vm().names.message).to_deprecated_string_without_side_effects()); + builder.appendff("{}\n", error.get_without_side_effects(object.vm().names.message).to_string_without_side_effects().release_value_but_fixme_should_propagate_errors()); for (auto const& frame : trace.in_reverse()) { if (frame.source_range.filename().contains("runtime.js"sv)) { if (frame.function_name == "")