Skip to content

Commit 0201fb5

Browse files
N. Taylor MullenTanayParikh
N. Taylor Mullen
and
TanayParikh
authored
Update Razor to 6.0.0-alpha1.20521.3 (#4135)
* Update Razor to 6.0.0-alpha1.20521.3 * HTML colorization is now computed meaning it should be "more correct" for non-C# portions of the document. * Bug fix - the `razor.format.enable` option is honored again * Update CHANGELOG.md Co-authored-by: Tanay Parikh <[email protected]> Co-authored-by: Tanay Parikh <[email protected]>
1 parent dde0eaf commit 0201fb5

File tree

4 files changed

+90
-104
lines changed

4 files changed

+90
-104
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
## 1.23.5 (Not yet released)
1515
* Set meaning of UseGlobalMono "auto" to "never" since Mono 6.12.0 still ships with MSBuild 16.7 (PR: [#4130](https://github.com/OmniSharp/omnisharp-vscode/pull/4130))
1616
* Ensure that the rename identifier and run code action providers do not apply changes twice PR: [4133](https://github.com/OmniSharp/omnisharp-vscode/pull/4133)
17+
* Update Razor to 6.0.0-alpha1.20521.3:
18+
* Improvements to HTML colorization for non-C# portions of the document.
19+
* Bug fix - the `razor.format.enable` option is honored again
1720

1821
## 1.23.4 (October, 19, 2020)
1922
* Use incremental changes to update language server (PR: [#4088](https://github.com/OmniSharp/omnisharp-vscode/pull/4088))

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 84 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
],
3131
"defaults": {
3232
"omniSharp": "1.37.3",
33-
"razor": "6.0.0-alpha.1.20479.2"
33+
"razor": "6.0.0-alpha.1.20521.3"
3434
},
3535
"main": "./dist/extension",
3636
"scripts": {
@@ -79,7 +79,7 @@
7979
"http-proxy-agent": "2.1.0",
8080
"https-proxy-agent": "^3.0.1",
8181
"jsonc-parser": "2.0.3",
82-
"microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/40d55e9484f6be2a1800f489d750bd21/microsoft.aspnetcore.razor.vscode-6.0.0-alpha.1.20479.2.tgz",
82+
"microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/99ae2d0e-6443-4d26-af34-99b26dd0bee6/5045e92b73aff13d8f65dfe29ad758ba/microsoft.aspnetcore.razor.vscode-6.0.0-alpha.1.20521.3.tgz",
8383
"mkdirp": "^1.0.3",
8484
"node-filter-async": "1.1.1",
8585
"node-machine-id": "1.1.12",
@@ -342,8 +342,8 @@
342342
{
343343
"id": "Razor",
344344
"description": "Razor Language Server (Windows / x64)",
345-
"url": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/087ef8770e05073204daecdf5701fcf9/razorlanguageserver-win-x64-6.0.0-alpha.1.20479.2.zip",
346-
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x64-6.0.0-alpha.1.20479.2.zip",
345+
"url": "https://download.visualstudio.microsoft.com/download/pr/99ae2d0e-6443-4d26-af34-99b26dd0bee6/0a38f08e86b668f4ad5d2ddc1a34c2bf/razorlanguageserver-win-x64-6.0.0-alpha.1.20521.3.zip",
346+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x64-6.0.0-alpha.1.20521.3.zip",
347347
"installPath": ".razor",
348348
"platforms": [
349349
"win32"
@@ -355,8 +355,8 @@
355355
{
356356
"id": "Razor",
357357
"description": "Razor Language Server (Windows / x86)",
358-
"url": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/1f4b86673ce34352bb86a59d601ad43a/razorlanguageserver-win-x86-6.0.0-alpha.1.20479.2.zip",
359-
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x86-6.0.0-alpha.1.20479.2.zip",
358+
"url": "https://download.visualstudio.microsoft.com/download/pr/99ae2d0e-6443-4d26-af34-99b26dd0bee6/58dcd2261f7bb78022990fb6c9f8d0fd/razorlanguageserver-win-x86-6.0.0-alpha.1.20521.3.zip",
359+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x86-6.0.0-alpha.1.20521.3.zip",
360360
"installPath": ".razor",
361361
"platforms": [
362362
"win32"
@@ -368,8 +368,8 @@
368368
{
369369
"id": "Razor",
370370
"description": "Razor Language Server (Linux / x64)",
371-
"url": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/112fe9289fb974e5ff14207a3633933d/razorlanguageserver-linux-x64-6.0.0-alpha.1.20479.2.zip",
372-
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-6.0.0-alpha.1.20479.2.zip",
371+
"url": "https://download.visualstudio.microsoft.com/download/pr/99ae2d0e-6443-4d26-af34-99b26dd0bee6/feb657b63b18ef5a8866d44b76b05cb7/razorlanguageserver-linux-x64-6.0.0-alpha.1.20521.3.zip",
372+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-6.0.0-alpha.1.20521.3.zip",
373373
"installPath": ".razor",
374374
"platforms": [
375375
"linux"
@@ -384,8 +384,8 @@
384384
{
385385
"id": "Razor",
386386
"description": "Razor Language Server (macOS / x64)",
387-
"url": "https://download.visualstudio.microsoft.com/download/pr/7c23a575-eeee-47ba-814a-370fcb3bfb51/4892ef64ea15017b17c4e6c23384aea8/razorlanguageserver-osx-x64-6.0.0-alpha.1.20479.2.zip",
388-
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-osx-x64-6.0.0-alpha.1.20479.2.zip",
387+
"url": "https://download.visualstudio.microsoft.com/download/pr/99ae2d0e-6443-4d26-af34-99b26dd0bee6/fb3796ed5768dea128d1f0e42cbedc4f/razorlanguageserver-osx-x64-6.0.0-alpha.1.20521.3.zip",
388+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-osx-x64-6.0.0-alpha.1.20521.3.zip",
389389
"installPath": ".razor",
390390
"platforms": [
391391
"darwin"
@@ -3313,6 +3313,42 @@
33133313
"id": "razorDirectiveColon",
33143314
"description": "A colon between directive attribute parameters"
33153315
},
3316+
{
3317+
"id": "razorDirective",
3318+
"description": "A Razor directive such as 'code' or 'function'"
3319+
},
3320+
{
3321+
"id": "razorComment",
3322+
"description": "A Razor comment"
3323+
},
3324+
{
3325+
"id": "markupCommentPunctuation",
3326+
"description": "The '@' or '*' of a Razor comment."
3327+
},
3328+
{
3329+
"id": "markupTagDelimiter",
3330+
"description": "Markup delimiters like '<', '>', and '/'."
3331+
},
3332+
{
3333+
"id": "markupOperator",
3334+
"description": "Delimiter for Markup Attribute Key-Value pairs."
3335+
},
3336+
{
3337+
"id": "markupElement",
3338+
"description": "The name of a Markup element."
3339+
},
3340+
{
3341+
"id": "markupAttribute",
3342+
"description": "The name of a Markup attribute."
3343+
},
3344+
{
3345+
"id": "markupComment",
3346+
"description": "The contents of a Markup comment."
3347+
},
3348+
{
3349+
"id": "markupCommentPunctuation",
3350+
"description": "The begining or ending punctuation of a Markup comment."
3351+
},
33163352
{
33173353
"id": "plainKeyword",
33183354
"description": "Represents a keyword"
@@ -3431,6 +3467,43 @@
34313467
"razorDirectiveColon": [
34323468
"keyword.control.razor.directive.colon",
34333469
"keyword.control.cshtml.directive.colon"
3470+
],
3471+
"razorDirective": [
3472+
"keyword.control.razor.directive",
3473+
"keyword.control.cshtml.directive"
3474+
],
3475+
"razorComment": [
3476+
"comment.block.razor"
3477+
],
3478+
"razorCommentTransition": [
3479+
"meta.comment.razor",
3480+
"keyword.control.cshtml.transition"
3481+
],
3482+
"razorCommentStar": [
3483+
"keyword.control.razor.comment.star",
3484+
"meta.comment.razor"
3485+
],
3486+
"angleBracket": [
3487+
"punctuation.definition.tag"
3488+
],
3489+
"forwardSlash": [
3490+
"punctuation.definition.tag"
3491+
],
3492+
"equals": [
3493+
"punctuation.separator.key-value.html"
3494+
],
3495+
"markupElement": [
3496+
"entity.name.tag.html"
3497+
],
3498+
"markupAttribute": [
3499+
"entity.other.attribute-name.html"
3500+
],
3501+
"markupComment": [
3502+
"comment.block.html"
3503+
],
3504+
"markupCommentPunctuation": [
3505+
"punctuation.definition.comment.html",
3506+
"comment.block.html"
34343507
]
34353508
}
34363509
},
@@ -3571,4 +3644,4 @@
35713644
]
35723645
}
35733646
}
3574-
}
3647+
}

‎src/razor/syntaxes/aspnetcorerazor.tmLanguage.json‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -13,96 +13,6 @@
1313
"include": "text.html.basic"
1414
}
1515
],
16-
"injections": {
17-
"R:text.aspnetcorerazor": {
18-
"patterns": [
19-
{
20-
"name": "meta.structure.template.razor",
21-
"begin": "(@)(?=\\<)",
22-
"beginCaptures": {
23-
"1": {
24-
"patterns": [
25-
{
26-
"include": "#transition"
27-
}
28-
]
29-
}
30-
},
31-
"patterns": [
32-
{
33-
"include": "#wellformed-html"
34-
}
35-
],
36-
"end": "(?<=\\>)"
37-
}
38-
]
39-
},
40-
"L:meta.structure.razor.codeblock - (meta.statement | string.quoted | comment), L:meta.structure.razor.directive.codeblock - (meta.statement | string.quoted | comment)": {
41-
"patterns": [
42-
{
43-
"begin": "(\\{)",
44-
"beginCaptures": {
45-
"1": {
46-
"name": "punctuation.curlybrace.open.cs"
47-
}
48-
},
49-
"patterns": [
50-
{
51-
"include": "#razor-codeblock-body"
52-
}
53-
],
54-
"end": "(\\})",
55-
"endCaptures": {
56-
"1": {
57-
"name": "punctuation.curlybrace.close.cs"
58-
}
59-
}
60-
}
61-
]
62-
},
63-
"L:meta.attribute string.quoted.double.html, L:meta.attribute string.quoted.single.html": {
64-
"patterns": [
65-
{
66-
"name": "meta.attribute.razor.explicit",
67-
"begin": "@\\(",
68-
"beginCaptures": {
69-
"0": {
70-
"name": "keyword.control.cshtml"
71-
}
72-
},
73-
"patterns": [
74-
{
75-
"include": "source.cs#expression"
76-
}
77-
],
78-
"end": "\\)",
79-
"endCaptures": {
80-
"0": {
81-
"name": "keyword.control.cshtml"
82-
}
83-
}
84-
},
85-
{
86-
"name": "meta.attribute.razor.implicit",
87-
"begin": "@",
88-
"beginCaptures": {
89-
"0": {
90-
"name": "keyword.control.cshtml"
91-
}
92-
},
93-
"patterns": [
94-
{
95-
"include": "#await-prefix"
96-
},
97-
{
98-
"include": "#implicit-expression-body"
99-
}
100-
],
101-
"end": "(?=[\\s<>\\{\\}\\)\\]'\"])"
102-
}
103-
]
104-
}
105-
},
10616
"repository": {
10717
"razor-control-structures": {
10818
"patterns": [

0 commit comments

Comments
 (0)