Skip to content
This repository has been archived by the owner on Nov 5, 2021. It is now read-only.

Whitespaces after # are allowed in C++ preprocessor statements (Microsoft/monaco-editor#687) #28

Merged
merged 1 commit into from
Mar 2, 2018
Merged

Whitespaces after # are allowed in C++ preprocessor statements (Microsoft/monaco-editor#687) #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cpp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ export const language = <ILanguage>{
[/\[\[.*\]\]/, 'annotation'],

// Preprocessor directive
[/^\s*#\w+/, 'keyword'],
[/^\s*#\s*\w+/, 'keyword'],

// delimiters and operators
[/[{}()\[\]]/, '@brackets'],
Expand Down
29 changes: 29 additions & 0 deletions test/cpp.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,5 +747,34 @@ testTokenization('cpp', [
tokens: [
{ 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' }
]
}]
]);