Skip to content

Commit 2e2953c

Browse files
aiday-maraiday-mar
committed
Merge branch 'main' into aiday/internalIssue4180
2 parents e072d26 + 3e232a8 commit 2e2953c

File tree

46 files changed

+517
-228
lines changed

Some content is hidden

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

46 files changed

+517
-228
lines changed

‎build/monaco/monaco.d.ts.recipe

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,25 @@ declare namespace monaco {
3434
*/
3535
getWorkerUrl?(workerId: string, label: string): string;
3636
/**
37-
* Create a trust types policy (same API as window.trustedTypes.createPolicy)
37+
* Create a trusted types policy (same API as window.trustedTypes.createPolicy)
3838
*/
39-
createTrustedTypesPolicy<Options extends TrustedTypePolicyOptions>(
39+
createTrustedTypesPolicy(
4040
policyName: string,
41-
policyOptions?: Options,
42-
): undefined | Pick<TrustedTypePolicy<Options>, 'name' | Extract<keyof Options, keyof TrustedTypePolicyOptions>>;
41+
policyOptions?: ITrustedTypePolicyOptions,
42+
): undefined | ITrustedTypePolicy;
43+
}
44+
45+
export interface ITrustedTypePolicyOptions {
46+
createHTML?: (input: string, ...arguments: any[]) => string;
47+
createScript?: (input: string, ...arguments: any[]) => string;
48+
createScriptURL?: (input: string, ...arguments: any[]) => string;
49+
}
50+
51+
export interface ITrustedTypePolicy {
52+
readonly name: string;
53+
createHTML?(input: string): any;
54+
createScript?(input: string): any;
55+
createScriptURL?(input: string): any;
4356
}
4457

4558
export interface IDisposable {

‎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": "5e7dd90d2af9817b0dfb614b21c79a3e81882d9f"
9+
"commitHash": "2918bd69cfcc658bd5b4ec1b106bb008e5c21120"
1010
}
1111
},
1212
"license": "MIT",

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

