Modernize Whitespace token in lexer: hdl

4 files changed, 176 insertions, 216 deletions

diff --git a/tests/snippets/systemverilog/test_basic.txt b/tests/snippets/systemverilog/test_basic.txt
index 9307538d..1f86ed09 100644
--- a/tests/snippets/systemverilog/test_basic.txt
+++ b/tests/snippets/systemverilog/test_basic.txt
@@ -24,35 +24,31 @@ endmodule : Adder
 '// Adder flops the sum of its inputs\n' Comment.Single
 
 'module'      Keyword
-' '           Text
+' '           Text.Whitespace
 'Adder'       Name
-' '           Text
+' '           Text.Whitespace
 '#'           Punctuation
 '('           Punctuation
-'\n'          Text
-
-'    '        Text
+'\n    '      Text.Whitespace
 'parameter'   Keyword
-' '           Text
+' '           Text.Whitespace
 'int'         Keyword.Type
-' '           Text
+' '           Text.Whitespace
 'N'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '42'          Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '('           Punctuation
-'\n'          Text
-
-'    '        Text
+'\n    '      Text.Whitespace
 'output'      Keyword
-' '           Text
+' '           Text.Whitespace
 'logic'       Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'N'           Name
 '-'           Operator
@@ -60,27 +56,21 @@ endmodule : Adder
 ':'           Operator
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'y'           Name
 ','           Punctuation
-'\n'          Text
-
-'    '        Text
+'\n    '      Text.Whitespace
 'output'      Keyword
-' '           Text
+' '           Text.Whitespace
 'logic'       Keyword.Type
-'         '   Text
+'         '   Text.Whitespace
 'co'          Name
 ','           Punctuation
-'\n'          Text
-
-'\n'          Text
-
-'    '        Text
+'\n\n    '    Text.Whitespace
 'input'       Keyword
-'  '          Text
+'  '          Text.Whitespace
 'logic'       Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'N'           Name
 '-'           Operator
@@ -88,16 +78,14 @@ endmodule : Adder
 ':'           Operator
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'a'           Name
 ','           Punctuation
-'\n'          Text
-
-'    '        Text
+'\n    '      Text.Whitespace
 'input'       Keyword
-'  '          Text
+'  '          Text.Whitespace
 'logic'       Keyword.Type
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 'N'           Name
 '-'           Operator
@@ -105,77 +93,65 @@ endmodule : Adder
 ':'           Operator
 '0'           Literal.Number.Integer
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'b'           Name
 ','           Punctuation
-'\n'          Text
-
-'    '        Text
+'\n    '      Text.Whitespace
 'input'       Keyword
-'  '          Text
+'  '          Text.Whitespace
 'logic'       Keyword.Type
-'         '   Text
+'         '   Text.Whitespace
 'ci'          Name
 ','           Punctuation
-'\n'          Text
-
-'\n'          Text
-
-'    '        Text
+'\n\n    '    Text.Whitespace
 'input'       Keyword
-'  '          Text
+'  '          Text.Whitespace
 'logic'       Keyword.Type
-' '           Text
+' '           Text.Whitespace
 'clk'         Name
-'\n'          Text
+'\n'          Text.Whitespace
 
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
-
-'    '        Text
+'\n    '      Text.Whitespace
 'always_ff'   Keyword
-' '           Text
+' '           Text.Whitespace
 '@'           Punctuation
 '('           Punctuation
 'posedge'     Keyword
-' '           Text
+' '           Text.Whitespace
 'clk'         Name
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'begin'       Keyword
-'\n'          Text
-
-'        '    Text
+'\n        '  Text.Whitespace
 '{'           Punctuation
 'co'          Name
 ','           Punctuation
-' '           Text
+' '           Text.Whitespace
 'y'           Name
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'a'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'b'           Name
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 'ci'          Name
 ';'           Punctuation
