Skip to content

Commit 6003adf

Browse files
committed
Intermediate changes
commit_hash:8de72050a69e1f6d4e27f37d478af70230005df8
1 parent 2b91f50 commit 6003adf

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

yql/essentials/public/fastcheck/format.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class TFormatRunner : public ICheckRunner {
7777
auto formatter = NSQLFormat::MakeSqlFormatter(lexers, parsers, settings);
7878
TString formattedQuery;
7979
res.Success = formatter->Format(request.Program, formattedQuery, res.Issues);
80-
if (res.Success && formattedQuery != NormalizeEOL(request.Program)) {
80+
if (res.Success && NormalizeEOL(formattedQuery) != NormalizeEOL(request.Program)) {
8181
res.Success = false;
8282
TPosition origPos(0, 1, request.File);
8383
TTextWalker origWalker(origPos, true);

yql/essentials/public/fastcheck/linter_ut.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,19 @@ Y_UNIT_TEST_SUITE(TLinterTests) {
115115
UNIT_ASSERT_VALUES_EQUAL(res.Checks[0].Issues.Size(), 0);
116116
}
117117

118+
Y_UNIT_TEST(GoodFormatYqlWithWinEOLInComment) {
119+
TChecksRequest request;
120+
request.Program = "--\r\nSELECT\n 1\n;\n\nSELECT\n 2\n;\n";
121+
request.Syntax = ESyntax::YQL;
122+
request.Filters.ConstructInPlace();
123+
request.Filters->push_back(TCheckFilter{.CheckNameGlob = "format"});
124+
auto res = RunChecks(request);
125+
UNIT_ASSERT_VALUES_EQUAL(res.Checks.size(), 1);
126+
UNIT_ASSERT_VALUES_EQUAL(res.Checks[0].CheckName, "format");
127+
UNIT_ASSERT_C(res.Checks[0].Success, res.Checks[0].Issues.ToString());
128+
UNIT_ASSERT_VALUES_EQUAL(res.Checks[0].Issues.Size(), 0);
129+
}
130+
118131
Y_UNIT_TEST(UnparsedFormatYql) {
119132
TChecksRequest request;
120133
request.Program = "select1\n";

0 commit comments

Comments
 (0)