SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 10:25:42 +01:00
Code Issues Projects Releases Packages Activity

SystemVerilog: Adding better formatting for primitive definitions

Browse source
This commit is contained in:
sw23 2021-10-10 12:32:46 -04:00
parent 25cb9d78a8
commit b763728b60
2 changed files with 96 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/systemverilog/systemverilog.test.ts
View file

@ -1180,5 +1180,88 @@ testTokenization('systemverilog', [
{ startIndex: 49, type: 'delimiter.sv' }
]
}
],
// table
[
{
line: 'table',
tokens: [{ startIndex: 0, type: 'keyword.table.sv' }]
},
{
line: ' // clk d q q+',
tokens: [
{ startIndex: 0, type: '' },
{ startIndex: 2, type: 'comment.sv' }
]
},
{
line: ' r ? 0 : ? : - ;',
tokens: [
{ startIndex: 0, type: '' },
{ startIndex: 2, type: 'variable.predefined.sv' },
{ startIndex: 3, type: '' },
{ startIndex: 5, type: 'variable.predefined.sv' },
{ startIndex: 6, type: '' },
{ startIndex: 8, type: 'variable.predefined.sv' },
{ startIndex: 9, type: '' },
{ startIndex: 10, type: 'delimiter.sv' },
{ startIndex: 11, type: '' },
{ startIndex: 12, type: 'variable.predefined.sv' },
{ startIndex: 13, type: '' },
{ startIndex: 14, type: 'delimiter.sv' },
{ startIndex: 15, type: '' },
{ startIndex: 16, type: 'variable.predefined.sv' },
{ startIndex: 17, type: '' },
{ startIndex: 18, type: 'delimiter.sv' }
]
},
{
line: ' 0 x (01) : 0 : 1; // Comment ',
tokens: [
{ startIndex: 0, type: '' },
{ startIndex: 2, type: 'variable.predefined.sv' },
{ startIndex: 3, type: '' },
{ startIndex: 4, type: 'variable.predefined.sv' },
{ startIndex: 5, type: '' },
{ startIndex: 6, type: 'delimiter.parenthesis.sv' },
{ startIndex: 7, type: 'variable.predefined.sv' },
{ startIndex: 9, type: 'delimiter.parenthesis.sv' },
{ startIndex: 10, type: '' },
{ startIndex: 11, type: 'delimiter.sv' },
{ startIndex: 12, type: '' },
{ startIndex: 13, type: 'variable.predefined.sv' },
{ startIndex: 14, type: '' },
{ startIndex: 15, type: 'delimiter.sv' },
{ startIndex: 16, type: '' },
{ startIndex: 17, type: 'variable.predefined.sv' },
{ startIndex: 18, type: 'delimiter.sv' },
{ startIndex: 19, type: '' },
{ startIndex: 20, type: 'comment.sv' }
]
},
{
line: '0 0 1 : 0 : 1 ;',
tokens: [
{ startIndex: 0, type: 'variable.predefined.sv' },
{ startIndex: 1, type: '' },
{ startIndex: 2, type: 'variable.predefined.sv' },
{ startIndex: 3, type: '' },
{ startIndex: 4, type: 'variable.predefined.sv' },
{ startIndex: 5, type: '' },
{ startIndex: 6, type: 'delimiter.sv' },
{ startIndex: 7, type: '' },
{ startIndex: 8, type: 'variable.predefined.sv' },
{ startIndex: 9, type: '' },
{ startIndex: 10, type: 'delimiter.sv' },
{ startIndex: 11, type: '' },
{ startIndex: 12, type: 'variable.predefined.sv' },
{ startIndex: 13, type: '' },
{ startIndex: 14, type: 'delimiter.sv' }
]
},
{
line: 'endtable',
tokens: [{ startIndex: 0, type: 'keyword.endtable.sv' }]
}
]
]);

14
src/systemverilog/systemverilog.ts
View file

@ -449,6 +449,10 @@ export const language = <languages.IMonarchLanguage>{
token: 'keyword.$2',
next: '@module_instance'
},
table: {
token: 'keyword.$2',
next: '@table'
},
'@keywords': { token: 'keyword.$2' },
'@default': {
token: 'identifier',
@ -468,7 +472,7 @@ export const language = <languages.IMonarchLanguage>{
// identifiers and keywords
{ include: '@identifier_or_keyword' },
// whitespace
// whitespace and comments
{ include: '@whitespace' },
// (* attributes *).
@ -589,6 +593,14 @@ export const language = <languages.IMonarchLanguage>{
{ token: 'string.include.identifier', next: '@pop' }
]
]
],
table: [
{ include: '@whitespace' },
[/[()]/, '@brackets'],
[/[:;]/, 'delimiter'],
[/[01\-*?xXbBrRfFpPnN]/, 'variable.predefined'],
['endtable', 'keyword.endtable', '@pop']
]
}
};