Skip to content

Commit 7784d32

Browse files
authored
Merge pull request #6506 from davidwengier/RazorCommitCharacterSetting
Add setting to control Razor component commit behaviour
2 parents b380b27 + e420e3f commit 7784d32

File tree

3 files changed

+30
-22
lines changed

3 files changed

+30
-22
lines changed

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@
291291
"updatePackageDependencies"
292292
],
293293
"env": {
294-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/f0e050f69a2afb6758a1bccfbf00bb9a/razorlanguageserver-linux-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/e3d3993005c037451c715c26ec43328b/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/c3fd7144ecc6abea28e905504a60d65b/razorlanguageserver-linux-musl-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/98abba355a15ad90c59eb5653326baeb/razorlanguageserver-linux-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/68cd5916dbff0936c04ae0a152268d0f/razorlanguageserver-osx-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/f13124670d3c1f52ecbeb79538d763cb/razorlanguageserver-osx-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/d50e57f6a69f75a65496f32b107532e8/razorlanguageserver-win-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/70a917c8a17f4052a3a6b3862200f9f5/razorlanguageserver-win-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/ee48f10fa72517ce132fad30d458680a/razorlanguageserver-win-x86-7.0.0-preview.23475.5.zip",
295-
"NEW_DEPS_VERSION": "7.0.0-preview.23475.5",
294+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/59e252ec1565aa1e72aab4df73f35510/razorlanguageserver-linux-arm64-7.0.0-preview.23509.2.zip,https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/565066c5ca0844edb90b66187e99bd03/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23509.2.zip,https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/c2c5dbc26f3ad91ac851ce175abb57e1/razorlanguageserver-linux-musl-x64-7.0.0-preview.23509.2.zip,https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/7c1e301d9000f06debecc8208d7aa2ea/razorlanguageserver-linux-x64-7.0.0-preview.23509.2.zip,https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/7b231eee6608879bc934a8256324e9f5/razorlanguageserver-osx-arm64-7.0.0-preview.23509.2.zip,https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/101e1db25b9411892eb6474c516a38b4/razorlanguageserver-osx-x64-7.0.0-preview.23509.2.zip,https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/59830fe8f7d57758675cc36f48b65a29/razorlanguageserver-win-arm64-7.0.0-preview.23509.2.zip,https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/22969b5b81fda9d5f5403b6cef265058/razorlanguageserver-win-x64-7.0.0-preview.23509.2.zip,https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/5fe01999736b69133fa1ea97fb35aed2/razorlanguageserver-win-x86-7.0.0-preview.23509.2.zip",
295+
"NEW_DEPS_VERSION": "7.0.0-preview.23509.2",
296296
"NEW_DEPS_ID": "Razor"
297297
},
298298
"cwd": "${workspaceFolder}"

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
99