-'\n'          Text
-
-'    '        Text
+'\n    '      Text.Whitespace
 'end'         Keyword
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endmodule'   Keyword
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 'Adder'       Name
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/systemverilog/test_classes.txt b/tests/snippets/systemverilog/test_classes.txt
index fce86a72..b9529db5 100644
--- a/tests/snippets/systemverilog/test_classes.txt
+++ b/tests/snippets/systemverilog/test_classes.txt
@@ -15,81 +15,75 @@ endclass : Free
 
 ---tokens---
 'class'       Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'Foo'         Name.Class
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endclass'    Keyword.Declaration
-'\n'          Text
-
-'\n'          Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'Bar'         Name.Class
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endclass'    Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Bar'         Name.Class
-'\n'          Text
-
-'\n'          Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'Fiz'         Name.Class
-' '           Text
+' '           Text.Whitespace
 'extends'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'Buz'         Name.Class
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endclass'    Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Fiz'         Name.Class
-'\n'          Text
-
-'\n'          Text
+'\n\n'        Text.Whitespace
 
 'class'       Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'Free'        Name.Class
-' '           Text
+' '           Text.Whitespace
 '#'           Punctuation
 '('           Punctuation
 'parameter'   Keyword
-' '           Text
+' '           Text.Whitespace
 'type'        Keyword.Type
-' '           Text
+' '           Text.Whitespace
 'T'           Name
-' '           Text
+' '           Text.Whitespace
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'byte'        Keyword.Type
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'extends'     Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 'Beer'        Name.Class
-' '           Text
+' '           Text.Whitespace
 '#'           Punctuation
 '('           Punctuation
 'T'           Name
 ')'           Punctuation
 ';'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 'endclass'    Keyword.Declaration
-' '           Text
+' '           Text.Whitespace
 ':'           Punctuation
-' '           Text
+' '           Text.Whitespace
 'Free'        Name.Class
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/systemverilog/test_numbers.txt b/tests/snippets/systemverilog/test_numbers.txt
index fa0ee5f6..d7e45116 100644
--- a/tests/snippets/systemverilog/test_numbers.txt
+++ b/tests/snippets/systemverilog/test_numbers.txt
@@ -44,125 +44,115 @@
 
 ---tokens---
 "8'b10101010" Literal.Number.Bin
-'\n'          Text
+'\n'          Text.Whitespace
 
 "8 'b10101010" Literal.Number.Bin
-'\n'          Text
+'\n'          Text.Whitespace
 
 "8'b 10101010" Literal.Number.Bin
-'\n'          Text
+'\n'          Text.Whitespace
 
 "8'sb10101010" Literal.Number.Bin
-'\n'          Text
+'\n'          Text.Whitespace
 
 "8'Sb10101010" Literal.Number.Bin
-'\n'          Text
+'\n'          Text.Whitespace
 
 "8'B10101010" Literal.Number.Bin
-'\n'          Text
+'\n'          Text.Whitespace
 
 "8'b1010_1010" Literal.Number.Bin
-'\n'          Text
+'\n'          Text.Whitespace
 
 "8'b10xXzZ?10" Literal.Number.Bin
-'\n'          Text
-
-'\n'          Text
+'\n\n'        Text.Whitespace
 
 "24'o01234567" Literal.Number.Oct
-'\n'          Text
+'\n'          Text.Whitespace
 
 "24 'o01234567" Literal.Number.Oct
-'\n'          Text
+'\n'          Text.Whitespace
 
 "24'o 01234567" Literal.Number.Oct
-'\n'          Text
+'\n'          Text.Whitespace
 
 "24'so01234567" Literal.Number.Oct
-'\n'          Text
+'\n'          Text.Whitespace
 
 "24'So01234567" Literal.Number.Oct
-'\n'          Text
+'\n'          Text.Whitespace
 
 "24'O01234567" Literal.Number.Oct
-'\n'          Text
+'\n'          Text.Whitespace
 
 "24'o0123_4567" Literal.Number.Oct
-'\n'          Text
+'\n'          Text.Whitespace
 
 "24'o01xXzZ?7" Literal.Number.Oct
