lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

no blank line if no LOC

Browse source
This commit is contained in:
Ben Burdette 2020-05-12 14:41:30 -06:00
parent 960d4362ed
commit ecbb8e9c0a
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -17,7 +17,8 @@ makefiles = \
misc/upstart/local.mk \ misc/upstart/local.mk \
doc/manual/local.mk \ doc/manual/local.mk \
tests/local.mk \ tests/local.mk \
tests/plugins/local.mk tests/plugins/local.mk \
src/error-demo/local.mk
-include Makefile.config -include Makefile.config

1
src/error-demo/error-demo.cc
View file

@ -1,5 +1,6 @@
#include "logging.hh" #include "logging.hh"
#include "nixexpr.hh" #include "nixexpr.hh"
#include "util.hh"
#include <iostream> #include <iostream>
#include <optional> #include <optional>

2
src/libutil/error.cc
View file

@ -182,7 +182,7 @@ std::ostream& operator<<(std::ostream &out, const ErrorInfo &einfo)
} }
// lines of code. // lines of code.
if (einfo.nixCode.has_value()) { if (einfo.nixCode.has_value() && einfo.nixCode->errLineOfCode.has_value()) {
printCodeLines(out, prefix, *einfo.nixCode); printCodeLines(out, prefix, *einfo.nixCode);
out << prefix << std::endl; out << prefix << std::endl;
} }