diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-02-03 11:17:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 11:17:07 -0800 |
| commit | 5f05aa2b6e96e2f93af6b41c22d033121d794968 (patch) | |
| tree | ef818e974caa6531896d6b0a71d7db513a0b5301 /toolsrc | |
| parent | 0c32fc522dbd9368270e53b9e2185c570445b568 (diff) | |
| download | vcpkg-5f05aa2b6e96e2f93af6b41c22d033121d794968.tar.gz vcpkg-5f05aa2b6e96e2f93af6b41c22d033121d794968.zip | |
[vcpkg] Emit parse errors to match '<file>:<line>:<col>: error: <text>' for better IDE compatibility (#15926)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/src/vcpkg-test/json.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/base/json.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/base/parse.cpp | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/toolsrc/src/vcpkg-test/json.cpp b/toolsrc/src/vcpkg-test/json.cpp index 6858a5ac8..b03fe2aec 100644 --- a/toolsrc/src/vcpkg-test/json.cpp +++ b/toolsrc/src/vcpkg-test/json.cpp @@ -234,7 +234,7 @@ TEST_CASE ("JSON track newlines", "[json]") auto res = Json::parse("{\n,", fs::u8path("filename")); REQUIRE(!res); REQUIRE(res.error()->format() == - R"(Error: filename:2:1: Unexpected character; expected property name + R"(filename:2:1: error: Unexpected character; expected property name on expression: , ^ )"); diff --git a/toolsrc/src/vcpkg/base/json.cpp b/toolsrc/src/vcpkg/base/json.cpp index d99fa7392..c287eae78 100644 --- a/toolsrc/src/vcpkg/base/json.cpp +++ b/toolsrc/src/vcpkg/base/json.cpp @@ -1062,7 +1062,7 @@ namespace vcpkg::Json ExpectedT<std::pair<Value, JsonStyle>, std::unique_ptr<Parse::IParseError>> parse(StringView json, const fs::path& filepath) noexcept { - return Parser::parse(json, fs::generic_u8string(filepath)); + return Parser::parse(json, fs::u8string(filepath)); } ExpectedT<std::pair<Value, JsonStyle>, std::unique_ptr<Parse::IParseError>> parse(StringView json, StringView origin) noexcept diff --git a/toolsrc/src/vcpkg/base/parse.cpp b/toolsrc/src/vcpkg/base/parse.cpp index a082c4d9c..fb1b4c3bf 100644 --- a/toolsrc/src/vcpkg/base/parse.cpp +++ b/toolsrc/src/vcpkg/base/parse.cpp @@ -34,13 +34,12 @@ namespace vcpkg::Parse caret_spacing.push_back(cp == '\t' ? '\t' : ' '); } - return Strings::concat("Error: ", - origin, + return Strings::concat(origin, ":", row, ":", column, - ": ", + ": error: ", message, "\n" " on expression: ", // 18 columns |
