refactor(syntax): Group SyntaxKind and unify token/terminal kinds under LexemeKind.

SyntaxKind's flat token/terminal/missing variants are grouped into nested enums. A terminal node and the token that backs it share one lexical identity, so both reuse a single `LexemeKind` instead of duplicated `TokenKind`/`TerminalKind` lists; trivia tokens (whitespace, newlines, comments, skipped) move to `TriviaKind`, and enum missing-variants to `MissingKind`:

    enum SyntaxKind {
        Token(LexemeKind),
        TriviaToken(TriviaKind),
        Terminal(LexemeKind),
        Missing(MissingKind),
        // ...other node kinds stay flat
    }

The parser/lexer layer now operates on `LexemeKind` directly (LexerTerminal, peek().kind, Terminal::KIND, MissingToken, operator-precedence and skip predicates), reserving SyntaxKind for green-tree node kinds. Debug/Display preserve the historical flat names (TerminalIdentifier, TokenWhitespace, ExprMissing) so diagnostics and golden tests are unaffected by the grouping; the lone visible change is the friendlier "Missing token Identifier." (was "TerminalIdentifier"), since kind_to_string now renders a LexemeKind.

colored_printer::set_color matches exhaustively over LexemeKind/TriviaKind, removing its panicking catch-all. All kind enums are generated from the spec via a single classifier, so the duplication can't drift.

Author: orizi

crates/cairo-lang-doc/src/db.rs

@@ -6,7 +6,7 @@ use cairo_lang_filesystem::db::FilesGroup;
 use cairo_lang_filesystem::ids::{CrateId, FileId, Tracked};
 use cairo_lang_filesystem::span::{TextOffset, TextSpan, TextWidth};
 use cairo_lang_syntax::node::SyntaxNode;
-use cairo_lang_syntax::node::kind::SyntaxKind;
+use cairo_lang_syntax::node::kind::{SyntaxKind, TriviaKind};
 use itertools::{Itertools, intersperse};
 use salsa::Database;
 
@@ -256,7 +256,9 @@ fn get_embedded_markdown_links<'db>(
     node: SyntaxNode<'db>,
 ) -> Vec<MarkdownLink> {
     match node.kind(db) {
-        SyntaxKind::TokenSingleLineDocComment | SyntaxKind::TokenSingleLineInnerComment => {
+        SyntaxKind::TriviaToken(
+            TriviaKind::SingleLineDocComment | TriviaKind::SingleLineInnerComment,
+        ) => {
             let content = node.get_text(db);
             let base_span = node.span(db);
             parse_embedded_markdown_links(content, base_span.start)

crates/cairo-lang-doc/src/helpers.rs

@@ -12,7 +12,7 @@ use cairo_lang_semantic::items::us::UseSemantic;
 use cairo_lang_semantic::items::visibility::Visibility;
 use cairo_lang_semantic::{ConcreteTypeId, GenericParam, TypeId, TypeLongId};
 use cairo_lang_syntax::attribute::structured::Attribute;
-use cairo_lang_syntax::node::kind::SyntaxKind;
+use cairo_lang_syntax::node::kind::{LexemeKind, SyntaxKind};
 use cairo_lang_syntax::node::{SyntaxNode, TypedStablePtr, TypedSyntaxNode, green};
 use itertools::Itertools;
 use salsa::Database;
@@ -106,14 +106,14 @@ pub fn get_syntactic_evaluation<'db>(
             for child in syntax_node.get_children(db).iter() {
                 let kind = child.kind(db);
                 if !matches!(kind, SyntaxKind::Trivia) {
-                    if matches!(kind, SyntaxKind::TerminalSemicolon) {
+                    if matches!(kind, SyntaxKind::Terminal(LexemeKind::Semicolon)) {
                         buff.push(';');
                         return Ok(buff);
                     }
                     if is_after_evaluation_value {
                         buff.push_str(&SyntaxNode::get_text_without_all_comment_trivia(child, db));
                     };
-                    if matches!(kind, SyntaxKind::TerminalEq) {
+                    if matches!(kind, SyntaxKind::Terminal(LexemeKind::Eq)) {
                         is_after_evaluation_value = true;
                     }
                 }

crates/cairo-lang-doc/src/tests/test_documentation_comment_parser_links.rs

@@ -2,7 +2,7 @@ use cairo_lang_defs::db::DefsGroup;
 use cairo_lang_defs::ids::ModuleId;
 use cairo_lang_parser::db::ParserGroup;
 use cairo_lang_syntax::node::SyntaxNode;
-use cairo_lang_syntax::node::kind::SyntaxKind;
+use cairo_lang_syntax::node::kind::{SyntaxKind, TriviaKind};
 use cairo_lang_test_utils::parse_test_file::TestRunnerResult;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use salsa::Database;
@@ -24,7 +24,7 @@ fn collect_doc_comments<'db>(
     node: SyntaxNode<'db>,
     comments: &mut Vec<SyntaxNode<'db>>,
 ) {
-    if node.kind(db) == SyntaxKind::TokenSingleLineDocComment {
+    if node.kind(db) == SyntaxKind::TriviaToken(TriviaKind::SingleLineDocComment) {
         comments.push(node);
     }
     for &child in node.get_children(db) {

crates/cairo-lang-formatter/src/formatter_impl.rs

@@ -16,7 +16,7 @@ use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use cairo_lang_utils::smol_str::SmolStr;
 use itertools::{Itertools, chain};
 use salsa::Database;
-use syntax::node::kind::SyntaxKind;
+use syntax::node::kind::{LexemeKind, SyntaxKind, TriviaKind};
 
 use crate::FormatterConfig;
 
@@ -1145,8 +1145,9 @@ impl<'a> FormatterImpl<'a> {
             return;
         }
         // Split list into `use` path parts and TokenComma.
-        let (mut sorted_elements, commas): (Vec<_>, Vec<_>) =
-            children.drain(..).partition(|node| node.kind(self.db) != SyntaxKind::TerminalComma);
+        let (mut sorted_elements, commas): (Vec<_>, Vec<_>) = children
+            .drain(..)
+            .partition(|node| node.kind(self.db) != SyntaxKind::Terminal(LexemeKind::Comma));
 
         // Sort the filtered nodes by comparing their `UsePath`.
         sorted_elements.sort_by(|a_node, b_node| {
@@ -1262,7 +1263,7 @@ impl<'a> FormatterImpl<'a> {
             self.line_state.line_buffer.push_space();
         }
         self.line_state.prevent_next_space = syntax_node.force_no_space_after(self.db);
-        if syntax_node.kind(self.db) != SyntaxKind::TokenWhitespace {
+        if syntax_node.kind(self.db) != SyntaxKind::TriviaToken(TriviaKind::Whitespace) {
             self.is_current_line_whitespaces = false;
         }
         let node_break_points = syntax_node.get_wrapping_break_line_point_properties(self.db);