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 #28 from evakili/master

Browse source 
Whitespaces after # are allowed in C++ preprocessor statements (Microsoft/monaco-editor#687)
This commit is contained in:
Alexandru Dima 2018-03-02 13:59:52 +01:00 • committed by GitHub
commit 1f4f98abc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cpp.ts
View file

@ -259,7 +259,7 @@ export const language = <ILanguage>{
[/\[\[.*\]\]/, 'annotation'], [/\[\[.*\]\]/, 'annotation'],
// Preprocessor directive // Preprocessor directive
[/^\s*#\w+/, 'keyword'], [/^\s*#\s*\w+/, 'keyword'],
// delimiters and operators // delimiters and operators
[/[{}()\[\]]/, '@brackets'], [/[{}()\[\]]/, '@brackets'],

29
test/cpp.test.ts
View file

@ -747,5 +747,34 @@ testTokenization('cpp', [
tokens: [ tokens: [
{ startIndex: 0, type: 'keyword.cpp' } { startIndex: 0, type: 'keyword.cpp' }
] ]
}, {
line: '# ifdef VAR',
tokens: [
{ startIndex: 0, type: 'keyword.cpp' },
{ startIndex: 10, type: '' },
{ startIndex: 11, type: 'identifier.cpp' }
]
}, {
line: '# define SUM(A,B) (A) + (B)',
tokens: [
{ startIndex: 0, type: 'keyword.cpp' },
{ startIndex: 8, type: '' },
{ startIndex: 9, type: 'identifier.cpp' },
{ startIndex: 12, type: 'delimiter.parenthesis.cpp' },
{ startIndex: 13, type: 'identifier.cpp' },
{ startIndex: 14, type: 'delimiter.cpp' },
{ startIndex: 15, type: 'identifier.cpp' },
{ startIndex: 16, type: 'delimiter.parenthesis.cpp' },
{ startIndex: 17, type: '' },
{ startIndex: 18, type: 'delimiter.parenthesis.cpp' },
{ startIndex: 19, type: 'identifier.cpp' },
{ startIndex: 20, type: 'delimiter.parenthesis.cpp' },
{ startIndex: 21, type: '' },
{ startIndex: 22, type: 'delimiter.cpp' },
{ startIndex: 23, type: '' },
{ startIndex: 24, type: 'delimiter.parenthesis.cpp' },
{ startIndex: 25, type: 'identifier.cpp' },
{ startIndex: 26, type: 'delimiter.parenthesis.cpp' }
]
}] }]
]); ]);