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

Fixes microsoft/monaco-editor#1607: Add support for nested comments

Browse source
This commit is contained in:
Alexandru Dima 2019-12-16 15:09:18 +01:00
parent c6b50fc678
commit c50642f89b
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/kotlin/kotlin.test.ts
View file

@ -62,16 +62,6 @@ testTokenization('kotlin', [
]
}],
// Broken nested tokens due to invalid comment tokenization
[{
line: '/* //*/ a',
tokens: [
{ startIndex: 0, type: 'comment.kt' },
{ startIndex: 7, type: '' },
{ startIndex: 8, type: 'identifier.kt' }
]
}],
[{
line: '// a comment',
tokens: [
@ -666,6 +656,20 @@ testTokenization('kotlin', [
{ startIndex: 28, type: '' },
{ startIndex: 29, type: 'keyword.private.kt' }
]
}],
[{
line: 'fun /* /* */ */ main() {',
tokens: [
{ startIndex: 0, type: 'keyword.fun.kt' },
{ startIndex: 3, type: '' },
{ startIndex: 4, type: 'comment.kt' },
{ startIndex: 15, type: '' },
{ startIndex: 16, type: 'identifier.kt' },
{ startIndex: 20, type: 'delimiter.parenthesis.kt' },
{ startIndex: 22, type: '' },
{ startIndex: 23, type: 'delimiter.curly.kt' },
]
}]
]);

3
src/kotlin/kotlin.ts
View file

@ -136,13 +136,14 @@ export const language = <ILanguage>{
comment: [
[/[^\/*]+/, 'comment'],
[/\/\*/, 'comment', '@comment'],
[/\*\//, 'comment', '@pop'],
[/[\/*]/, 'comment']
],
//Identical copy of comment above, except for the addition of .doc
javadoc: [
[/[^\/*]+/, 'comment.doc'],
// [/\/\*/, 'comment.doc', '@push' ], // nested comment not allowed :-(
[/\/\*/, 'comment.doc', '@push' ],
[/\/\*/, 'comment.doc.invalid'],
[/\*\//, 'comment.doc', '@pop'],
[/[\/*]/, 'comment.doc']