Skip to content

Guard optional clientInfo + fix empty filename in diagnostics for scanner errors #167

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

Open
ajax16384 wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Guard optional clientInfo + fix empty filename in diagnostics for scanner errors #167

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
26505a8
guard optional clientInfo in ShowConfigStatus
ajax16384 Sep 18, 2026
6802621
fix empty filename in diagnostics for scanner errors
ajax16384 Sep 18, 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
10 changes: 8 additions & 2 deletions src/serverprotocol/PasLS.General.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,19 @@ procedure TInitialize.ShowConfigStatus(Params: TInitializeParams; CodeToolsOptio
I: Integer;
FPCOptions: TStringArray;
begin
if Params.clientInfo.version.HasValue then
// clientInfo is optional in the LSP spec and TClientInfo.version is
// not auto-created, so both must be checked before use
if (Params.clientInfo <> nil) and (Params.clientInfo.version <> nil)
and Params.clientInfo.version.HasValue then
clientInfoVersion := ' ' + Params.clientInfo.version.Value
else
clientInfoVersion := '';

DoLog(kStatusPrefix+'Server: ' + {$INCLUDE %DATE%});
DoLog(kStatusPrefix+'Client: ' + Params.clientInfo.name + clientInfoVersion);
if Params.clientInfo <> nil then
DoLog(kStatusPrefix+'Client: ' + Params.clientInfo.name + clientInfoVersion)
else
DoLog(kStatusPrefix+'Client: [unspecified]');

DoLog(kStatusPrefix+'FPCPath: ' + CodeToolsOptions.FPCPath);
DoLog(kStatusPrefix+'FPCSrcDir: ' + CodeToolsOptions.FPCSrcDir);
Expand Down
31 changes: 21 additions & 10 deletions src/serverprotocol/PasLS.Parser.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,15 @@ procedure TSourceParser.DoError(Sender: TObject;
else
aCode:=-1;
With FParser.CurSourcePos do
FOnError(Self,aContext.Error.Message,FileName,aCode, Row,Column);
begin
// scanner errors (e.g. include file not found) fire before the parser
// advanced, CurSourcePos is still empty (Line=0, Column=0, FileName='') -
// fall back to the buffer filename so the diagnostic keeps a valid URI
if FileName='' then
FOnError(Self,aContext.Error.Message,FCode.FileName,aCode, Row,Column)
else
FOnError(Self,aContext.Error.Message,FileName,aCode, Row,Column);
end;
end;
end;
{$ENDIF}
Expand Down Expand Up @@ -274,15 +282,18 @@ function TSourceParser.ParseSource: TPasModule;
begin
FreeAndNil(Result);
if Assigned(FOnError) then
With FParser.CurSourcePos do
begin
aCode:=-1;
{$IFDEF MULTIERROR}
if E is EParserError then
aCode:=EParserError(E).ErrNo;
{$ENDIF}
FOnError(Self,E.Message,FileName,aCode,Row,Column);
end;
begin
aCode:=-1;
{$IFDEF MULTIERROR}
if E is EParserError then
aCode:=EParserError(E).ErrNo;
{$ENDIF}
// note: no "with FParser.CurSourcePos do" here - its FileName field is
// empty for scanner errors (e.g. include file not found) and would
// shadow the local Filename, producing diagnostics with a broken URI
FOnError(Self,E.Message,Filename,aCode,
FParser.CurSourcePos.Row,FParser.CurSourcePos.Column);
end;
end;
end;
finally
Expand Down