Skip to content

Commit 9bb63dd

Browse files
committed
ignore end_posn field when not present
1 parent b9d688b commit 9bb63dd

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

go/analysis/internal/analysisflags/flags.go

+9-4
Original file line numberDiff line numberDiff line change
@@ -410,20 +410,25 @@ func (tree JSONTree) Add(fset *token.FileSet, id, name string, diags []analysis.
410410
}
411411
var related []JSONRelatedInformation
412412
for _, r := range f.Related {
413-
related = append(related, JSONRelatedInformation{
413+
relatedInfo := JSONRelatedInformation{
414414
Posn: fset.Position(r.Pos).String(),
415-
EndPosn: fset.Position(r.End).String(),
416415
Message: r.Message,
417-
})
416+
}
417+
if r.End != token.NoPos {
418+
relatedInfo.EndPosn = fset.Position(r.End).String()
419+
}
420+
related = append(related, relatedInfo)
418421
}
419422
jdiag := JSONDiagnostic{
420423
Category: f.Category,
421424
Posn: fset.Position(f.Pos).String(),
422-
EndPosn: fset.Position(f.End).String(),
423425
Message: f.Message,
424426
SuggestedFixes: fixes,
425427
Related: related,
426428
}
429+
if f.End != token.NoPos {
430+
jdiag.EndPosn = fset.Position(f.End).String()
431+
}
427432
diagnostics = append(diagnostics, jdiag)
428433
}
429434
v = diagnostics

go/analysis/unitchecker/unitchecker_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ func _() {
105105
"findcall": \[
106106
\{
107107
"posn": "([/._\-a-zA-Z0-9]+[\\/]fake[\\/])?a/a.go:4:11",
108-
"end_posn": "-",
109108
"message": "call of MyFunc123\(...\)",
110109
"suggested_fixes": \[
111110
\{
@@ -131,7 +130,6 @@ func _() {
131130
"assign": \[
132131
\{
133132
"posn": "([/._\-a-zA-Z0-9]+[\\/]fake[\\/])?c/c.go:5:5",
134-
"end_posn": "-",
135133
"message": "self-assignment of i to i",
136134
"suggested_fixes": \[
137135
\{

0 commit comments

Comments
 (0)