Skip to content

Address Zed Not Consider Empty String As 'Falsy' #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oisanjaya wants to merge 2 commits into
base: trunk
Choose a base branch
from
Draft

Address Zed Not Consider Empty String As 'Falsy' #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e09409e
Remove fields completely with empty string values
Jul 26, 2026
a8df311
Ident Completion: Use textEdit field instead of falling back to label
Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions src/protocol/LSP.Base.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ TLSPLocalDispatcher = class(TLSPBaseDispatcher)
Class function GetLogFile: String; static;
procedure SetDispatcher(AValue: TLSPBaseDispatcher);
Class procedure SetLogFile(const AValue: String); static;
class procedure RemoveEmptyStringKeys(AData: TJSONData); static;
Protected
Class Procedure DoLog(const Msg : String);
Class Procedure DoLog(const Fmt : String; Const Args : Array of const);
Expand Down Expand Up @@ -556,13 +557,53 @@ class function TLSPContext.HaveLog: Boolean;
Result:=assigned(_LogFile);
end;


class procedure TLSPContext.RemoveEmptyStringKeys(AData: TJSONData);
var
i: Integer;
Child: TJSONData;
Obj: TJSONObject;
Arr: TJSONArray;
begin
if AData = nil then Exit;

case AData.JSONType of
jtObject:
begin
Obj := TJSONObject(AData);
for i := Obj.Count - 1 downto 0 do
begin
Child := Obj.Items[i];

if (Child.JSONType = jtString) and (Child.AsString = '') then
begin
if (Obj.Names[I] = 'sortText') or (Obj.Names[I] = 'filterText') or
(Obj.Names[I] = 'insertText') then
Obj.Delete(i);
end else
RemoveEmptyStringKeys(Child);
end;
end;

jtArray:
begin
Arr := TJSONArray(AData);
for i := 0 to Arr.Count - 1 do
RemoveEmptyStringKeys(Arr.Items[i]);
end;
end;
end;

function TLSPContext.Execute(aRequest: TJSONData): TJSONData;

begin
If HaveLog then
DoLog('Executing request: %s',[aRequest.AsJSON]);
try
Result:=Dispatcher.ExecuteRequest(aRequest);

TLSPContext.RemoveEmptyStringKeys(Result);

If HaveLog then
if Result<>Nil then
DoLog('Request response: %s',[Result.AsJSON])
Expand Down
6 changes: 6 additions & 0 deletions src/serverprotocol/PasLS.Completion.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ function TCompletion.Process(var Params: TCompletionParams): TCompletionList;
Identifier: TIdentifierListItem;
Completion: TCompletionItem;
OverloadMap: TFPHashList;
TextEdit: TTextEdit;
IdentContext, IdentDetails: ShortString;
ObjectMember: boolean;
Kind: TCompletionItemKind;
Expand Down Expand Up @@ -224,6 +225,11 @@ function TCompletion.Process(var Params: TCompletionParams): TCompletionList;

Completion := Completions.Add;
Completion.&label := Identifier.Identifier;
Completion.insertTextFormat := TInsertTextFormat.PlainText;
TextEdit := TTextEdit.Create(nil);
TextEdit.newText := Identifier.Identifier;
TextEdit.range.SetRange(Y, PStart - 1, Length(CodeToolBoss.IdentifierList.Prefix));
Completion.SetTextEdit(TextEdit);
if not ServerSettings.minimalisticCompletions then
Completion.detail := IdentDetails;
Completion.kind := Kind;
Expand Down