development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Request to update atom/language-c version to the latest. Fixes #24909

Browse source
This commit is contained in:
Martin Aeschlimann 2017-04-18 09:39:30 +02:00
parent 9d1fc803f7
commit a2966fb215
3 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/cpp/syntaxes/c++.json
View file

@ -54,7 +54,7 @@
},
{
"match": "\\bnullptr\\b",
"name": "variable.language.cpp"
"name": "constant.language.cpp"
},
{
"match": "\\btemplate\\b\\s*",
@ -64,6 +64,10 @@
"match": "\\b(const_cast|dynamic_cast|reinterpret_cast|static_cast)\\b\\s*",
"name": "keyword.operator.cast.cpp"
},
{
"match": "::",
"name": "punctuation.separator.namespace.access.cpp"
},
{
"match": "\\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\b",
"name": "keyword.operator.cpp"
@ -451,5 +455,5 @@
]
}
},
"version": "https://github.com/atom/language-c/commit/314f4ee53ede0adc91f56ef91b13d43e66771cd7"
"version": "https://github.com/atom/language-c/commit/a74c2f967d73e802a67fa6e971a8e8dedf076597"
}

7
extensions/cpp/syntaxes/c.json
View file

@ -513,7 +513,7 @@
"numbers": {
"patterns": [
{
"match": "\\b((0(x|X)[0-9a-fA-F']*)|(0(b|B)[01']*)|(([0-9']+\\.?[0-9']*)|(\\.[0-9']+))((e|E)(\\+|-)?[0-9']+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
"match": "\\b((0(x|X)[0-9a-fA-F]([0-9a-fA-F']*[0-9a-fA-F])?)|(0(b|B)[01]([01']*[01])?)|(([0-9]([0-9']*[0-9])?\\.?[0-9]*([0-9']*[0-9])?)|(\\.[0-9]([0-9']*[0-9])?))((e|E)(\\+|-)?[0-9]([0-9']*[0-9])?)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\\b",
"name": "constant.numeric.c"
}
]
@ -628,6 +628,7 @@
}
},
"end": ":",
"applyEndPatternLast": true,
"endCaptures": {
"0": {
"name": "keyword.operator.ternary.c"
@ -644,7 +645,7 @@
"include": "#c_function_call"
},
{
"include": "$self"
"include": "$base"
}
]
}
@ -1950,5 +1951,5 @@
]
}
},
"version": "https://github.com/atom/language-c/commit/676056d40356884d161ea3170257121874092ace"
"version": "https://github.com/atom/language-c/commit/1d137279178d06e7f7500800ebc36155e130172e"
}

24
extensions/cpp/test/colorize-results/test_cc.json
View file

@ -1122,7 +1122,29 @@
}
},
{
"c": " std::unique_ptr",
"c": " std",
"t": "source.cpp meta.block.c",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "::",
"t": "source.cpp meta.block.c punctuation.separator.namespace.access.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "unique_ptr",
"t": "source.cpp meta.block.c",
"r": {
"dark_plus": "default: #D4D4D4",