As usual while waiting for the next release - don't forget to check the nightly builds in the forum.
diff --git a/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp b/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cppindex b64e7d760..425268724 100644--- a/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp+++ b/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp@@ -256,7 +256,7 @@ void LSPDiagnosticsResultsLog::OnApplyFixIfAvailable(wxCommandEvent& event) //(p { // Got the selected item index selectedLineText = GetItemAsText(itemIndex);- if (not selectedLineText.Contains(" (fix available) "))+ if (not (selectedLineText.Contains(" (fix available) ") or (selectedLineText.Contains("(fixes available)")))) { wxString msg = wxString::Format(_("No Fix available for logLine(%d)"), int(itemIndex) ); InfoWindow::Display(_("NO fix"), msg);diff --git a/src/plugins/contrib/clangd_client/src/codecompletion/parser/parser.cpp b/src/plugins/contrib/clangd_client/src/codecompletion/parser/parser.cppindex b97e46a30..2ef369352 100644--- a/src/plugins/contrib/clangd_client/src/codecompletion/parser/parser.cpp+++ b/src/plugins/contrib/clangd_client/src/codecompletion/parser/parser.cpp@@ -3688,15 +3688,17 @@ void Parser::OnRequestCodeActionApply(wxCommandEvent& event) //(ph 2024/02/12) int startLine; // 1 origin; needs to be changed to zero origin int lineStartCol; int lineEndCol;+ int endLine; codeActionStr = FixesFound[ii]; try { // std::string testData = "{\"newText\":\"int\",\"range\":{\"end\":{\"character\":8,\"line\":275},\"start\":{\"character\":4,\"line\":275}}}"; // **Debugging** nlohmann::json jCodeAction = nlohmann::json::parse(codeActionStr.ToStdString()); newText = jCodeAction["newText"].get<std::string>();- startLine = lineNumInt; // it's already 1 origin+ startLine = jCodeAction["range"]["start"]["line"] ; lineStartCol = jCodeAction["range"]["start"]["character"] ; lineEndCol = jCodeAction["range"]["end"]["character"] ;+ endLine = jCodeAction["range"]["end"]["line"] ; } catch(std::exception &err) {@@ -3708,9 +3710,12 @@ void Parser::OnRequestCodeActionApply(wxCommandEvent& event) //(ph 2024/02/12) // pEd contains the cbEditor ptr from above cbStyledTextCtrl* pControl = pEd->GetControl(); // Replace text; note that the startLine is from the log msg line, so it's 1 origin- int linePosn = pControl->PositionFromLine(startLine-1); // use zero origin for line- pControl->SetTargetStart(linePosn + lineStartCol);- pControl->SetTargetEnd(linePosn + lineEndCol );+ int linePosn = pControl->PositionFromLine(startLine); // use zero origin for line+ int targetStart = linePosn + lineStartCol;+ pControl->SetTargetStart(targetStart);+ int lineEndPosn = pControl->PositionFromLine(endLine);+ int targetEnd = lineEndPosn + lineEndCol;+ pControl->SetTargetEnd(targetEnd); pControl->ReplaceTarget(newText); }//endfor FixesFound
Hi Pecan,I found two issues with applying fix in my setup. I'm using clangd version 18.0.01. "fixes available" along with "fix available"2. Multi line fixes, eg: unused header warnings.Below modification helped to apply these fixes.Codediff --git a/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp b/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cppindex b64e7d760..425268724 100644--- a/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp+++ b/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp@@ -256,7 +256,7 @@ void LSPDiagnosticsResultsLog::OnApplyFixIfAvailable(wxCommandEvent& event) //(p { // Got the selected item index selectedLineText = GetItemAsText(itemIndex);- if (not selectedLineText.Contains(" (fix available) "))+ if (not (selectedLineText.Contains(" (fix available) ") or (selectedLineText.Contains("(fixes available)")))) { wxString msg = wxString::Format(_("No Fix available for logLine(%d)"), int(itemIndex) ); InfoWindow::Display(_("NO fix"), msg);diff --git a/src/plugins/contrib/clangd_client/src/codecompletion/parser/parser.cpp b/src/plugins/contrib/clangd_client/src/codecompletion/parser/parser.cppindex b97e46a30..2ef369352 100644--- a/src/plugins/contrib/clangd_client/src/codecompletion/parser/parser.cpp+++ b/src/plugins/contrib/clangd_client/src/codecompletion/parser/parser.cpp@@ -3688,15 +3688,17 @@ void Parser::OnRequestCodeActionApply(wxCommandEvent& event) //(ph 2024/02/12) int startLine; // 1 origin; needs to be changed to zero origin int lineStartCol; int lineEndCol;+ int endLine; codeActionStr = FixesFound[ii]; try { // std::string testData = "{\"newText\":\"int\",\"range\":{\"end\":{\"character\":8,\"line\":275},\"start\":{\"character\":4,\"line\":275}}}"; // **Debugging** nlohmann::json jCodeAction = nlohmann::json::parse(codeActionStr.ToStdString()); newText = jCodeAction["newText"].get<std::string>();- startLine = lineNumInt; // it's already 1 origin+ startLine = jCodeAction["range"]["start"]["line"] ; lineStartCol = jCodeAction["range"]["start"]["character"] ; lineEndCol = jCodeAction["range"]["end"]["character"] ;+ endLine = jCodeAction["range"]["end"]["line"] ; } catch(std::exception &err) {@@ -3708,9 +3710,12 @@ void Parser::OnRequestCodeActionApply(wxCommandEvent& event) //(ph 2024/02/12) // pEd contains the cbEditor ptr from above cbStyledTextCtrl* pControl = pEd->GetControl(); // Replace text; note that the startLine is from the log msg line, so it's 1 origin- int linePosn = pControl->PositionFromLine(startLine-1); // use zero origin for line- pControl->SetTargetStart(linePosn + lineStartCol);- pControl->SetTargetEnd(linePosn + lineEndCol );+ int linePosn = pControl->PositionFromLine(startLine); // use zero origin for line+ int targetStart = linePosn + lineStartCol;+ pControl->SetTargetStart(targetStart);+ int lineEndPosn = pControl->PositionFromLine(endLine);+ int targetEnd = lineEndPosn + lineEndCol;+ pControl->SetTargetEnd(targetEnd); pControl->ReplaceTarget(newText); }//endfor FixesFound Thanks, Christo
are you planning to introduce other patches by christo as :https://forums.codeblocks.org/index.php/topic,25570.msg174618.html#msg174618 to mark warnings in yellow, errors still in redandhttps://forums.codeblocks.org/index.php/topic,25659.msg174619.html#msg174619 to show dignostics by clickingI think the fisrt one is useful, but of course need to be updated
Thanks Pecan.I face another issue now - regarding errors with fixes in different line, like errors due to missing includes, fix is not applied. It shows "No available fixes found" on applying. In Parser::OnRequestCodeActionApply() , there is a check if the fix is in same line that of the line causing the error. This might be causing the issue.
Quote from: christo on March 24, 2024, 11:58:39 amThanks Pecan.I face another issue now - regarding errors with fixes in different line, like errors due to missing includes, fix is not applied. It shows "No available fixes found" on applying. In Parser::OnRequestCodeActionApply() , there is a check if the fix is in same line that of the line causing the error. This might be causing the issue.Can you give me a 1,2,3 list of a way to re-create the situation?
int main(){ std::cout << "Hello"; return 0;}
/home/christo/projects/Test/test2/main.cpp|3|error:Use of undeclared identifier 'std' (fix available) Include <iostream> for symbol std::cout|
Yes, I use Clangd 18 and got the same problem, too.
Fixed Head rev. 13494Thanks for the reports.
- "Find declaration of: ..." does not work for me.- "Reparse this project" has become a must so that the menu entry "Find declaration of: ..." appears.What is going wrong ?OS : Windows 7 with SP1 x64C::B : Nightly build 13496clangd : 18.1.2
Quote from: tomay3000 on April 04, 2024, 03:48:27 pm- "Find declaration of: ..." does not work for me.- "Reparse this project" has become a must so that the menu entry "Find declaration of: ..." appears.What is going wrong ?OS : Windows 7 with SP1 x64C::B : Nightly build 13496clangd : 18.1.2Not enough info. Can you give us a simple example (code) to recreate the problem?What steps can we perform to recreate the problem?
