feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove Utils::optional

Browse Source 
Since we are now requiring macOS 10.14 we can remove our local
implementation of optional and use std::optional for macOS too.

Change-Id: I2bd018261b68da64f7f031a812045dd7784697e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Eike Ziller
2022-08-26 10:30:00 +02:00
parent 34a9491a08
commit 04e50438eb
247 changed files with 1053 additions and 3751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/languageclient/languageclientformatter.cpp
View File

@@ -55,7 +55,7 @@ QFutureWatcher<ChangeSet> *LanguageClientFormatter::format(
const FilePath &filePath = m_document->filePath();
const DynamicCapabilities dynamicCapabilities = m_client->dynamicCapabilities();
const QString method(DocumentRangeFormattingRequest::methodName);
if (optional<bool> registered = dynamicCapabilities.isRegistered(method)) {
if (std::optional<bool> registered = dynamicCapabilities.isRegistered(method)) {
if (!*registered)
return nullptr;
const TextDocumentRegistrationOptions option(dynamicCapabilities.option(method).toObject());
@@ -64,7 +64,7 @@ QFutureWatcher<ChangeSet> *LanguageClientFormatter::format(
return nullptr;
}
} else {
const Utils::optional<std::variant<bool, WorkDoneProgressOptions>> &provider
const std::optional<std::variant<bool, WorkDoneProgressOptions>> &provider
= m_client->capabilities().documentRangeFormattingProvider();
if (!provider.has_value())
return nullptr;
@@ -106,17 +106,18 @@ void LanguageClientFormatter::cancelCurrentRequest()
m_progress.reportFinished();
m_client->cancelRequest(*m_currentRequest);
m_ignoreCancel = false;
m_currentRequest = nullopt;
m_currentRequest = std::nullopt;
}
}
void LanguageClientFormatter::handleResponse(const DocumentRangeFormattingRequest::Response &response)
{
m_currentRequest = nullopt;
if (const optional<DocumentRangeFormattingRequest::Response::Error> &error = response.error())
m_currentRequest = std::nullopt;
if (const std::optional<DocumentRangeFormattingRequest::Response::Error> &error = response
.error())
m_client->log(*error);
ChangeSet changeSet;
if (optional<LanguageClientArray<TextEdit>> result = response.result()) {
if (std::optional<LanguageClientArray<TextEdit>> result = response.result()) {
if (!result->isNull())
changeSet = editsToChangeSet(result->toList(), m_document->document());
}