Skip to content

Commit ef5ff54

Browse files
author
aiday-mar
committed
Merge branch 'main' into aiday/issue157165
2 parents 2f562a8 + 3cba0ec commit ef5ff54

File tree

112 files changed

+575
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+575
-237
lines changed

‎build/azure-pipelines/product-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ parameters:
2828
- name: ENABLE_TERRAPIN
2929
displayName: "Enable Terrapin"
3030
type: boolean
31-
default: true
31+
default: false
3232
- name: VSCODE_BUILD_WIN32
3333
displayName: "🎯 Windows x64"
3434
type: boolean

‎extensions/csharp/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "dotnet/csharp-tmLanguage",
88
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
9-
"commitHash": "16612717ccd557383c0c821d7b6ae6662492ffde"
9+
"commitHash": "5e7dd90d2af9817b0dfb614b21c79a3e81882d9f"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/csharp/syntaxes/csharp.tmLanguage.json

Lines changed: 244 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/16612717ccd557383c0c821d7b6ae6662492ffde",
7+
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/5e7dd90d2af9817b0dfb614b21c79a3e81882d9f",
88
"name": "C#",
99
"scopeName": "source.cs",
1010
"patterns": [
@@ -289,6 +289,9 @@
289289
{
290290
"include": "#throw-expression"
291291
},
292+
{
293+
"include": "#raw-interpolated-string"
294+
},
292295
{
293296
"include": "#interpolated-string"
294297
},
@@ -571,7 +574,7 @@
571574
},
572575
"storage-modifier": {
573576
"name": "storage.modifier.cs",
574-
"match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref)\\b"
577+
"match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required)\\b"
575578
},
576579
"class-declaration": {
577580
"begin": "(?=\\bclass\\b)",
@@ -2780,6 +2783,184 @@
27802783
}
27812784
]
27822785
},
2786+
"raw-interpolated-string": {
2787+
"patterns": [
2788+
{
2789+
"include": "#raw-interpolated-string-five-or-more-quote-one-or-more-interpolation"
2790+
},
2791+
{
2792+
"include": "#raw-interpolated-string-three-or-more-quote-three-or-more-interpolation"
2793+
},
2794+
{
2795+
"include": "#raw-interpolated-string-quadruple-quote-double-interpolation"
2796+
},
2797+
{
2798+
"include": "#raw-interpolated-string-quadruple-quote-single-interpolation"
2799+
},
2800+
{
2801+
"include": "#raw-interpolated-string-triple-quote-double-interpolation"
2802+
},
2803+
{
2804+
"include": "#raw-interpolated-string-triple-quote-single-interpolation"
2805+
}
2806+
]
2807+
},
2808+
"raw-interpolated-string-triple-quote-single-interpolation": {
2809+
"name": "string.quoted.double.cs",
2810+
"begin": "\\$\"\"\"",
2811+
"beginCaptures": {
2812+
"0": {
2813+
"name": "punctuation.definition.string.begin.cs"
2814+
}
2815+
},
2816+
"end": "\"\"\"",
2817+
"endCaptures": {
2818+
"0": {
2819+
"name": "punctuation.definition.string.end.cs"
2820+
}
2821+
},
2822+
"patterns": [
2823+
{
2824+
"include": "#raw-interpolation"
2825+
}
2826+
]
2827+
},
2828+
"raw-interpolated-string-triple-quote-double-interpolation": {
2829+
"name": "string.quoted.double.cs",
2830+
"begin": "\\$\\$\"\"\"",
2831+
"beginCaptures": {
2832+
"0": {
2833+
"name": "punctuation.definition.string.begin.cs"
2834+
}
2835+
},
2836+
"end": "\"\"\"",
2837+
"endCaptures": {
2838+
"0": {
2839+
"name": "punctuation.definition.string.end.cs"
2840+
}
2841+
},
2842+
"patterns": [
2843+
{
2844+
"include": "#double-raw-interpolation"
2845+
}
2846+
]
2847+
},
2848+
"raw-interpolated-string-quadruple-quote-single-interpolation": {
2849+
"name": "string.quoted.double.cs",
2850+
"begin": "\\$\"\"\"\"",
2851+
"beginCaptures": {
2852+
"0": {
2853+
"name": "punctuation.definition.string.begin.cs"
2854+
}
2855+
},
2856+
"end": "\"\"\"\"",
2857+
"endCaptures": {
2858+
"0": {
2859+
"name": "punctuation.definition.string.end.cs"
2860+
}
2861+
},
2862+
"patterns": [
2863+
{
2864+
"include": "#raw-interpolation"
2865+
}
2866+
]
2867+
},
2868+
"raw-interpolated-string-quadruple-quote-double-interpolation": {
2869+
"name": "string.quoted.double.cs",
2870+
"begin": "\\$\\$\"\"\"\"",
2871+
"beginCaptures": {
2872+
"0": {
2873+
"name": "punctuation.definition.string.begin.cs"
2874+
}
2875+
},
2876+
"end": "\"\"\"\"",
2877+
"endCaptures": {
2878+
"0": {
2879+
"name": "punctuation.definition.string.end.cs"
2880+
}
2881+
},
2882+
"patterns": [
2883+
{
2884+
"include": "#double-raw-interpolation"
2885+
}
2886+
]
2887+
},
2888+
"raw-interpolated-string-three-or-more-quote-three-or-more-interpolation": {
2889+
"name": "string.quoted.double.cs",
2890+
"begin": "\\$\\$\\$+\"\"\"+",
2891+
"beginCaptures": {
2892+
"0": {
2893+
"name": "punctuation.definition.string.begin.cs"
2894+
}
2895+
},
2896+
"end": "\"\"\"+",
2897+
"endCaptures": {
2898+
"0": {
2899+
"name": "punctuation.definition.string.end.cs"
2900+
}
2901+
}
2902+
},
2903+
"raw-interpolated-string-five-or-more-quote-one-or-more-interpolation": {
2904+
"name": "string.quoted.double.cs",
2905+
"begin": "\\$+\"\"\"\"\"+",
2906+
"beginCaptures": {
2907+
"0": {
2908+
"name": "punctuation.definition.string.begin.cs"
2909+
}
2910+
},
2911+
"end": "\"\"\"\"\"+",
2912+
"endCaptures": {
2913+
"0": {
2914+
"name": "punctuation.definition.string.end.cs"
2915+
}
2916+
}
2917+
},
2918+
"raw-interpolation": {
2919+
"name": "meta.interpolation.cs",
2920+
"begin": "(?<=[^\\{]|^)((?:\\{)*)(\\{)(?=[^\\{])",
2921+
"beginCaptures": {
2922+
"1": {
2923+
"name": "string.quoted.double.cs"
2924+
},
2925+
"2": {
2926+
"name": "punctuation.definition.interpolation.begin.cs"
2927+
}
2928+
},
2929+
"end": "\\}",
2930+
"endCaptures": {
2931+
"0": {
2932+
"name": "punctuation.definition.interpolation.end.cs"
2933+
}
2934+
},
2935+
"patterns": [
2936+
{
2937+
"include": "#expression"
2938+
}
2939+
]
2940+
},
2941+
"double-raw-interpolation": {
2942+
"name": "meta.interpolation.cs",
2943+
"begin": "(?<=[^\\{][^\\{]|^)((?:\\{)*)(\\{\\{)(?=[^\\{])",
2944+
"beginCaptures": {
2945+
"1": {
2946+
"name": "string.quoted.double.cs"
2947+
},
2948+
"2": {
2949+
"name": "punctuation.definition.interpolation.begin.cs"
2950+
}
2951+
},
2952+
"end": "\\}\\}",
2953+
"endCaptures": {
2954+
"0": {
2955+
"name": "punctuation.definition.interpolation.end.cs"
2956+
}
2957+
},
2958+
"patterns": [
2959+
{
2960+
"include": "#expression"
2961+
}
2962+
]
2963+
},
27832964
"literal": {
27842965
"patterns": [
27852966
{
@@ -2794,6 +2975,9 @@
27942975
{
27952976
"include": "#char-literal"
27962977
},
2978+
{
2979+
"include": "#raw-string-literal"
2980+
},
27972981
{
27982982
"include": "#string-literal"
27992983
},
@@ -3055,6 +3239,64 @@
30553239
"name": "constant.character.escape.cs",
30563240
"match": "\"\""
30573241
},
3242+
"raw-string-literal": {
3243+
"patterns": [
3244+
{
3245+
"include": "#raw-string-literal-more"
3246+
},
3247+
{
3248+
"include": "#raw-string-literal-quadruple"
3249+
},
3250+
{
3251+
"include": "#raw-string-literal-triple"
3252+
}
3253+
]
3254+
},
3255+
"raw-string-literal-triple": {
3256+
"name": "string.quoted.double.cs",
3257+
"begin": "\"\"\"",
3258+
"beginCaptures": {
3259+
"0": {
3260+
"name": "punctuation.definition.string.begin.cs"
3261+
}
3262+
},
3263+
"end": "\"\"\"",
3264+
"endCaptures": {
3265+
"0": {
3266+
"name": "punctuation.definition.string.end.cs"
3267+
}
3268+
}
3269+
},
3270+
"raw-string-literal-quadruple": {
3271+
"name": "string.quoted.double.cs",
3272+
"begin": "\"\"\"\"",
3273+
"beginCaptures": {
3274+
"0": {
3275+
"name": "punctuation.definition.string.begin.cs"
3276+
}
3277+
},
3278+
"end": "\"\"\"\"",
3279+
"endCaptures": {
3280+
"0": {
3281+
"name": "punctuation.definition.string.end.cs"
3282+
}
3283+
}
3284+
},
3285+
"raw-string-literal-more": {
3286+
"name": "string.quoted.double.cs",
3287+
"begin": "\"\"\"\"\"+",
3288+
"beginCaptures": {
3289+
"0": {
3290+
"name": "punctuation.definition.string.begin.cs"
3291+
}
3292+
},
3293+
"end": "\"\"\"\"\"+",
3294+
"endCaptures": {
3295+
"0": {
3296+
"name": "punctuation.definition.string.end.cs"
3297+
}
3298+
}
3299+
},
30583300
"tuple-literal": {
30593301
"begin": "(\\()(?=.*[:,])",
30603302
"beginCaptures": {

‎extensions/dart/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "dart-lang/dart-syntax-highlight",
88
"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
9-
"commitHash": "45065882c9f699149cb181a5960c05295b4bfbc6"
9+
"commitHash": "bd5cbdfe533c455a7ff7875923c4a94a5b497382"
1010
}
1111
},
1212
"licenseDetail": [

‎extensions/dart/syntaxes/dart.tmLanguage.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/45065882c9f699149cb181a5960c05295b4bfbc6",
7+
"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/bd5cbdfe533c455a7ff7875923c4a94a5b497382",
88
"name": "Dart",
99
"scopeName": "source.dart",
1010
"patterns": [
@@ -230,7 +230,15 @@
230230
"class-identifier": {
231231
"patterns": [
232232
{
233-
"match": "(?<![a-zA-Z0-9_$])([_$]*[A-Z][a-zA-Z0-9_$]*(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?|bool\\b|num\\b|int\\b|double\\b|dynamic\\b|(void)\\b)",
233+
"name": "storage.type.primitive.dart",
234+
"match": "\\bvoid\\b"
235+
},
236+
{
237+
"name": "support.class.dart",
238+
"match": "\\b(bool|num|int|double|dynamic)\\b"
239+
},
240+
{
241+
"match": "\\b([_$]*[A-Z][a-zA-Z0-9_$]*)(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?",
234242
"captures": {
235243
"1": {
236244
"name": "support.class.dart"
@@ -241,9 +249,6 @@
241249
"include": "#type-args"
242250
}
243251
]
244-
},
245-
"3": {
246-
"name": "storage.type.primitive.dart"
247252
}
248253
}
249254
}

‎extensions/fsharp/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "ionide/ionide-fsgrammar",
88
"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
9-
"commitHash": "f74f4485011a9b463f1c1367195a4309a13403d6"
9+
"commitHash": "713cd4a34e7729e444cf85ae287dd94c19e34337"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/fsharp/syntaxes/fsharp.tmLanguage.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/ionide/ionide-fsgrammar/commit/f74f4485011a9b463f1c1367195a4309a13403d6",
7+
"version": "https://github.com/ionide/ionide-fsgrammar/commit/713cd4a34e7729e444cf85ae287dd94c19e34337",
88
"name": "fsharp",
99
"scopeName": "source.fsharp",
1010
"patterns": [
@@ -928,7 +928,7 @@
928928
"patterns": [
929929
{
930930
"name": "binding.fsharp",
931-
"begin": "\\b(let mutable|static let mutable|static let|let inline|let|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
931+
"begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
932932
"end": "\\s*(with\\b|=|\\n+=|(?<=\\=))",
933933
"beginCaptures": {
934934
"1": {

0 commit comments

Comments
 (0)