Merge pull request #685 from ThisDrunkDane/master

Fix misplaced line number in log (was wrongly formatted and before procedure)
This commit is contained in:
Mikkel Hjortshøj
2020-07-05 19:53:22 +02:00
committed by GitHub
+2 -3
View File
@@ -128,19 +128,18 @@ do_location_header :: proc(opts: Options, buf: ^strings.Builder, location := #ca
fmt.sbprint(buf, file); fmt.sbprint(buf, file);
} }
if .Line in opts { if .Line in opts {
if (Location_File_Opts | {.Procedure}) & opts != nil { if Location_File_Opts & opts != nil {
fmt.sbprint(buf, ":"); fmt.sbprint(buf, ":");
} }
fmt.sbprint(buf, location.line); fmt.sbprint(buf, location.line);
} }
if .Procedure in opts { if .Procedure in opts {
if Location_File_Opts & opts != nil { if (Location_File_Opts | {.Line}) & opts != nil {
fmt.sbprint(buf, ":"); fmt.sbprint(buf, ":");
} }
fmt.sbprintf(buf, "%s()", location.procedure); fmt.sbprintf(buf, "%s()", location.procedure);
} }
fmt.sbprint(buf, "] "); fmt.sbprint(buf, "] ");
} }