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

Merge pull request #98 from ALANVF/language-scala

Browse source
This commit is contained in:
Alexandru Dima 2020-08-27 13:09:03 +02:00 • committed by GitHub
commit 2845e42207
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 404 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scala/scala.contribution.ts
View file

@ -8,8 +8,8 @@ import { registerLanguage } from '../_.contribution';
registerLanguage({ registerLanguage({
id: 'scala', id: 'scala',
extensions: ['.scala', '.sc'], extensions: ['.scala', '.sc', '.sbt'],
aliases: ['Scala', 'scala'], aliases: ['Scala', 'scala', 'SBT', 'Sbt', 'sbt', 'Dotty', 'dotty'],
mimetypes: ['text/x-scala-source', 'text/x-scala'], mimetypes: ['text/x-scala-source', 'text/x-scala', 'text/x-sbt', 'text/x-dotty'],
loader: () => import('./scala') loader: () => import('./scala')
}); });

285
src/scala/scala.test.ts
View file

@ -8,6 +8,20 @@
import { testTokenization } from '../test/testRunner'; import { testTokenization } from '../test/testRunner';
testTokenization('scala', [ testTokenization('scala', [
[{
line: 'var a = 1',
tokens: [
{startIndex: 0, type: 'keyword.scala'},
{startIndex: 3, type: 'white.scala'},
{startIndex: 4, type: 'variable.scala'},
{startIndex: 5, type: 'white.scala'},
{startIndex: 6, type: 'operator.scala'},
{startIndex: 7, type: 'white.scala'},
{startIndex: 8, type: 'number.scala'}
]
}],
// Comments - single line // Comments - single line
[{ [{
line: '//', line: '//',
@ -19,7 +33,7 @@ testTokenization('scala', [
[{ [{
line: ' // a comment', line: ' // a comment',
tokens: [ tokens: [
{ startIndex: 0, type: '' }, { startIndex: 0, type: 'white.scala' },
{ startIndex: 4, type: 'comment.scala' } { startIndex: 4, type: 'comment.scala' }
] ]
}], }],
@ -28,9 +42,7 @@ testTokenization('scala', [
[{ [{
line: '/* //*/ a', line: '/* //*/ a',
tokens: [ tokens: [
{ startIndex: 0, type: 'comment.scala' }, { startIndex: 0, type: 'comment.scala' }
{ startIndex: 7, type: '' },
{ startIndex: 8, type: 'identifier.scala' }
] ]
}], }],
@ -51,11 +63,11 @@ testTokenization('scala', [
[{ [{
line: '/almost a comment', line: '/almost a comment',
tokens: [ tokens: [
{ startIndex: 0, type: 'delimiter.scala' }, { startIndex: 0, type: 'operator.scala' },
{ startIndex: 1, type: 'identifier.scala' }, { startIndex: 1, type: 'identifier.scala' },
{ startIndex: 7, type: '' }, { startIndex: 7, type: 'white.scala' },
{ startIndex: 8, type: 'identifier.scala' }, { startIndex: 8, type: 'identifier.scala' },
{ startIndex: 9, type: '' }, { startIndex: 9, type: 'white.scala' },
{ startIndex: 10, type: 'identifier.scala' } { startIndex: 10, type: 'identifier.scala' }
] ]
}], }],
@ -64,12 +76,12 @@ testTokenization('scala', [
line: '1 / 2; /* comment', line: '1 / 2; /* comment',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.scala' }, { startIndex: 0, type: 'number.scala' },
{ startIndex: 1, type: '' }, { startIndex: 1, type: 'white.scala' },
{ startIndex: 2, type: 'delimiter.scala' }, { startIndex: 2, type: 'operator.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'number.scala' }, { startIndex: 4, type: 'number.scala' },
{ startIndex: 5, type: 'delimiter.scala' }, { startIndex: 5, type: 'delimiter.scala' },
{ startIndex: 6, type: '' }, { startIndex: 6, type: 'white.scala' },
{ startIndex: 7, type: 'comment.scala' } { startIndex: 7, type: 'comment.scala' }
] ]
}], }],
@ -77,18 +89,18 @@ testTokenization('scala', [
[{ [{
line: 'val x: Int = 1; // my comment // is a nice one', line: 'val x: Int = 1; // my comment // is a nice one',
tokens: [ tokens: [
{ startIndex: 0, type: 'keyword.val.scala' }, { startIndex: 0, type: 'keyword.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'identifier.scala' }, { startIndex: 4, type: 'variable.scala' },
{ startIndex: 5, type: 'delimiter.scala' }, { startIndex: 5, type: 'operator.scala' },
{ startIndex: 6, type: '' }, { startIndex: 6, type: 'white.scala' },
{ startIndex: 7, type: 'keyword.Int.scala' }, { startIndex: 7, type: 'type.scala' },
{ startIndex: 10, type: '' }, { startIndex: 10, type: 'white.scala' },
{ startIndex: 11, type: 'delimiter.scala' }, { startIndex: 11, type: 'operator.scala' },
{ startIndex: 12, type: '' }, { startIndex: 12, type: 'white.scala' },
{ startIndex: 13, type: 'number.scala' }, { startIndex: 13, type: 'number.scala' },
{ startIndex: 14, type: 'delimiter.scala' }, { startIndex: 14, type: 'delimiter.scala' },
{ startIndex: 15, type: '' }, { startIndex: 15, type: 'white.scala' },
{ startIndex: 16, type: 'comment.scala' } { startIndex: 16, type: 'comment.scala' }
] ]
}], }],
@ -104,17 +116,17 @@ testTokenization('scala', [
[{ [{
line: 'val x: Int = /* a simple comment */ 1;', line: 'val x: Int = /* a simple comment */ 1;',
tokens: [ tokens: [
{ startIndex: 0, type: 'keyword.val.scala' }, { startIndex: 0, type: 'keyword.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'identifier.scala' }, { startIndex: 4, type: 'variable.scala' },
{ startIndex: 5, type: 'delimiter.scala' }, { startIndex: 5, type: 'operator.scala' },
{ startIndex: 6, type: '' }, { startIndex: 6, type: 'white.scala' },
{ startIndex: 7, type: 'keyword.Int.scala' }, { startIndex: 7, type: 'type.scala' },
{ startIndex: 10, type: '' }, { startIndex: 10, type: 'white.scala' },
{ startIndex: 11, type: 'delimiter.scala' }, { startIndex: 11, type: 'operator.scala' },
{ startIndex: 12, type: '' }, { startIndex: 12, type: 'white.scala' },
{ startIndex: 13, type: 'comment.scala' }, { startIndex: 13, type: 'comment.scala' },
{ startIndex: 35, type: '' }, { startIndex: 35, type: 'white.scala' },
{ startIndex: 36, type: 'number.scala' }, { startIndex: 36, type: 'number.scala' },
{ startIndex: 37, type: 'delimiter.scala' } { startIndex: 37, type: 'delimiter.scala' }
] ]
@ -123,20 +135,21 @@ testTokenization('scala', [
[{ [{
line: 'val x: Int = /* a simple comment */ 1; */', line: 'val x: Int = /* a simple comment */ 1; */',
tokens: [ tokens: [
{ startIndex: 0, type: 'keyword.val.scala' }, { startIndex: 0, type: 'keyword.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'identifier.scala' }, { startIndex: 4, type: 'variable.scala' },
{ startIndex: 5, type: 'delimiter.scala' }, { startIndex: 5, type: 'operator.scala' },
{ startIndex: 6, type: '' }, { startIndex: 6, type: 'white.scala' },
{ startIndex: 7, type: 'keyword.Int.scala' }, { startIndex: 7, type: 'type.scala' },
{ startIndex: 10, type: '' }, { startIndex: 10, type: 'white.scala' },
{ startIndex: 11, type: 'delimiter.scala' }, { startIndex: 11, type: 'operator.scala' },
{ startIndex: 12, type: '' }, { startIndex: 12, type: 'white.scala' },
{ startIndex: 13, type: 'comment.scala' }, { startIndex: 13, type: 'comment.scala' },
{ startIndex: 35, type: '' }, { startIndex: 35, type: 'white.scala' },
{ startIndex: 36, type: 'number.scala' }, { startIndex: 36, type: 'number.scala' },
{ startIndex: 37, type: 'delimiter.scala' }, { startIndex: 37, type: 'delimiter.scala' },
{ startIndex: 38, type: '' } { startIndex: 38, type: 'white.scala' },
{ startIndex: 39, type: 'operator.scala' },
] ]
}], }],
@ -144,9 +157,9 @@ testTokenization('scala', [
line: 'x = /**/;', line: 'x = /**/;',
tokens: [ tokens: [
{ startIndex: 0, type: 'identifier.scala' }, { startIndex: 0, type: 'identifier.scala' },
{ startIndex: 1, type: '' }, { startIndex: 1, type: 'white.scala' },
{ startIndex: 2, type: 'delimiter.scala' }, { startIndex: 2, type: 'operator.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'comment.scala' }, { startIndex: 4, type: 'comment.scala' },
{ startIndex: 8, type: 'delimiter.scala' } { startIndex: 8, type: 'delimiter.scala' }
] ]
@ -156,9 +169,9 @@ testTokenization('scala', [
line: 'x = /*/;', line: 'x = /*/;',
tokens: [ tokens: [
{ startIndex: 0, type: 'identifier.scala' }, { startIndex: 0, type: 'identifier.scala' },
{ startIndex: 1, type: '' }, { startIndex: 1, type: 'white.scala' },
{ startIndex: 2, type: 'delimiter.scala' }, { startIndex: 2, type: 'operator.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'comment.scala' } { startIndex: 4, type: 'comment.scala' }
] ]
}], }],
@ -184,15 +197,15 @@ testTokenization('scala', [
[{ [{
line: 'val x: Int = /* start a comment', line: 'val x: Int = /* start a comment',
tokens: [ tokens: [
{ startIndex: 0, type: 'keyword.val.scala' }, { startIndex: 0, type: 'keyword.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'identifier.scala' }, { startIndex: 4, type: 'variable.scala' },
{ startIndex: 5, type: 'delimiter.scala' }, { startIndex: 5, type: 'operator.scala' },
{ startIndex: 6, type: '' }, { startIndex: 6, type: 'white.scala' },
{ startIndex: 7, type: 'keyword.Int.scala' }, { startIndex: 7, type: 'type.scala' },
{ startIndex: 10, type: '' }, { startIndex: 10, type: 'white.scala' },
{ startIndex: 11, type: 'delimiter.scala' }, { startIndex: 11, type: 'operator.scala' },
{ startIndex: 12, type: '' }, { startIndex: 12, type: 'white.scala' },
{ startIndex: 13, type: 'comment.scala' }, { startIndex: 13, type: 'comment.scala' },
] ]
}, { }, {
@ -204,7 +217,7 @@ testTokenization('scala', [
line: 'and end it */ 2;', line: 'and end it */ 2;',
tokens: [ tokens: [
{ startIndex: 0, type: 'comment.scala' }, { startIndex: 0, type: 'comment.scala' },
{ startIndex: 13, type: '' }, { startIndex: 13, type: 'white.scala' },
{ startIndex: 14, type: 'number.scala' }, { startIndex: 14, type: 'number.scala' },
{ startIndex: 15, type: 'delimiter.scala' } { startIndex: 15, type: 'delimiter.scala' }
] ]
@ -214,17 +227,17 @@ testTokenization('scala', [
[{ [{
line: '/** start of Scala Doc', line: '/** start of Scala Doc',
tokens: [ tokens: [
{ startIndex: 0, type: 'comment.doc.scala' } { startIndex: 0, type: 'comment.scala' }
] ]
}, { }, {
line: 'a comment between without a star', line: 'a comment between without a star',
tokens: [ tokens: [
{ startIndex: 0, type: 'comment.doc.scala' } { startIndex: 0, type: 'comment.scala' }
] ]
}, { }, {
line: 'end of multiline comment*/', line: 'end of multiline comment*/',
tokens: [ tokens: [
{ startIndex: 0, type: 'comment.doc.scala' } { startIndex: 0, type: 'comment.scala' }
] ]
}], }],
@ -232,37 +245,37 @@ testTokenization('scala', [
[{ [{
line: 'package test; object Program { def main(args: Array[String]): Unit = {} }', line: 'package test; object Program { def main(args: Array[String]): Unit = {} }',
tokens: [ tokens: [
{ startIndex: 0, type: 'keyword.package.scala' }, { startIndex: 0, type: 'keyword.scala' },
{ startIndex: 7, type: '' }, { startIndex: 7, type: 'white.scala' },
{ startIndex: 8, type: 'identifier.scala' }, { startIndex: 8, type: 'identifier.scala' },
{ startIndex: 12, type: 'delimiter.scala' }, { startIndex: 12, type: 'delimiter.scala' },
{ startIndex: 13, type: '' }, { startIndex: 13, type: 'white.scala' },
{ startIndex: 14, type: 'keyword.object.scala' }, { startIndex: 14, type: 'keyword.scala' },
{ startIndex: 20, type: '' }, { startIndex: 20, type: 'white.scala' },
{ startIndex: 21, type: 'identifier.scala' }, { startIndex: 21, type: 'type.scala' },
{ startIndex: 28, type: '' }, { startIndex: 28, type: 'white.scala' },
{ startIndex: 29, type: 'delimiter.curly.scala' }, { startIndex: 29, type: 'delimiter.curly.scala' },
{ startIndex: 30, type: '' }, { startIndex: 30, type: 'white.scala' },
{ startIndex: 31, type: 'keyword.def.scala' }, { startIndex: 31, type: 'keyword.scala' },
{ startIndex: 34, type: '' }, { startIndex: 34, type: 'white.scala' },
{ startIndex: 35, type: 'identifier.scala' }, { startIndex: 35, type: 'identifier.scala' },
{ startIndex: 39, type: 'delimiter.parenthesis.scala' }, { startIndex: 39, type: 'delimiter.parenthesis.scala' },
{ startIndex: 40, type: 'identifier.scala' }, { startIndex: 40, type: 'variable.scala' },
{ startIndex: 44, type: 'delimiter.scala' }, { startIndex: 44, type: 'operator.scala' },
{ startIndex: 45, type: '' }, { startIndex: 45, type: 'white.scala' },
{ startIndex: 46, type: 'identifier.scala' }, { startIndex: 46, type: 'type.scala' },
{ startIndex: 51, type: 'delimiter.square.scala' }, { startIndex: 51, type: 'operator.square.scala' },
{ startIndex: 52, type: 'identifier.scala' }, { startIndex: 52, type: 'type.scala' },
{ startIndex: 58, type: 'delimiter.square.scala' }, { startIndex: 58, type: 'operator.square.scala' },
{ startIndex: 59, type: 'delimiter.parenthesis.scala' }, { startIndex: 59, type: 'delimiter.parenthesis.scala' },
{ startIndex: 60, type: 'delimiter.scala' }, { startIndex: 60, type: 'operator.scala' },
{ startIndex: 61, type: '' }, { startIndex: 61, type: 'white.scala' },
{ startIndex: 62, type: 'keyword.Unit.scala' }, { startIndex: 62, type: 'type.scala' },
{ startIndex: 66, type: '' }, { startIndex: 66, type: 'white.scala' },
{ startIndex: 67, type: 'delimiter.scala' }, { startIndex: 67, type: 'operator.scala' },
{ startIndex: 68, type: '' }, { startIndex: 68, type: 'white.scala' },
{ startIndex: 69, type: 'delimiter.curly.scala' }, { startIndex: 69, type: 'delimiter.curly.scala' },
{ startIndex: 71, type: '' }, { startIndex: 71, type: 'white.scala' },
{ startIndex: 72, type: 'delimiter.curly.scala' } { startIndex: 72, type: 'delimiter.curly.scala' }
] ]
}], }],
@ -455,7 +468,7 @@ testTokenization('scala', [
line: '3_.1415F', line: '3_.1415F',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.scala' }, { startIndex: 0, type: 'number.scala' },
{ startIndex: 1, type: 'identifier.scala' }, { startIndex: 1, type: 'keyword.scala' },
{ startIndex: 2, type: 'delimiter.scala' }, { startIndex: 2, type: 'delimiter.scala' },
{ startIndex: 3, type: 'number.float.scala' } { startIndex: 3, type: 'number.float.scala' }
] ]
@ -465,7 +478,7 @@ testTokenization('scala', [
line: '3._1415F', line: '3._1415F',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.scala' }, { startIndex: 0, type: 'number.scala' },
{ startIndex: 1, type: 'delimiter.scala' }, { startIndex: 1, type: 'operator.scala' },
{ startIndex: 2, type: 'identifier.scala' } { startIndex: 2, type: 'identifier.scala' }
] ]
}], }],
@ -482,7 +495,7 @@ testTokenization('scala', [
line: '52_', line: '52_',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.scala' }, { startIndex: 0, type: 'number.scala' },
{ startIndex: 2, type: 'identifier.scala' } { startIndex: 2, type: 'keyword.scala' }
] ]
}], }],
@ -506,7 +519,7 @@ testTokenization('scala', [
line: '0x52_', line: '0x52_',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.hex.scala' }, { startIndex: 0, type: 'number.hex.scala' },
{ startIndex: 4, type: 'identifier.scala' } { startIndex: 4, type: 'keyword.scala' } // TODO
] ]
}], }],
@ -514,7 +527,7 @@ testTokenization('scala', [
line: '23.5L', line: '23.5L',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.float.scala' }, { startIndex: 0, type: 'number.float.scala' },
{ startIndex: 4, type: 'identifier.scala' } { startIndex: 4, type: 'type.scala' }
] ]
}], }],
@ -522,7 +535,7 @@ testTokenization('scala', [
line: '0+0', line: '0+0',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.scala' }, { startIndex: 0, type: 'number.scala' },
{ startIndex: 1, type: 'delimiter.scala' }, { startIndex: 1, type: 'operator.scala' },
{ startIndex: 2, type: 'number.scala' } { startIndex: 2, type: 'number.scala' }
] ]
}], }],
@ -531,7 +544,7 @@ testTokenization('scala', [
line: '100+10', line: '100+10',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.scala' }, { startIndex: 0, type: 'number.scala' },
{ startIndex: 3, type: 'delimiter.scala' }, { startIndex: 3, type: 'operator.scala' },
{ startIndex: 4, type: 'number.scala' } { startIndex: 4, type: 'number.scala' }
] ]
}], }],
@ -540,9 +553,9 @@ testTokenization('scala', [
line: '0 + 0', line: '0 + 0',
tokens: [ tokens: [
{ startIndex: 0, type: 'number.scala' }, { startIndex: 0, type: 'number.scala' },
{ startIndex: 1, type: '' }, { startIndex: 1, type: 'white.scala' },
{ startIndex: 2, type: 'delimiter.scala' }, { startIndex: 2, type: 'operator.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'number.scala' } { startIndex: 4, type: 'number.scala' }
] ]
}], }],
@ -551,16 +564,18 @@ testTokenization('scala', [
[{ [{
line: 'val s: String = "I\'m a Scala String";', line: 'val s: String = "I\'m a Scala String";',
tokens: [ tokens: [
{ startIndex: 0, type: 'keyword.val.scala' }, { startIndex: 0, type: 'keyword.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'identifier.scala' }, { startIndex: 4, type: 'variable.scala' },
{ startIndex: 5, type: 'delimiter.scala' }, { startIndex: 5, type: 'operator.scala' },
{ startIndex: 6, type: '' }, { startIndex: 6, type: 'white.scala' },
{ startIndex: 7, type: 'identifier.scala' }, { startIndex: 7, type: 'type.scala' },
{ startIndex: 13, type: '' }, { startIndex: 13, type: 'white.scala' },
{ startIndex: 14, type: 'delimiter.scala' }, { startIndex: 14, type: 'operator.scala' },
{ startIndex: 15, type: '' }, { startIndex: 15, type: 'white.scala' },
{ startIndex: 16, type: 'string.scala' }, { startIndex: 16, type: 'string.quote.scala' },
{ startIndex: 17, type: 'string.scala' },
{ startIndex: 35, type: 'string.quote.scala' },
{ startIndex: 36, type: 'delimiter.scala' } { startIndex: 36, type: 'delimiter.scala' }
] ]
}], }],
@ -568,21 +583,25 @@ testTokenization('scala', [
[{ [{
line: 'val s: String = "concatenated" + " String" ;', line: 'val s: String = "concatenated" + " String" ;',
tokens: [ tokens: [
{ startIndex: 0, type: 'keyword.val.scala' }, { startIndex: 0, type: 'keyword.scala' },
{ startIndex: 3, type: '' }, { startIndex: 3, type: 'white.scala' },
{ startIndex: 4, type: 'identifier.scala' }, { startIndex: 4, type: 'variable.scala' },
{ startIndex: 5, type: 'delimiter.scala' }, { startIndex: 5, type: 'operator.scala' },
{ startIndex: 6, type: '' }, { startIndex: 6, type: 'white.scala' },
{ startIndex: 7, type: 'identifier.scala' }, { startIndex: 7, type: 'type.scala' },
{ startIndex: 13, type: '' }, { startIndex: 13, type: 'white.scala' },
{ startIndex: 14, type: 'delimiter.scala' }, { startIndex: 14, type: 'operator.scala' },
{ startIndex: 15, type: '' }, { startIndex: 15, type: 'white.scala' },
{ startIndex: 16, type: 'string.scala' }, { startIndex: 16, type: 'string.quote.scala' },
{ startIndex: 30, type: '' }, { startIndex: 17, type: 'string.scala' },
{ startIndex: 31, type: 'delimiter.scala' }, { startIndex: 29, type: 'string.quote.scala' },
{ startIndex: 32, type: '' }, { startIndex: 30, type: 'white.scala' },
{ startIndex: 33, type: 'string.scala' }, { startIndex: 31, type: 'operator.scala' },
{ startIndex: 42, type: '' }, { startIndex: 32, type: 'white.scala' },
{ startIndex: 33, type: 'string.quote.scala' },
{ startIndex: 34, type: 'string.scala' },
{ startIndex: 41, type: 'string.quote.scala' },
{ startIndex: 42, type: 'white.scala' },
{ startIndex: 43, type: 'delimiter.scala' } { startIndex: 43, type: 'delimiter.scala' }
] ]
}], }],
@ -590,25 +609,30 @@ testTokenization('scala', [
[{ [{
line: '"quote in a string"', line: '"quote in a string"',
tokens: [ tokens: [
{ startIndex: 0, type: 'string.scala' } { startIndex: 0, type: 'string.quote.scala' },
{ startIndex: 1, type: 'string.scala' },
{ startIndex: 18, type: 'string.quote.scala' }
] ]
}], }],
[{ [{
line: '"escaping \\"quotes\\" is cool"', line: '"escaping \\"quotes\\" is cool"',
tokens: [ tokens: [
{ startIndex: 0, type: 'string.scala' }, { startIndex: 0, type: 'string.quote.scala' },
{ startIndex: 1, type: 'string.scala' },
{ startIndex: 10, type: 'string.escape.scala' }, { startIndex: 10, type: 'string.escape.scala' },
{ startIndex: 12, type: 'string.scala' }, { startIndex: 12, type: 'string.scala' },
{ startIndex: 18, type: 'string.escape.scala' }, { startIndex: 18, type: 'string.escape.scala' },
{ startIndex: 20, type: 'string.scala' } { startIndex: 20, type: 'string.scala' },
{ startIndex: 28, type: 'string.quote.scala' },
] ]
}], }],
[{ [{
line: '"\\"', line: '"\\"',
tokens: [ tokens: [
{ startIndex: 0, type: 'string.invalid.scala' } { startIndex: 0, type: 'string.quote.scala' },
{ startIndex: 1, type: 'string.escape.scala' }
] ]
}], }],
@ -616,7 +640,7 @@ testTokenization('scala', [
[{ [{
line: '@', line: '@',
tokens: [ tokens: [
{ startIndex: 0, type: '' } { startIndex: 0, type: 'operator.scala' }
] ]
}], }],
@ -632,18 +656,19 @@ testTokenization('scala', [
tokens: [ tokens: [
{ startIndex: 0, type: 'annotation.scala' }, { startIndex: 0, type: 'annotation.scala' },
{ startIndex: 7, type: 'delimiter.parenthesis.scala' }, { startIndex: 7, type: 'delimiter.parenthesis.scala' },
{ startIndex: 8, type: 'string.scala' }, { startIndex: 8, type: 'string.quote.scala' },
{ startIndex: 9, type: 'string.scala' },
{ startIndex: 19, type: 'string.quote.scala' },
{ startIndex: 20, type: 'delimiter.parenthesis.scala' } { startIndex: 20, type: 'delimiter.parenthesis.scala' }
] ]
}], }],
[{ [{
line: '@ AnnotationWithKeywordAfter private', line: '@AnnotationWithKeywordAfter private',
tokens: [ tokens: [
{ startIndex: 0, type: 'annotation.scala' }, { startIndex: 0, type: 'annotation.scala' },
{ startIndex: 28, type: '' }, { startIndex: 27, type: 'white.scala' },
{ startIndex: 29, type: 'keyword.private.scala' } { startIndex: 28, type: 'keyword.modifier.scala' }
] ]
}] }]
]); ]);

320
src/scala/scala.ts
View file

@ -9,8 +9,13 @@ import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
import ILanguage = monaco.languages.IMonarchLanguage; import ILanguage = monaco.languages.IMonarchLanguage;
export const conf: IRichLanguageConfiguration = { export const conf: IRichLanguageConfiguration = {
// the default separators except `@$` /*
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g, * `...` is allowed as an identifier.
* $ is allowed in identifiers.
* unary_<op> is allowed as an identifier.
* <name>_= is allowed as an identifier.
*/
wordPattern: /(unary_[@~!#%^&*()\-=+\\|:<>\/?]+)|([a-zA-Z_$][\w$]*?_=)|(`[^`]+`)|([a-zA-Z_$][\w$]*)/g,
comments: { comments: {
lineComment: '//', lineComment: '//',
blockComment: ['/*', '*/'], blockComment: ['/*', '*/'],
@ -33,121 +38,288 @@ export const conf: IRichLanguageConfiguration = {
{ open: '(', close: ')' }, { open: '(', close: ')' },
{ open: '"', close: '"' }, { open: '"', close: '"' },
{ open: '\'', close: '\'' }, { open: '\'', close: '\'' },
{ open: '<', close: '>' }, ],
] folding: {
markers: {
start: new RegExp("^\\s*//\\s*(?:(?:#?region\\b)|(?:<editor-fold\\b))"),
end: new RegExp("^\\s*//\\s*(?:(?:#?endregion\\b)|(?:</editor-fold>))")
}
}
}; };
export const language = <ILanguage>{ export const language = <ILanguage>{
defaultToken: '',
tokenPostfix: '.scala', tokenPostfix: '.scala',
// Reserved words are defined in lexical syntax at: // We can't easily add everything from Dotty, but we can at least add some of its keywords
// https://www.scala-lang.org/files/archive/spec/2.13/01-lexical-syntax.html
keywords: [ keywords: [
'abstract', 'case', 'catch', 'class', 'def', 'asInstanceOf',
'do', 'else', 'extends', 'false', 'final', 'catch', 'class', 'classOf',
'finally', 'for', 'forSome', 'if', 'implicit', 'def', 'do',
'import', 'lazy', 'macro', 'match', 'new', 'else', 'extends',
'null', 'object', 'override', 'package', 'private', 'finally', 'for', 'foreach', 'forSome',
'protected', 'return', 'sealed', 'super', 'this', 'if', 'import', 'isInstanceOf',
'throw', 'trait', 'try', 'true', 'type', 'macro', 'match',
'val', 'var', 'while', 'with', 'yield', 'new',
'Double', 'Float', 'Long', 'Int', 'Short', 'object',
'Byte', 'Char', 'Unit', 'Boolean' 'package',
'return',
'throw', 'trait', 'try', 'type',
'until',
'val', 'var',
'while', 'with',
'yield',
// Dotty-specific:
'given', 'enum', 'then'
], ],
// Extended the operators that are defined in lexical syntax at: // Dotty-specific:
// https://www.scala-lang.org/files/archive/spec/2.13/01-lexical-syntax.html softKeywords: [
operators: [ 'as', 'export', 'extension', 'end',
'=', '>', '<', '!', '~', '?', ':', 'derives', 'on'
'==', '<=', '>=', '!=', '&&', '||', '++', '--',
'+', '-', '*', '/', '&', '|', '^', '%', '<<',
'>>', '>>>', '+=', '-=', '*=', '/=', '&=', '|=',
'^=', '%=', '<<=', '>>=', '>>>=',
'_', '=>', '<-', '<:', '<%', '>:', '#', '@'
], ],
constants: [
'true', 'false', 'null',
'this', 'super'
],
modifiers: [
'abstract', 'final', 'implicit', 'lazy', 'override',
'private', 'protected', 'sealed'
],
// Dotty-specific:
softModifiers: [
'inline', 'opaque', 'open', 'transparent', 'using'
],
name: /(?:[a-z_$][\w$]*|`[^`]+`)/,
type: /(?:[A-Z][\w$]*)/,
// we include these common regular expressions // we include these common regular expressions
symbols: /[=><!~?:&|+\-*\/\^%]+/, symbols: /[=><!~?:&|+\-*\/^\\%@#]+/,
escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
digits: /\d+(_+\d+)*/, digits: /\d+(_+\d+)*/,
hexdigits: /[[0-9a-fA-F]+(_+[0-9a-fA-F]+)*/, hexdigits: /[[0-9a-fA-F]+(_+[0-9a-fA-F]+)*/,
// C# style strings
escapes: /\\(?:[btnfr\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
fstring_conv: /[bBhHsScCdoxXeEfgGaAt]|[Tn](?:[HIklMSLNpzZsQ]|[BbhAaCYyjmde]|[RTrDFC])/,
// The main tokenizer for our languages // The main tokenizer for our languages
tokenizer: { tokenizer: {
root: [ root: [
// identifiers and keywords // strings
[/[a-zA-Z_$][\w$]*/, { [/\braw"""/, {token: 'string.quote', bracket: '@open', next: '@rawstringt'}],
cases: { [/\braw"/, {token: 'string.quote', bracket: '@open', next: '@rawstring'}],
'@keywords': { token: 'keyword.$0' },
'@default': 'identifier'
}
}],
// whitespace [/\bs"""/, {token: 'string.quote', bracket: '@open', next: '@sstringt'}],
{ include: '@whitespace' }, [/\bs"/, {token: 'string.quote', bracket: '@open', next: '@sstring'}],
// delimiters and operators [/\bf""""/, {token: 'string.quote', bracket: '@open', next: '@fstringt'}],
[/[{}()\[\]]/, '@brackets'], [/\bf"/, {token: 'string.quote', bracket: '@open', next: '@fstring'}],
[/[<>](?!@symbols)/, '@brackets'],
[/@symbols/, {
cases: {
'@operators': 'delimiter',
'@default': ''
}
}],
// @ annotations. [/"""/, {token: 'string.quote', bracket: '@open', next: '@stringt'}],
[/@\s*[a-zA-Z_\$][\w\$]*/, 'annotation'], [/"/, {token: 'string.quote', bracket: '@open', next: '@string'}],
// numbers // numbers
[/(@digits)[eE]([\-+]?(@digits))?[fFdD]?/, 'number.float'], [/(@digits)[eE]([\-+]?(@digits))?[fFdD]?/, 'number.float', '@allowMethod'],
[/(@digits)\.(@digits)([eE][\-+]?(@digits))?[fFdD]?/, 'number.float'], [/(@digits)\.(@digits)([eE][\-+]?(@digits))?[fFdD]?/, 'number.float', '@allowMethod'],
[/0[xX](@hexdigits)[Ll]?/, 'number.hex'], [/0[xX](@hexdigits)[Ll]?/, 'number.hex', '@allowMethod'],
[/(@digits)[fFdD]/, 'number.float'], [/(@digits)[fFdD]/, 'number.float', '@allowMethod'],
[/(@digits)[lL]?/, 'number'], [/(@digits)[lL]?/, 'number', '@allowMethod'],
[/\b_\*/, 'key'],
[/\b(_)\b/, 'keyword', '@allowMethod'],
// identifiers and keywords
[/\bimport\b/, 'keyword', '@import'],
[/\b(case)([ \t]+)(class)\b/, ['keyword.modifier', 'white', 'keyword']],
[/\bcase\b/, 'keyword', '@case'],
[/\bva[lr]\b/, 'keyword', '@vardef'],
[/\b(def)([ \t]+)((?:unary_)?@symbols|@name(?:_=)|@name)/, ['keyword', 'white', 'identifier']],
[/@name(?=[ \t]*:(?!:))/, 'variable'],
[/(\.)(@name|@symbols)/, ['operator', {token: '@rematch', next: '@allowMethod'}]],
[/([{(])(\s*)(@name(?=\s*=>))/, ['@brackets', 'white', 'variable']],
[/@name/, {cases: {
'@keywords': 'keyword',
'@softKeywords': 'keyword',
'@modifiers': 'keyword.modifier',
'@softModifiers': 'keyword.modifier',
'@constants': {token: 'constant', next: '@allowMethod'},
'@default': {token: 'identifier', next: '@allowMethod'}
}}],
[/@type/, 'type', '@allowMethod'],
// whitespace
{include: '@whitespace'},
// @ annotations.
[/@[a-zA-Z_$][\w$]*(?:\.[a-zA-Z_$][\w$]*)*/, 'annotation'],
// delimiters and operators
[/[{(]/, '@brackets'],
[/[})]/, '@brackets', '@allowMethod'],
[/\[/, 'operator.square'],
[/](?!\s*(?:va[rl]|def|type)\b)/, 'operator.square', '@allowMethod'],
[/]/, 'operator.square'],
[/([=-]>|<-|>:|<:|:>|<%)(?=[\s\w()[\]{},\."'`])/, 'keyword'],
[/@symbols/, 'operator'],
// delimiter: after number because of .\d floats // delimiter: after number because of .\d floats
[/[;,.]/, 'delimiter'], [/[;,\.]/, 'delimiter'],
// strings // symbols
[/"([^"\\]|\\.)*$/, 'string.invalid'], // non-terminated string [/'[a-zA-Z$][\w$]*(?!')/, 'attribute.name'],
[/"/, 'string', '@string'],
// characters // characters
[/'[^\\']'/, 'string'], [/'[^\\']'/, 'string', '@allowMethod'],
[/(')(@escapes)(')/, ['string', 'string.escape', 'string']], [/(')(@escapes)(')/, ['string', 'string.escape', {token: 'string', next: '@allowMethod'}]],
[/'/, 'string.invalid'] [/'/, 'string.invalid']
], ],
whitespace: [ import: [
[/[ \t\r\n]+/, ''], [/;/, 'delimiter', '@pop'],
[/\/\*\*(?!\/)/, 'comment.doc', '@scaladoc'], [/^|$/, '', '@pop'],
[/[ \t]+/, 'white'],
[/[\n\r]+/, 'white', '@pop'],
[/\/\*/, 'comment', '@comment'], [/\/\*/, 'comment', '@comment'],
[/\/\/.*$/, 'comment'], [/@name|@type/, 'type'],
[/[(){}]/, '@brackets'],
[/[[\]]/, 'operator.square'],
[/[\.,]/, 'delimiter'],
],
allowMethod: [
[/^|$/, '', '@pop'],
[/[ \t]+/, 'white'],
[/[\n\r]+/, 'white', '@pop'],
[/\/\*/, 'comment', '@comment'],
[/(?==>[\s\w([{])/, 'keyword', '@pop'],
[/(@name|@symbols)(?=[ \t]*[[({"'`]|[ \t]+(?:[+-]?\.?\d|\w))/, {
cases: {
'@keywords': {token: 'keyword', next: '@pop'},
'->|<-|>:|<:|<%': {token: 'keyword', next: '@pop'},
'@default': {token: '@rematch', next: '@pop'}
}
}],
["", "", "@pop"]
], ],
comment: [ comment: [
[/[^\/*]+/, 'comment'], [/[^\/*]+/, 'comment'],
// [/\/\*/, 'comment', '@push' ], // nested comment not allowed :-( [/\/\*/, 'comment', '@push'], // nested comment
// [/\/\*/, 'comment.invalid' ], // this breaks block comments in the shape of /* //*/
[/\*\//, 'comment', '@pop'], [/\*\//, 'comment', '@pop'],
[/[\/*]/, 'comment'] [/[\/*]/, 'comment']
], ],
//Identical copy of comment above, except for the addition of .doc
scaladoc: [ case: [
[/[^\/*]+/, 'comment.doc'], [/\b_\*/, 'key'],
// [/\/\*/, 'comment.doc', '@push' ], // nested comment not allowed :-( [/\b(_|true|false|null|this|super)\b/, 'keyword', '@allowMethod'],
[/\/\*/, 'comment.doc.invalid'], [/\bif\b|=>/, 'keyword', '@pop'],
[/\*\//, 'comment.doc', '@pop'], [/`[^`]+`/, 'identifier', '@allowMethod'],
[/[\/*]/, 'comment.doc'] [/@name/, 'variable', '@allowMethod'],
[/:::?|\||@(?![a-z_$])/, 'keyword'],
{include: '@root'}
],
vardef: [
[/\b_\*/, 'key'],
[/\b(_|true|false|null|this|super)\b/, 'keyword'],
[/@name/, 'variable'],
[/:::?|\||@(?![a-z_$])/, 'keyword'],
[/=|:(?!:)/, 'operator', '@pop'],
[/$/, 'white', '@pop'],
{include: '@root'}
], ],
string: [ string: [
[/[^\\"]+/, 'string'], [/[^\\"\n\r]+/, 'string'],
[/@escapes/, 'string.escape'], [/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'], [/\\./, 'string.escape.invalid'],
[/"/, 'string', '@pop'] [/"/, {token: 'string.quote', bracket: '@close', switchTo: '@allowMethod'}],
],
stringt: [
[/[^\\"\n\r]+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/"(?=""")/, 'string'],
[/"""/, {token: 'string.quote', bracket: '@close', switchTo: '@allowMethod'}],
[/"/, 'string']
],
fstring: [
[/@escapes/, 'string.escape'],
[/"/, {token: 'string.quote', bracket: '@close', switchTo: '@allowMethod'}],
[/\$\$/, 'string'],
[/(\$)([a-z_]\w*)/, ['operator', 'identifier']],
[/\$\{/, 'operator', '@interp'],
[/%%/, 'string'],
[/(%)([\-#+ 0,(])(\d+|\.\d+|\d+\.\d+)(@fstring_conv)/, ['metatag', 'keyword.modifier', 'number', 'metatag']],
[/(%)(\d+|\.\d+|\d+\.\d+)(@fstring_conv)/, ['metatag', 'number', 'metatag']],
[/(%)([\-#+ 0,(])(@fstring_conv)/, ['metatag', 'keyword.modifier', 'metatag']],
[/(%)(@fstring_conv)/, ['metatag', 'metatag']],
[/./, 'string']
],
fstringt: [
[/@escapes/, 'string.escape'],
[/"(?=""")/, 'string'],
[/"""/, {token: 'string.quote', bracket: '@close', switchTo: '@allowMethod'}],
[/\$\$/, 'string'],
[/(\$)([a-z_]\w*)/, ['operator', 'identifier']],
[/\$\{/, 'operator', '@interp'],
[/%%/, 'string'],
[/(%)([\-#+ 0,(])(\d+|\.\d+|\d+\.\d+)(@fstring_conv)/, ['metatag', 'keyword.modifier', 'number', 'metatag']],
[/(%)(\d+|\.\d+|\d+\.\d+)(@fstring_conv)/, ['metatag', 'number', 'metatag']],
[/(%)([\-#+ 0,(])(@fstring_conv)/, ['metatag', 'keyword.modifier', 'metatag']],
[/(%)(@fstring_conv)/, ['metatag', 'metatag']],
[/./, 'string']
],
sstring: [
[/@escapes/, 'string.escape'],
[/"/, {token: 'string.quote', bracket: '@close', switchTo: '@allowMethod'}],
[/\$\$/, 'string'],
[/(\$)([a-z_]\w*)/, ['operator', 'identifier']],
[/\$\{/, 'operator', '@interp'],
[/./, 'string']
],
sstringt: [
[/@escapes/, 'string.escape'],
[/"(?=""")/, 'string'],
[/"""/, {token: 'string.quote', bracket: '@close', switchTo: '@allowMethod'}],
[/\$\$/, 'string'],
[/(\$)([a-z_]\w*)/, ['operator', 'identifier']],
[/\$\{/, 'operator', '@interp'],
[/./, 'string']
],
interp: [
[/{/, 'operator', '@push'],
[/}/, 'operator', '@pop'],
{include: '@root'}
],
rawstring: [
[/[^"]/, 'string'],
[/"/, {token: 'string.quote', bracket: '@close', switchTo: '@allowMethod'}]
],
rawstringt: [
[/[^"]/, 'string'],
[/"(?=""")/, 'string'],
[/"""/, {token: 'string.quote', bracket: '@close', switchTo: '@allowMethod'}],
[/"/, 'string']
],
whitespace: [
[/[ \t\r\n]+/, 'white'],
[/\/\*/, 'comment', '@comment'],
[/\/\/.*$/, 'comment'],
], ],
}, },
}; };