[vcpkg] Emit parse errors to match '<file>:<line>:<col>: error: <text…

…>' for better IDE compatibility (microsoft#15926) Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
ilya-lavrenov · Feb 3, 2021 · 5f05aa2 · 5f05aa2
1 parent 0c32fc5
commit 5f05aa2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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