-'\n'          Text
-
-'\n'          Text
+'\n\n'        Text.Whitespace
 
 "32'd27182818" Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32 'd27182818" Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'd 27182818" Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'sd27182818" Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'Sd27182818" Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'D27182818" Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'd2718_2818" Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'd27xXzZ?8" Literal.Number.Integer
-'\n'          Text
-
-'\n'          Text
+'\n\n'        Text.Whitespace
 
 "32'hdeadbeef" Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32 'hdeadbeef" Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'h deadbeef" Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'shdeadbeef" Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'Shdeadbeef" Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'Hdeadbeef" Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'hdead_beef" Literal.Number.Hex
-'\n'          Text
+'\n'          Text.Whitespace
 
 "32'hdexXzZ?f" Literal.Number.Hex
-'\n'          Text
-
-'\n'          Text
+'\n\n'        Text.Whitespace
 
 "'0"          Literal.Number
-' '           Text
+' '           Text.Whitespace
 "'1"          Literal.Number
-' '           Text
+' '           Text.Whitespace
 "'x"          Literal.Number
-' '           Text
+' '           Text.Whitespace
 "'X"          Literal.Number
-' '           Text
+' '           Text.Whitespace
 "'z"          Literal.Number
-' '           Text
+' '           Text.Whitespace
 "'Z"          Literal.Number
-'\n'          Text
-
-'\n'          Text
+'\n\n'        Text.Whitespace
 
 '42'          Literal.Number.Integer
-' '           Text
+' '           Text.Whitespace
 '1234_5678'   Literal.Number.Integer
-'\n'          Text
+'\n'          Text.Whitespace
diff --git a/tests/snippets/systemverilog/test_operators.txt b/tests/snippets/systemverilog/test_operators.txt
index 5c8dc2e1..fec45394 100644
--- a/tests/snippets/systemverilog/test_operators.txt
+++ b/tests/snippets/systemverilog/test_operators.txt
@@ -22,192 +22,192 @@
 ---tokens---
 '('           Punctuation
 ')'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '['           Punctuation
 ']'           Punctuation
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 ':'           Operator
-' '           Text
+' '           Text.Whitespace
 '.'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace
 
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
-' '           Text
+' '           Text.Whitespace
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '~'           Operator
 '&'           Operator
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '~'           Operator
 '|'           Operator
-' '           Text
+' '           Text.Whitespace
 '^'           Operator
-' '           Text
+' '           Text.Whitespace
 '~'           Operator
 '^'           Operator
-' '           Text
+' '           Text.Whitespace
 '^'           Operator
 '~'           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
 '+'           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '-'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Operator
 '*'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '*'           Operator
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '<'           Operator
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '>'           Operator
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '<'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 'inside'      Operator.Word
-' '           Text
+' '           Text.Whitespace
 'dist'        Operator.Word
-'\n'          Text
+'\n'          Text.Whitespace
 
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '='           Operator
 '='           Operator
 '?'           Operator
-' '           Text
+' '           Text.Whitespace
 '!'           Operator
 '='           Operator
 '?'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '&'           Operator
 '&'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '|'           Operator
 '|'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '?'           Operator
 ':'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '-'           Operator
 '>'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '-'           Operator
 '>'           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '+'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '-'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '*'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '/'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '%'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '&'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '^'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '|'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '<'           Operator
 '<'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 '>'           Operator
 '>'           Operator
 '>'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '='           Operator
-' '           Text
+' '           Text.Whitespace
 ':'           Operator
 '/'           Operator
-' '           Text
+' '           Text.Whitespace
 '<'           Operator
 '='           Operator
-'\n'          Text
+'\n'          Text.Whitespace
 
 '{'           Punctuation
 '}'           Punctuation
-' '           Text
+' '           Text.Whitespace
 '{'           Punctuation
 '{'           Punctuation
 '}'           Punctuation
 '}'           Punctuation
-'\n'          Text
+'\n'          Text.Whitespace