diff --git a/gulpfile.js b/gulpfile.js index e671c5e9..5e7479b7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -76,7 +76,8 @@ gulp.task('release', ['clean-release','compile'], function() { bundleOne('src/vb'), bundleOne('src/xml'), bundleOne('src/yaml'), - bundleOne('src/solidity') + bundleOne('src/solidity'), + bundleOne('src/sb') ) .pipe(uglify({ output: { diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts index 9073acd1..55879f3a 100644 --- a/src/monaco.contribution.ts +++ b/src/monaco.contribution.ts @@ -266,3 +266,9 @@ registerLanguage({ aliases: ['sol', 'solidity', 'Solidity'], module: './solidity' }); +registerLanguage({ + id: 'sb', + extensions: ['.sb'], + aliases: ['Small Basic', 'sb'], + module: './sb' +}); diff --git a/src/sb.ts b/src/sb.ts new file mode 100644 index 00000000..3f9bd87e --- /dev/null +++ b/src/sb.ts @@ -0,0 +1,114 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration; +import ILanguage = monaco.languages.IMonarchLanguage; + +export const conf: IRichLanguageConfiguration = { + comments: { + lineComment: '\'', + }, + brackets: [ + ['(', ')'], ['[', ']'], + ['If', 'EndIf'], + ['While', 'EndWhile'], + ['For', 'EndFor'], + ['Sub', 'EndSub'] + ], + autoClosingPairs: [ + { open: '"', close: '"', notIn: ['string', 'comment'] }, + { open: '(', close: ')', notIn: ['string', 'comment'] }, + { open: '[', close: ']', notIn: ['string', 'comment'] }, + ] +}; + +export const language = { + defaultToken: '', + tokenPostfix: '.sb', + ignoreCase: true, + + brackets: [ + { token: 'delimiter.array', open: '[', close: ']' }, + { token: 'delimiter.parenthesis', open: '(', close: ')' }, + + // Special bracket statement pairs + { token: 'keyword.tag-if', open: 'If', close: 'EndIf' }, + { token: 'keyword.tag-while', open: 'While', close: 'EndWhile' }, + { token: 'keyword.tag-for', open: 'For', close: 'EndFor' }, + { token: 'keyword.tag-sub', open: 'Sub', close: 'EndSub' }, + ], + + keywords: [ + 'And', 'Else', 'ElseIf', 'EndFor', 'EndIf', 'EndSub', 'EndWhile', + 'For', 'Goto', 'If', 'Or', 'Step', 'Sub', 'Then', 'To', 'While' + ], + + tagwords: [ + 'If', 'Sub', 'While', 'For' + ], + + operators: [ + '>', '<', '<>', '<=', '>=', 'And', + 'Or', '+', '-', '*', '/', '=', + ], + + // we include these common regular expressions + symbols: /[=><.,:+\-\/]+/, + escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/, + + // The main tokenizer for our languages + tokenizer: { + root: [ + + // whitespace + { include: '@whitespace' }, + + // usual ending tags + [/end([a-zA-Z_]\w*)/, { token: 'keyword.tag-$1' }], + + // identifiers, tagwords, and keywords + [/[a-zA-Z_]\w*/, { + cases: { + '@tagwords': { token: 'keyword.tag-$0' }, + '@keywords': { token: 'keyword.$0' }, + '@default': 'identifier' + } + }], + + // Preprocessor directive + [/^\s*#\w+/, 'keyword'], + + // numbers + [/\d*\.\d+/, 'number.float'], + [/\d+/, 'number'], + + // date literal + [/#.*#/, 'number'], + + // delimiters and operators + [/[()\[\]]/, '@brackets'], + [/@symbols/, 'delimiter'], + + // strings + [/"([^"\\]|\\.)*$/, 'string.invalid'], // non-teminated string + [/"/, 'string', '@string'], + + ], + + whitespace: [ + [/[ \t\r\n]+/, ''], + [/(\'|REM(?!\w)).*$/, 'comment'], + ], + + string: [ + [/[^\\"]+/, 'string'], + [/@escapes/, 'string.escape'], + [/\\./, 'string.escape.invalid'], + [/"C?/, 'string', '@pop'] + ], + }, +}; diff --git a/test/all.js b/test/all.js index 0800a46c..91cd206b 100644 --- a/test/all.js +++ b/test/all.js @@ -58,6 +58,7 @@ requirejs([ 'out/test/xml.test', 'out/test/yaml.test', 'out/test/solidity.test', + 'out/test/sb.test' ], function() { run(); // We can launch the tests! }); diff --git a/test/sb.test.ts b/test/sb.test.ts new file mode 100644 index 00000000..c68ebb8f --- /dev/null +++ b/test/sb.test.ts @@ -0,0 +1,256 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { testTokenization } from './testRunner'; + +testTokenization('sb', [ + + // Comments - single line + [{ + line: '\'', + tokens: [ + { startIndex: 0, type: 'comment.sb' } + ] + }], + + [{ + line: ' \' a comment', + tokens: [ + { startIndex: 0, type: '' }, + { startIndex: 4, type: 'comment.sb' } + ] + }], + + [{ + line: '\' a comment', + tokens: [ + { startIndex: 0, type: 'comment.sb' } + ] + }], + + [{ + line: '\'sticky comment', + tokens: [ + { startIndex: 0, type: 'comment.sb' } + ] + }], + + [{ + line: '1 \' 2< \' comment', + tokens: [ + { startIndex: 0, type: 'number.sb' }, + { startIndex: 1, type: '' }, + { startIndex: 2, type: 'comment.sb' } + ] + }], + + [{ + line: 'x = 1 \' my comment \'\' is a nice one', + tokens: [ + { startIndex: 0, type: 'identifier.sb' }, + { startIndex: 1, type: '' }, + { startIndex: 2, type: 'delimiter.sb' }, + { startIndex: 3, type: '' }, + { startIndex: 4, type: 'number.sb' }, + { startIndex: 5, type: '' }, + { startIndex: 6, type: 'comment.sb' } + ] + }], + + // Numbers + [{ + line: '0', + tokens: [ + { startIndex: 0, type: 'number.sb' } + ] + }], + + [{ + line: '0.0', + tokens: [ + { startIndex: 0, type: 'number.float.sb' } + ] + }], + + [{ + line: '23.5', + tokens: [ + { startIndex: 0, type: 'number.float.sb' } + ] + }], + + [{ + line: '1 -0', + tokens: [ + { startIndex: 0, type: 'number.sb' }, + { startIndex: 1, type: '' }, + { startIndex: 2, type: 'delimiter.sb' }, + { startIndex: 3, type: 'number.sb' } + ] + }], + + [{ + line: '100+10', + tokens: [ + { startIndex: 0, type: 'number.sb' }, + { startIndex: 3, type: 'delimiter.sb' }, + { startIndex: 4, type: 'number.sb' } + ] + }], + + [{ + line: '0 + 0', + tokens: [ + { startIndex: 0, type: 'number.sb' }, + { startIndex: 1, type: '' }, + { startIndex: 2, type: 'delimiter.sb' }, + { startIndex: 3, type: '' }, + { startIndex: 4, type: 'number.sb' } + ] + }], + + // Keywords + [{ + line: 'Sub Foo', + tokens: [ + { startIndex: 0, type: 'keyword.tag-sub.sb' }, + { startIndex: 3, type: '' }, + { startIndex: 4, type: 'identifier.sb' } + ] + }], + + // Strings + [{ + line: 's = "string"', + tokens: [ + { startIndex: 0, type: 'identifier.sb' }, + { startIndex: 1, type: '' }, + { startIndex: 2, type: 'delimiter.sb' }, + { startIndex: 3, type: '' }, + { startIndex: 4, type: 'string.sb' } + ] + }], + + [{ + line: '"use strict";', + tokens: [ + { startIndex: 0, type: 'string.sb' }, + { startIndex: 12, type: '' } + ] + }], + + // Tags + [{ + line: 'sub ToString', + tokens: [ + { startIndex: 0, type: 'keyword.tag-sub.sb' }, + { startIndex: 3, type: '' }, + { startIndex: 4, type: 'identifier.sb' } + ] + }], + + [{ + line: 'While For If Sub EndWhile EndFor EndIf endsub', + tokens: [ + { startIndex: 0, type: 'keyword.tag-while.sb' }, + { startIndex: 5, type: '' }, + { startIndex: 6, type: 'keyword.tag-for.sb' }, + { startIndex: 9, type: '' }, + { startIndex: 10, type: 'keyword.tag-if.sb' }, + { startIndex: 12, type: '' }, + { startIndex: 13, type: 'keyword.tag-sub.sb' }, + { startIndex: 16, type: '' }, + { startIndex: 17, type: 'keyword.tag-while.sb' }, + { startIndex: 25, type: '' }, + { startIndex: 26, type: 'keyword.tag-for.sb' }, + { startIndex: 32, type: '' }, + { startIndex: 33, type: 'keyword.tag-if.sb' }, + { startIndex: 38, type: '' }, + { startIndex: 39, type: 'keyword.tag-sub.sb' } + ] + }], + + [{ + line: 'While while WHILE WHile whiLe', + tokens: [ + { startIndex: 0, type: 'keyword.tag-while.sb' }, + { startIndex: 5, type: '' }, + { startIndex: 6, type: 'keyword.tag-while.sb' }, + { startIndex: 11, type: '' }, + { startIndex: 12, type: 'keyword.tag-while.sb' }, + { startIndex: 17, type: '' }, + { startIndex: 18, type: 'keyword.tag-while.sb' }, + { startIndex: 23, type: '' }, + { startIndex: 24, type: 'keyword.tag-while.sb' } + ] + }], + + [{ + line: 'If b(i) = col Then', + tokens: [ + { startIndex: 0, type: 'keyword.tag-if.sb' }, + { startIndex: 2, type: '' }, + { startIndex: 3, type: 'identifier.sb' }, + { startIndex: 4, type: 'delimiter.parenthesis.sb' }, + { startIndex: 5, type: 'identifier.sb' }, + { startIndex: 6, type: 'delimiter.parenthesis.sb' }, + { startIndex: 7, type: '' }, + { startIndex: 8, type: 'delimiter.sb' }, + { startIndex: 9, type: '' }, + { startIndex: 10, type: 'identifier.sb' }, + { startIndex: 13, type: '' }, + { startIndex: 14, type: 'keyword.then.sb' } + ] + }], + + [{ + line: 'For i = 0 To 10 Step 2 DoStuff EndFor', + tokens: [ + { startIndex: 0, type: 'keyword.tag-for.sb' }, + { startIndex: 3, type: '' }, + { startIndex: 4, type: 'identifier.sb' }, + { startIndex: 5, type: '' }, + { startIndex: 6, type: 'delimiter.sb' }, + { startIndex: 7, type: '' }, + { startIndex: 8, type: 'number.sb' }, + { startIndex: 9, type: '' }, + { startIndex: 10, type: 'keyword.to.sb' }, + { startIndex: 12, type: '' }, + { startIndex: 13, type: 'number.sb' }, + { startIndex: 15, type: '' }, + { startIndex: 16, type: 'keyword.step.sb' }, + { startIndex: 20, type: '' }, + { startIndex: 21, type: 'number.sb' }, + { startIndex: 22, type: '' }, + { startIndex: 23, type: 'identifier.sb' }, + { startIndex: 30, type: '' }, + { startIndex: 31, type: 'keyword.tag-for.sb' } + ] + }], + + [{ + line: 'For stuff EndFor', + tokens: [ + { startIndex: 0, type: 'keyword.tag-for.sb' }, + { startIndex: 3, type: '' }, + { startIndex: 4, type: 'identifier.sb' }, + { startIndex: 9, type: '' }, + { startIndex: 10, type: 'keyword.tag-for.sb' }, + ] + }], + + [{ + line: 'for stuff endfor', + tokens: [ + { startIndex: 0, type: 'keyword.tag-for.sb' }, + { startIndex: 3, type: '' }, + { startIndex: 4, type: 'identifier.sb' }, + { startIndex: 9, type: '' }, + { startIndex: 10, type: 'keyword.tag-for.sb' }, + ] + }] +]);