Lines changed: 39 additions & 24 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/5e7dd90d2af9817b0dfb614b21c79a3e81882d9f",
7+
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/2918bd69cfcc658bd5b4ec1b106bb008e5c21120",
88
"name": "C#",
99
"scopeName": "source.cs",
1010
"patterns": [
@@ -57,10 +57,10 @@
5757
"script-top-level": {
5858
"patterns": [
5959
{
60-
"include": "#method-declaration"
60+
"include": "#statement"
6161
},
6262
{
63-
"include": "#statement"
63+
"include": "#method-declaration"
6464
},
6565
{
6666
"include": "#punctuation-semicolon"
@@ -91,10 +91,10 @@
9191
"include": "#interface-declaration"
9292
},
9393
{
94-
"include": "#record-declaration"
94+
"include": "#struct-declaration"
9595
},
9696
{
97-
"include": "#struct-declaration"
97+
"include": "#record-declaration"
9898
},
9999
{
100100
"include": "#attribute-section"
@@ -421,7 +421,7 @@
421421
]
422422
},
423423
{
424-
"begin": "\\b(using)\\s*",
424+
"begin": "\\b(using)\\s*(?!\\(|\\s|var)",
425425
"beginCaptures": {
426426
"1": {
427427
"name": "keyword.other.using.cs"
@@ -577,27 +577,33 @@
577577
"match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required)\\b"
578578
},
579579
"class-declaration": {
580-
"begin": "(?=\\bclass\\b)",
581-
"end": "(?<=\\})",
580+
"begin": "(?=(\\brecord\\b\\s+)?\\bclass\\b)",
581+
"end": "(?<=\\})|(?=;)",
582582
"patterns": [
583583
{
584-
"begin": "(?x)\n\\b(class)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
584+
"begin": "(?x)\n(\\b(record)\\b\\s+)?\n\\b(class)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
585585
"beginCaptures": {
586-
"1": {
586+
"2": {
587+
"name": "keyword.other.record.cs"
588+
},
589+
"3": {
587590
"name": "keyword.other.class.cs"
588591
},
589-
"2": {
592+
"4": {
590593
"name": "entity.name.type.class.cs"
591594
}
592595
},
593-
"end": "(?=\\{)",
596+
"end": "(?=\\{)|(?=;)",
594597
"patterns": [
595598
{
596599
"include": "#comment"
597600
},
598601
{
599602
"include": "#type-parameter-list"
600603
},
604+
{
605+
"include": "#parenthesized-parameter-list"
606+
},
601607
{
602608
"include": "#base-types"
603609
},
@@ -820,7 +826,7 @@
820826
},
821827
"record-declaration": {
822828
"begin": "(?=\\brecord\\b)",
823-
"end": "(?<=\\})",
829+
"end": "(?<=\\})|(?=;)",
824830
"patterns": [
825831
{
826832
"begin": "(?x)\n(record)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -829,17 +835,20 @@
829835
"name": "keyword.other.record.cs"
830836
},
831837
"2": {
832-
"name": "entity.name.type.record.cs"
838+
"name": "entity.name.type.class.cs"
833839
}
834840
},
835-
"end": "(?=\\{)",
841+
"end": "(?=\\{)|(?=;)",
836842
"patterns": [
837843
{
838844
"include": "#comment"
839845
},
840846
{
841847
"include": "#type-parameter-list"
842848
},
849+
{
850+
"include": "#parenthesized-parameter-list"
851+
},
843852
{
844853
"include": "#base-types"
845854
},
@@ -876,27 +885,33 @@
876885
]
877886
},
878887
"struct-declaration": {
879-
"begin": "(?=\\bstruct\\b)",
880-
"end": "(?<=\\})",
888+
"begin": "(?=(\\brecord\\b\\s+)?\\bstruct\\b)",
889+
"end": "(?<=\\})|(?=;)",
881890
"patterns": [
882891
{
883-
"begin": "(?x)\n(struct)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
892+
"begin": "(?x)\n(\\b(record)\\b\\s+)?\n(struct)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
884893
"beginCaptures": {
885-
"1": {
894+
"2": {
895+
"name": "keyword.other.record.cs"
896+
},
897+
"3": {
886898
"name": "keyword.other.struct.cs"
887899
},
888-
"2": {
900+
"4": {
889901
"name": "entity.name.type.struct.cs"
890902
}
891903
},
892-
"end": "(?=\\{)",
904+
"end": "(?=\\{)|(?=;)",
893905
"patterns": [
894906
{
895907
"include": "#comment"
896908
},
897909
{
898910
"include": "#type-parameter-list"
899911
},
912+
{
913+
"include": "#parenthesized-parameter-list"
914+
},
900915
{
901916
"include": "#base-types"
902917
},
@@ -980,7 +995,7 @@
980995
"name": "punctuation.separator.colon.cs"
981996
}
982997
},
983-
"end": "(?=\\{|where)",
998+
"end": "(?=\\{|where|;)",
984999
"patterns": [
9851000
{
9861001
"include": "#type"
@@ -3006,7 +3021,7 @@
30063021
"match": "(?<!\\.)\\bnull\\b"
30073022
},
30083023
"numeric-literal": {
3009-
"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|_)|(?<=[eE])[+-])*",
3024+
"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)*",
30103025
"captures": {
30113026
"0": {
30123027
"patterns": [
@@ -3152,7 +3167,7 @@
31523167
}
31533168
},
31543169
{
3155-
"match": "(?:(?:[0-9a-zA-Z_\\.]|_)|(?<=[eE])[+-])+",
3170+
"match": "(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)+",
31563171
"name": "invalid.illegal.constant.numeric.cs"
31573172
}
31583173
]

‎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": "b6324bfae2058bc29bb01af6bd2011c3eb35545d"
9+
"commitHash": "4a321c4e0756a840b71d03290da8c736d73dbaa1"
1010
}
1111
},
1212
"licenseDetail": [

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

Lines changed: 4 additions & 1 deletion
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/b6324bfae2058bc29bb01af6bd2011c3eb35545d",
7+
"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/4a321c4e0756a840b71d03290da8c736d73dbaa1",
88
"name": "Dart",
99
"scopeName": "source.dart",
1010
"patterns": [
@@ -298,6 +298,9 @@
298298
{
299299
"name": "keyword.declaration.dart",
300300
"match": "extends"
301+
},
302+
{
303+
"include": "#comments"
301304
}
302305
]
303306
},

‎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": "713cd4a34e7729e444cf85ae287dd94c19e34337"
9+
"commitHash": "71b1ead8c99715f6c994115ebab7ee4a14cf0c59"
1010
}
1111
},
1212
"license": "MIT",

0 commit comments

Comments
 (0)