development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 11:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

alignof and alignas keywords

Browse source 
alignof and alignas are official C++ keywords, further I moved one function definition from the C file to the C++ because it has caused wrong highlighting for C (friend and override are not C keywords). .H files are now also C++ file types.
This commit is contained in:
Xaver Hellauer 2016-02-02 20:03:25 +01:00
parent 0bf4c2ca6e
commit 9992e9fba8
1 changed files with 66 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
extensions/cpp/syntaxes/c++.plist
View file

@ -16,6 +16,7 @@
<string>hh</string>
<string>hpp</string>
<string>h++</string>
<string>H</string>
</array>
<key>firstLineMatch</key>
<string>-\*- C\+\+ -\*-</string>
@ -29,10 +30,6 @@
<key>include</key>
<string>#special_block</string>
</dict>
<dict>
<key>include</key>
<string>source.c</string>
</dict>
<dict>
<key>match</key>
<string>\b(friend|explicit|virtual)\b</string>
@ -85,7 +82,7 @@
</dict>
<dict>
<key>match</key>
<string>\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq)\b</string>
<string>\b(alignof|alignas|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq)\b</string>
<key>name</key>
<string>keyword.operator.c++</string>
</dict>
@ -97,7 +94,7 @@
</dict>
<dict>
<key>match</key>
<string>\b(constexpr|export|mutable|typename|thread_local|noexcept)\b</string>
<string>\b(constexpr|export|mutable|typename|thread_local)\b</string>
<key>name</key>
<string>storage.modifier.c++</string>
</dict>
@ -185,6 +182,69 @@
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>(?x)
(?: ^ # begin-of-line
|
(?: (?= \s ) (?&lt;!else|new|return) (?&lt;=\w) # or word + space before name
| (?= \s*[A-Za-z_] ) (?&lt;!&amp;&amp;) (?&lt;=[*&amp;&gt;]) # or type modifier before name
)
)
(\s*) (?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\s*\()
(
(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ | # actual name
(?: (?&lt;=operator) (?: [-*&amp;&lt;&gt;=+!]+ | \(\) | \[\] ) ) # if it is a C++ operator
)
\s*(?=\()</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.whitespace.function.leading.c</string>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>entity.name.function.c</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>punctuation.definition.parameters.c</string>
</dict>
</dict>
<key>end</key>
<string>(?&lt;=\})|(?=#)|(;)</string>
<key>name</key>
<string>meta.function.c++</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#comments</string>
</dict>
<dict>
<key>include</key>
<string>#parens</string>
</dict>
<dict>
<key>match</key>
<string>\b(const|final|override|noexcept)\b</string>
<key>name</key>
<string>storage.modifier.$1.c++</string>
</dict>
<dict>
<key>include</key>
<string>#block</string>
</dict>
</array>
</dict>
<dict>
<key>include</key>
<string>source.c</string>
</dict>
</array>
<key>repository</key>
<dict>