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

LSP: rename Create/Rename/DeleteFile classes

Browse Source 
Since they clash with default windows functions and cause issues with
PCH build.

Change-Id: Ice0339c7dad14b40e172c885ffb71d923469614a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
David Schulz
2023-10-09 13:50:32 +02:00
parent 8af6d16b6c
commit 6adaa850e8
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/languageclient/languageclientsymbolsupport.cpp
View File

@@ -556,18 +556,18 @@ Utils::SearchResultItems generateReplaceItems(const WorkspaceEdit &edits,
} else {
Utils::SearchResultItem item;
if (std::holds_alternative<LanguageServerProtocol::CreateFile>(documentChange)) {
auto op = std::get<LanguageServerProtocol::CreateFile>(documentChange);
if (std::holds_alternative<CreateFileOperation>(documentChange)) {
auto op = std::get<CreateFileOperation>(documentChange);
item.setLineText(op.message(pathMapper));
item.setFilePath(op.uri().toFilePath(pathMapper));
item.setUserData(QVariant(op));
} else if (std::holds_alternative<RenameFile>(documentChange)) {
auto op = std::get<RenameFile>(documentChange);
} else if (std::holds_alternative<RenameFileOperation>(documentChange)) {
auto op = std::get<RenameFileOperation>(documentChange);
item.setLineText(op.message(pathMapper));
item.setFilePath(op.oldUri().toFilePath(pathMapper));
item.setUserData(QVariant(op));
} else if (std::holds_alternative<LanguageServerProtocol::DeleteFile>(documentChange)) {
auto op = std::get<LanguageServerProtocol::DeleteFile>(documentChange);
} else if (std::holds_alternative<DeleteFileOperation>(documentChange)) {
auto op = std::get<DeleteFileOperation>(documentChange);
item.setLineText(op.message(pathMapper));
item.setFilePath(op.uri().toFilePath(pathMapper));
item.setUserData(QVariant(op));
@@ -693,11 +693,11 @@ void SymbolSupport::applyRename(const Utils::SearchResultItems &checkedItems,
const QJsonObject jsonObject = item.userData().toJsonObject();
if (const TextEdit edit(jsonObject); edit.isValid())
editsForDocuments[filePath] << edit;
else if (const LanguageServerProtocol::CreateFile createFile(jsonObject); createFile.isValid())
else if (const CreateFileOperation createFile(jsonObject); createFile.isValid())
changes << createFile;
else if (const RenameFile renameFile(jsonObject); renameFile.isValid())
else if (const RenameFileOperation renameFile(jsonObject); renameFile.isValid())
changes << renameFile;
else if (const LanguageServerProtocol::DeleteFile deleteFile(jsonObject); deleteFile.isValid())
else if (const DeleteFileOperation deleteFile(jsonObject); deleteFile.isValid())
changes << deleteFile;
}