summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2021-02-02 07:36:21 +0100
committerDavid Schulz <david.schulz@qt.io>2021-02-12 14:15:13 +0000
commit29f1aca1c8e39f6edeaa27cc546eaa49e6459819 (patch)
treecb4645f8dcb5ff36d013df66da63bb6c36af6e61 /src/plugins
parent9ab69929220fcf6e7effaad35a15b5406ba69637 (diff)
downloadqt-creator-29f1aca1c8e39f6edeaa27cc546eaa49e6459819.tar.gz
LanguageClient: remove unused formatting functions
The formatting functionality was moved into languageclientformatter.cpp Change-Id: Ieeafd49c297a854e478a11d4fcb81062b9cfcf19 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/languageclient/client.cpp95
-rw-r--r--src/plugins/languageclient/client.h3
2 files changed, 0 insertions, 98 deletions
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index aaa213e8f9..fbabc51a1c 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -755,101 +755,6 @@ void Client::executeCommand(const Command &command)
sendContent(ExecuteCommandRequest(ExecuteCommandParams(command)));
}
-static const FormattingOptions formattingOptions(const TextEditor::TabSettings &settings)
-{
- FormattingOptions options;
- options.setTabSize(settings.m_tabSize);
- options.setInsertSpace(settings.m_tabPolicy == TextEditor::TabSettings::SpacesOnlyTabPolicy);
- return options;
-}
-
-template<typename FormattingResponse>
-static void handleFormattingResponse(const DocumentUri &uri,
- const QPointer<Client> client,
- const FormattingResponse &response)
-{
- if (client) {
- if (const Utils::optional<typename FormattingResponse::Error> &error = response.error())
- client->log(*error);
- }
- if (Utils::optional<LanguageClientArray<TextEdit>> result = response.result()) {
- if (!result->isNull()) {
- applyTextEdits(uri, result->toList());
- }
- }
-
-}
-
-void Client::formatFile(const TextEditor::TextDocument *document)
-{
- if (!isSupportedDocument(document))
- return;
-
- const FilePath &filePath = document->filePath();
- const QString method(DocumentFormattingRequest::methodName);
- if (Utils::optional<bool> registered = m_dynamicCapabilities.isRegistered(method)) {
- if (!registered.value())
- return;
- const TextDocumentRegistrationOptions option(
- m_dynamicCapabilities.option(method).toObject());
- if (option.isValid(nullptr)
- && !option.filterApplies(filePath, Utils::mimeTypeForName(document->mimeType()))) {
- return;
- }
- } else if (!m_serverCapabilities.documentFormattingProvider().value_or(false)) {
- return;
- }
-
- DocumentFormattingParams params;
- const DocumentUri uri = DocumentUri::fromFilePath(filePath);
- params.setTextDocument(TextDocumentIdentifier(uri));
- params.setOptions(formattingOptions(document->tabSettings()));
- DocumentFormattingRequest request(params);
- request.setResponseCallback(
- [uri, self = QPointer<Client>(this)](const DocumentFormattingRequest::Response &response) {
- handleFormattingResponse(uri, self, response);
- });
- sendContent(request);
-}
-
-void Client::formatRange(const TextEditor::TextDocument *document, const QTextCursor &cursor)
-{
- if (!isSupportedDocument(document))
- return;
-
- const FilePath &filePath = document->filePath();
- const QString method(DocumentRangeFormattingRequest::methodName);
- if (Utils::optional<bool> registered = m_dynamicCapabilities.isRegistered(method)) {
- if (!registered.value())
- return;
- const TextDocumentRegistrationOptions option(
- m_dynamicCapabilities.option(method).toObject());
- if (option.isValid(nullptr)
- && !option.filterApplies(filePath, Utils::mimeTypeForName(document->mimeType()))) {
- return;
- }
- } else if (!m_serverCapabilities.documentRangeFormattingProvider().value_or(false)) {
- return;
- }
- DocumentRangeFormattingParams params;
- const DocumentUri uri = DocumentUri::fromFilePath(filePath);
- params.setTextDocument(TextDocumentIdentifier(uri));
- params.setOptions(formattingOptions(document->tabSettings()));
- if (!cursor.hasSelection()) {
- QTextCursor c = cursor;
- c.select(QTextCursor::LineUnderCursor);
- params.setRange(Range(c));
- } else {
- params.setRange(Range(cursor));
- }
- DocumentRangeFormattingRequest request(params);
- request.setResponseCallback([uri, self = QPointer<Client>(this)](
- const DocumentRangeFormattingRequest::Response &response) {
- handleFormattingResponse(uri, self, response);
- });
- sendContent(request);
-}
-
const ProjectExplorer::Project *Client::project() const
{
return m_project;
diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h
index b52eded2a7..2eac8ee2c0 100644
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -123,9 +123,6 @@ public:
const LanguageServerProtocol::DocumentUri &uri);
void executeCommand(const LanguageServerProtocol::Command &command);
- void formatFile(const TextEditor::TextDocument *document);
- void formatRange(const TextEditor::TextDocument *document, const QTextCursor &cursor);
-
// workspace control
void setCurrentProject(ProjectExplorer::Project *project);
const ProjectExplorer::Project *project() const;