Highlight YQL comments in YDB CLI interactive mode (#9359)

Author: vityaman

ydb/public/lib/ydb_cli/commands/interactive/yql_highlight.cpp

@@ -83,11 +83,14 @@ namespace NYdb {
                 },
                 .string = rgb666(3, 0, 0),
                 .number = Color::BRIGHTGREEN,
+                .comment = rgb666(2, 2, 2),
                 .unknown = Color::DEFAULT,
             };
         }
 
         YQLHighlight::ColorSchema YQLHighlight::ColorSchema::Debug() {
+            using replxx::color::rgb666;
+
             return {
                 .keyword = Color::BLUE,
                 .operation = Color::GRAY,
@@ -99,6 +102,7 @@ namespace NYdb {
                 },
                 .string = Color::GREEN,
                 .number = Color::BRIGHTGREEN,
+                .comment = rgb666(2, 2, 2),
                 .unknown = Color::DEFAULT,
             };
         }
@@ -162,6 +166,9 @@ namespace NYdb {
             if (IsKeyword(token)) {
                 return Coloring.keyword;
             }
+            if (IsComment(token)) {
+                return Coloring.comment;
+            }
             return Coloring.unknown;
         }
 
@@ -532,5 +539,9 @@ namespace NYdb {
             }
         }
 
+        bool YQLHighlight::IsComment(const antlr4::Token* token) const {
+            return token->getType() == TOKEN(COMMENT);
+        }
+
     } // namespace NConsoleClient
 } // namespace NYdb

ydb/public/lib/ydb_cli/commands/interactive/yql_highlight.h

@@ -29,6 +29,7 @@ namespace NYdb {
                 } identifier;
                 Color string;
                 Color number;
+                Color comment;
                 Color unknown;
 
                 static ColorSchema Monaco();
@@ -53,6 +54,7 @@ namespace NYdb {
             bool IsQuotedIdentifier(const antlr4::Token* token) const;
             bool IsString(const antlr4::Token* token) const;
             bool IsNumber(const antlr4::Token* token) const;
+            bool IsComment(const antlr4::Token* token) const;
 
         private:
             ColorSchema Coloring;

ydb/public/lib/ydb_cli/commands/interactive/yql_highlight_ut.cpp

@@ -19,6 +19,7 @@ Y_UNIT_TEST_SUITE(YqlHighlightTests) {
         {'s', Coloring.string},
         {'n', Coloring.number},
         {'u', Coloring.unknown},
+        {'c', Coloring.comment},
         {' ', YQLHighlight::Color::DEFAULT},
     };
 
@@ -183,4 +184,15 @@ Y_UNIT_TEST_SUITE(YqlHighlightTests) {
             }
         }
     }
+
+    Y_UNIT_TEST(Comment) {
+        YQLHighlight highlight(Coloring);
+        Check(highlight, "- select", "o kkkkkk");
+        Check(highlight, "select -- select", "kkkkkk ccccccccc");
+        Check(highlight, "-- select\nselect", "cccccccccckkkkkk");
+        Check(highlight, "/* select */", "cccccccccccc");
+        Check(highlight, "select /* select */ select", "kkkkkk cccccccccccc kkkkkk");
+        Check(highlight, "/**/ --", "cccc cc");
+        Check(highlight, "/*/**/*/", "ccccccoo");
+    }
 }