1010
## Latest
11+
* Update Razor version to 7.0.0-preview.23475.5 (PR: [#6506](https://github.com/dotnet/vscode-csharp/pull/6506))
12+
* Add setting for whether to complete components with space (PR: [razor#9379](https://github.com/dotnet/razor/pull/9379))
1113
* Update Roslyn version to 4.9.0-1.23506.7 (PR: [#6447](https://github.com/dotnet/vscode-csharp/pull/6447))
1214
* Fix various issues with project loading and allow fallbacks to .NET framework msbuild (PR: [#70240](https://github.com/dotnet/roslyn/pull/70240))
1315
* Fix some Razor colorization issues (PR: [#6502](https://github.com/dotnet/vscode-csharp/pull/6502))

package.json

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"defaults": {
4040
"roslyn": "4.9.0-1.23506.7",
4141
"omniSharp": "1.39.10",
42-
"razor": "7.0.0-preview.23475.5",
42+
"razor": "7.0.0-preview.23509.2",
4343
"razorOmnisharp": "7.0.0-preview.23363.1"
4444
},
4545
"main": "./dist/extension",
@@ -613,46 +613,46 @@
613613
{
614614
"id": "Razor",
615615
"description": "Razor Language Server (Windows / x64)",
616-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/70a917c8a17f4052a3a6b3862200f9f5/razorlanguageserver-win-x64-7.0.0-preview.23475.5.zip",
616+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/22969b5b81fda9d5f5403b6cef265058/razorlanguageserver-win-x64-7.0.0-preview.23509.2.zip",
617617
"installPath": ".razor",
618618
"platforms": [
619619
"win32"
620620
],
621621
"architectures": [
622622
"x86_64"
623623
],
624-
"integrity": "87462BD5F2760D81B91EDE400B4AF7392795D03E5F22608536A671B8D8566541"
624+
"integrity": "0AE34F2A96DB414C7146F4F60C7A37DFE80572AD537587B2186CB0FF609A6090"
625625
},
626626
{
627627
"id": "Razor",
628628
"description": "Razor Language Server (Windows / x86)",
629-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/ee48f10fa72517ce132fad30d458680a/razorlanguageserver-win-x86-7.0.0-preview.23475.5.zip",
629+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/5fe01999736b69133fa1ea97fb35aed2/razorlanguageserver-win-x86-7.0.0-preview.23509.2.zip",
630630
"installPath": ".razor",
631631
"platforms": [
632632
"win32"
633633
],
634634
"architectures": [
635635
"x86"
636636
],
637-
"integrity": "ED27D0C1F65D3BF70E330E5A6AC63587D7CED2F86A48948B9E9E46392FCF4DEA"
637+
"integrity": "A9FB811B34F1733363DFED0DE6BB1AD8C8372BD6001380536205309E0A14DE85"
638638
},
639639
{
640640
"id": "Razor",
641641
"description": "Razor Language Server (Windows / ARM64)",
642-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/d50e57f6a69f75a65496f32b107532e8/razorlanguageserver-win-arm64-7.0.0-preview.23475.5.zip",
642+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/59830fe8f7d57758675cc36f48b65a29/razorlanguageserver-win-arm64-7.0.0-preview.23509.2.zip",
643643
"installPath": ".razor",
644644
"platforms": [
645645
"win32"
646646
],
647647
"architectures": [
648648
"arm64"
649649
],
650-
"integrity": "A3C97A3E858027C4D1FB957A10833894E1ACC59C8B40D667C1D9E18D59EB9D58"
650+
"integrity": "0D4AD54F2AA8541781E3DC8FDD3C8541EE7A0691D7576ACDF9D3BAE5EEC41BEF"
651651
},
652652
{
653653
"id": "Razor",
654654
"description": "Razor Language Server (Linux / x64)",
655-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/98abba355a15ad90c59eb5653326baeb/razorlanguageserver-linux-x64-7.0.0-preview.23475.5.zip",
655+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/7c1e301d9000f06debecc8208d7aa2ea/razorlanguageserver-linux-x64-7.0.0-preview.23509.2.zip",
656656
"installPath": ".razor",
657657
"platforms": [
658658
"linux"
@@ -663,12 +663,12 @@
663663
"binaries": [
664664
"./rzls"
665665
],
666-
"integrity": "16550C753B1525EFF21F7F20DA4714084D240AFE6717ABB7B60C5CECF4C824C3"
666+
"integrity": "7AD5AA98F8D10712A4338FD7B3B353FA6D9F7ED658D2A3FC8F4A7CE2470C7EF7"
667667
},
668668
{
669669
"id": "Razor",
670670
"description": "Razor Language Server (Linux ARM64)",
671-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/f0e050f69a2afb6758a1bccfbf00bb9a/razorlanguageserver-linux-arm64-7.0.0-preview.23475.5.zip",
671+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/59e252ec1565aa1e72aab4df73f35510/razorlanguageserver-linux-arm64-7.0.0-preview.23509.2.zip",
672672
"installPath": ".razor",
673673
"platforms": [
674674
"linux"
@@ -679,12 +679,12 @@
679679
"binaries": [
680680
"./rzls"
681681
],
682-
"integrity": "1F170B3D0AC9DEE88E8C6E0B0F9BAF402F71658A18F8B39C1520F187F983F8E6"
682+
"integrity": "BAD9ADA9A1EEBA05BF0B474DAED33DC29199ED6286E2042B658F2251D03D197D"
683683
},
684684
{
685685
"id": "Razor",
686686
"description": "Razor Language Server (Linux musl / x64)",
687-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/c3fd7144ecc6abea28e905504a60d65b/razorlanguageserver-linux-musl-x64-7.0.0-preview.23475.5.zip",
687+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/c2c5dbc26f3ad91ac851ce175abb57e1/razorlanguageserver-linux-musl-x64-7.0.0-preview.23509.2.zip",
688688
"installPath": ".razor",
689689
"platforms": [
690690
"linux-musl"
@@ -695,12 +695,12 @@
695695
"binaries": [
696696
"./rzls"
697697
],
698-
"integrity": "1982C06D5BECF68024B52A38F6DF30AA3C3D72CFF29FA7268A7970F2F94F0C67"
698+
"integrity": "0855A5C8F6028A7C1B21FC1FE3B601EACF17D89CC7F86BF3BF180520CC8184B3"
699699
},
700700
{
701701
"id": "Razor",
702702
"description": "Razor Language Server (Linux musl ARM64)",
703-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/e3d3993005c037451c715c26ec43328b/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23475.5.zip",
703+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/565066c5ca0844edb90b66187e99bd03/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23509.2.zip",
704704
"installPath": ".razor",
705705
"platforms": [
706706
"linux-musl"
@@ -711,12 +711,12 @@
711711
"binaries": [
712712
"./rzls"
713713
],
714-
"integrity": "9EB3962F1186D1C48DE94A7A8DA5209162C29E020C08EF85AC1E2C4905580272"
714+
"integrity": "9597BA32EE3AA081CF4221F3E97F16A36F030E462375FCF8FF64906E690CB6AD"
715715
},
716716
{
717717
"id": "Razor",
718718
"description": "Razor Language Server (macOS / x64)",
719-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/f13124670d3c1f52ecbeb79538d763cb/razorlanguageserver-osx-x64-7.0.0-preview.23475.5.zip",
719+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/101e1db25b9411892eb6474c516a38b4/razorlanguageserver-osx-x64-7.0.0-preview.23509.2.zip",
720720
"installPath": ".razor",
721721
"platforms": [
722722
"darwin"
@@ -727,12 +727,12 @@
727727
"binaries": [
728728
"./rzls"
729729
],
730-
"integrity": "816C709BBE8B165531793EBC6DF581C42A423856E3D070433254B3C939FA7524"
730+
"integrity": "ACB7A5C77485E4DFF6CAE6D2EF06221105A5E804DE14B87596C163B301D89231"
731731
},
732732
{
733733
"id": "Razor",
734734
"description": "Razor Language Server (macOS ARM64)",
735-
"url": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/68cd5916dbff0936c04ae0a152268d0f/razorlanguageserver-osx-arm64-7.0.0-preview.23475.5.zip",
735+
"url": "https://download.visualstudio.microsoft.com/download/pr/2ec8c3c2-4f6f-42c0-8c90-97fd97427d7c/7b231eee6608879bc934a8256324e9f5/razorlanguageserver-osx-arm64-7.0.0-preview.23509.2.zip",
736736
"installPath": ".razor",
737737
"platforms": [
738738
"darwin"
@@ -743,7 +743,7 @@
743743
"binaries": [
744744
"./rzls"
745745
],
746-
"integrity": "B06500D30A34CB45D8BC12EE2D54B09D2B0BA9F2AE87A25AD41D0C2AFD55F96D"
746+
"integrity": "414A6E30B5C64F8914824760348EAB53830662F3648A9806B2781D99D118DEE1"
747747
},
748748
{
749749
"id": "RazorOmnisharp",
@@ -1227,6 +1227,12 @@
12271227
"scope": "window",
12281228
"default": true,
12291229
"description": "Enable/disable default Razor formatter."
1230+
},
1231+
"razor.completion.commitElementsWithSpace": {
1232+
"type": "boolean",
1233+
"scope": "window",
1234+
"default": "false",
1235+
"description": "Specifies whether to commit tag helper and component elements with a space."
12301236
}
12311237
}
12321238
},
@@ -5617,4 +5623,4 @@
56175623
}
56185624
]
56195625
}
5620-
}
5626+
}

0 commit comments

Comments
 (0)