Code completion using LSP and clangd

Developer forums (C::B DEVELOPMENT STRICTLY!) > Plugins development

<< < (76/92) > >>

christo:
Hi Pecan,

I found two issues with applying fix in my setup. I'm using clangd version 18.0.0
1. "fixes available" along with "fix available"
2. Multi line fixes, eg: unused header warnings.

Below modification helped to apply these fixes.

--- Code: ---diff --git a/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp b/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp
index 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.cpp
index 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

--- End code ---

Thanks, Christo

Pecan:

--- Quote from: christo on March 19, 2024, 06:21:49 pm ---Hi Pecan,

I found two issues with applying fix in my setup. I'm using clangd version 18.0.0
1. "fixes available" along with "fix available"
2. Multi line fixes, eg: unused header warnings.

Below modification helped to apply these fixes.

--- Code: ---diff --git a/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp b/src/plugins/contrib/clangd_client/src/LSPclient/lspdiagresultslog.cpp
index 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.cpp
index 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

--- End code ---

Thanks, Christo

--- End quote ---

@ christo
Thanks for your work on this.
When there are multiple extraneous #includes in the same file, the patch is taking out the wrong lines after the first one is successful.

So I'll hold onto this until I have time to find out why.

Pecan:
Applied modified christo patch to Clangd_client at Head rev 13493.
The patch supports additional fixes from Clangd version 18.
Thanks christo.

gd_on:
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 red
and
https://forums.codeblocks.org/index.php/topic,25659.msg174619.html#msg174619 to show dignostics by clicking

I think the fisrt one is useful, but of course need to be updated

Pecan:

--- Quote from: gd_on on March 22, 2024, 06:47:38 pm ---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 red
and
https://forums.codeblocks.org/index.php/topic,25659.msg174619.html#msg174619 to show dignostics by clicking

I think the fisrt one is useful, but of course need to be updated

--- End quote ---

I'll have a look at them. Thanks for the reminder.

Navigation

[0] Message Index

[#] Next page

[*] Previous page

Go to full version