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

Cleanup, adding a test-case.

Browse source
This commit is contained in:
Artyom Shalkhakov 2016-07-07 20:23:06 +06:00
parent cbe01cea43
commit c1a1f8663d
2 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/postiats.ts
View file

@ -1,8 +1,9 @@
// see: https://microsoft.github.io/monaco-editor/monarch.html /*---------------------------------------------------------------------------------------------
* Copyright (c) Artyom Shalkhakov. All rights reserved.
// ATS/Postiats lexical syntax definition * Licensed under the MIT License. See License.txt in the project root for license information.
// Written by Artyom Shalkhakov over the week of 20th - 27th of June, 2016. *
// License: BSD v3 (but probably GPL, since ATS/Postiats lexer is GPL? not a lawyer!) * Based on the ATS/Postiats lexer by Hongwei Xi.
*--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
@ -33,7 +34,7 @@ export var language = <ILanguage> {
// Set defaultToken to invalid to see what you do not tokenize yet // Set defaultToken to invalid to see what you do not tokenize yet
defaultToken: 'invalid', defaultToken: 'invalid',
// reference: https://github.com/githwxi/ATS-Postiats/blob/master/src/pats_lexing_token.dats // keyword reference: https://github.com/githwxi/ATS-Postiats/blob/master/src/pats_lexing_token.dats
keywords: [ keywords: [
// //
@ -462,6 +463,7 @@ export var language = <ILanguage> {
start: 'root', start: 'root',
// The main tokenizer for ATS/Postiats // The main tokenizer for ATS/Postiats
// reference: https://github.com/githwxi/ATS-Postiats/blob/master/src/pats_lexing.dats
tokenizer: { tokenizer: {
root: [ root: [
// lexing_blankseq0 // lexing_blankseq0
@ -604,7 +606,6 @@ export var language = <ILanguage> {
], ],
lexing_COMMENT_block_ml: [ lexing_COMMENT_block_ml: [
//{regex: /\(\*(?!\))|\*\)/, action: { cases: { '\\(\\*': {token: 'comment', next: '@push'}, '@default': {token: 'comment', next: '@pop'} } }},
[/[^\(\*]+/, 'comment'], [/[^\(\*]+/, 'comment'],
[/\(\*/, 'comment', '@push' ], [/\(\*/, 'comment', '@push' ],
[/\(\*/, 'comment.invalid' ], [/\(\*/, 'comment.invalid' ],
@ -613,8 +614,8 @@ export var language = <ILanguage> {
], ],
lexing_COMMENT_block_c: [ lexing_COMMENT_block_c: [
[/[^\/*]+/, 'comment' ], [/[^\/*]+/, 'comment' ],
// [/\/\*/, 'comment', '@push' ], // nested comment not allowed :-( // [/\/\*/, 'comment', '@push' ], // nested C-style block comments not allowed
// [/\/\*/, 'comment.invalid' ], // this breaks block comments in the shape of /* //*/ // [/\/\*/, 'comment.invalid' ], // NOTE: this breaks block comments in the shape of /* //*/
[/\*\//, 'comment', '@pop' ], [/\*\//, 'comment', '@pop' ],
[/[\/*]/, 'comment' ] [/[\/*]/, 'comment' ]
], ],

20
test/postiats.test.ts
View file

@ -89,7 +89,7 @@ testTokenization('postiats', [
{ startIndex: 0, type: 'keyword.pats' }, { startIndex: 0, type: 'keyword.pats' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: '' },
{ startIndex: 4, type: 'identifier.pats' }, { startIndex: 4, type: 'identifier.pats' },
{ startIndex: 5, type: 'keyword.pats'} { startIndex: 5, type: 'keyword.pats'},
{ startIndex: 6, type: 'type.pats' }, { startIndex: 6, type: 'type.pats' },
{ startIndex: 9, type: '' }, { startIndex: 9, type: '' },
{ startIndex: 10, type: 'keyword.pats' }, { startIndex: 10, type: 'keyword.pats' },
@ -415,6 +415,18 @@ testTokenization('postiats', [
{ startIndex: 4, type: 'number.decimal.pats' } { startIndex: 4, type: 'number.decimal.pats' }
]}], ]}],
// hi-lighting of variables in staload/dynload
[{
line: '"{$LIBATSCC2JS}/staloadall.hats"',
tokens: [
{ startIndex: 0, type: 'string.quote.pats' },
{ startIndex: 1, type: 'string.escape.pats' },
{ startIndex: 3, type: 'identifier.pats' },
{ startIndex: 14, type: 'string.escape.pats' },
{ startIndex: 15, type: 'string.pats' },
{ startIndex: 31, type: 'string.quote.pats' }
]}],
// Monarch Generated // Monarch Generated
[{ [{
line: '#include "/path/to/my/file.h"', line: '#include "/path/to/my/file.h"',
@ -536,7 +548,7 @@ testTokenization('postiats', [
{ startIndex: 13, type: 'delimiter.comma.pats' }, { startIndex: 13, type: 'delimiter.comma.pats' },
{ startIndex: 14, type: '' }, { startIndex: 14, type: '' },
{ startIndex: 15, type: 'number.decimal.pats' }, { startIndex: 15, type: 'number.decimal.pats' },
{ startIndex: 16, type: 'delimiter.parenthesis.pats' } { startIndex: 16, type: 'delimiter.parenthesis.pats' },
{ startIndex: 17, type: '' }, { startIndex: 17, type: '' },
{ startIndex: 18, type: 'keyword.pats' }, { startIndex: 18, type: 'keyword.pats' },
{ startIndex: 20, type: '' }, { startIndex: 20, type: '' },
@ -611,9 +623,9 @@ testTokenization('postiats', [
{ startIndex: 31, type: 'identifier.pats' }, { startIndex: 31, type: 'identifier.pats' },
{ startIndex: 32, type: 'delimiter.parenthesis.pats' }, { startIndex: 32, type: 'delimiter.parenthesis.pats' },
{ startIndex: 33, type: '' }, { startIndex: 33, type: '' },
{ startIndex: 34, type: 'keyword.pats' } { startIndex: 34, type: 'keyword.pats' },
{ startIndex: 35, type: '' }, { startIndex: 35, type: '' },
{ startIndex: 36, type: 'delimiter.square.pats' } { startIndex: 36, type: 'delimiter.square.pats' },
{ startIndex: 37, type: 'identifier.pats' }, { startIndex: 37, type: 'identifier.pats' },
{ startIndex: 38, type: 'keyword.pats' }, { startIndex: 38, type: 'keyword.pats' },
{ startIndex: 39, type: 'type.pats' }, { startIndex: 39, type: 'type.pats' },