Skip to content

Commit b2d30a3

Browse files
davidwengierdavidwengier
authored
Merge pull request #6550 from davidwengier/RazorCodeActionResolveParamsUpdate
Update code action resolve params
2 parents be52b7c + 986a1d3 commit b2d30a3

File tree

5 files changed

+28
-23
lines changed

5 files changed

+28
-23
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/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/bb7cd0c44e45bd21cd1341a4a6e87f1c/razorlanguageserver-linux-arm64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/159a171a7cc1ceb96604d148d5c75574/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/fb08013aad8cfbb2bc2c3f5f4d276a0d/razorlanguageserver-linux-musl-x64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/5ece63dde175c03ce79a8ec91005537b/razorlanguageserver-linux-x64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/89a58de8daaea554d00105dc435dfc98/razorlanguageserver-osx-arm64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/8a13539f57d6e59b32e767d3684c6c84/razorlanguageserver-osx-x64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/efe8ebdcd7f4162a537acb9325234f02/razorlanguageserver-win-arm64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/e0d9dc729905a672edb6bb44239fceb0/razorlanguageserver-win-x64-7.0.0-preview.23513.5.zip,https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/c7f08527fbb3809f6dc8e4bf2dc81571/razorlanguageserver-win-x86-7.0.0-preview.23513.5.zip",
295-
"NEW_DEPS_VERSION": "7.0.0-preview.23513.5",
294+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/4de42846aedae6ca331831a049a8305a/razorlanguageserver-linux-arm64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/80fc8d5b91d94f217e0a87f819ede69c/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/1f2f6b84339bc5ee331edd8685bf1dd5/razorlanguageserver-linux-musl-x64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/0b98a514b4f2720e9d49429147a8b676/razorlanguageserver-linux-x64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/5926c1d3c57ebaa85f36884781b603ed/razorlanguageserver-osx-arm64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/76a3232b4129c8e86e1cc86c10760b1e/razorlanguageserver-osx-x64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/381309a92ef7f19a36ce7460c1a2c90d/razorlanguageserver-win-arm64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/3ae268b4c3b6875ca59413caf22ae1d0/razorlanguageserver-win-x64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/34238df615079d207cd1ab976e363393/razorlanguageserver-win-x86-7.0.0-preview.23516.2.zip",
295+
"NEW_DEPS_VERSION": "7.0.0-preview.23516.2",
296296
"NEW_DEPS_ID": "Razor"
297297
},
298298
"cwd": "${workspaceFolder}"

‎CHANGELOG.md

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

88
## Latest
9+
* Update Razor to 7.0.0-preview.23516.2 (PR: [#6550](https://github.com/dotnet/vscode-csharp/pull/6550))
10+
* Make sure correct info is passed in code action resolve (PR: [razor#9420](https://github.com/dotnet/razor/pull/9420))
11+
12+
## 2.7.?
913
* Update Razor to 7.0.0-preview.23513.5 (PR: [#6551](https://github.com/dotnet/vscode-csharp/pull/6551))
1014
* Reduce noisy errors when viewing git diff (PR: [razor#9407](https://github.com/dotnet/razor/pull/9407))
1115
* Update Roslyn to 4.9.0-1.23513.7 (PR: [#6548](https://github.com/dotnet/vscode-csharp/pull/6548))

‎package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"defaults": {
4040
"roslyn": "4.9.0-1.23513.7",
4141
"omniSharp": "1.39.10",
42-
"razor": "7.0.0-preview.23513.5",
42+
"razor": "7.0.0-preview.23516.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/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/e0d9dc729905a672edb6bb44239fceb0/razorlanguageserver-win-x64-7.0.0-preview.23513.5.zip",
616+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/3ae268b4c3b6875ca59413caf22ae1d0/razorlanguageserver-win-x64-7.0.0-preview.23516.2.zip",
617617
"installPath": ".razor",
618618
"platforms": [
619619
"win32"
620620
],
621621
"architectures": [
622622
"x86_64"
623623
],
624-
"integrity": "50CFBE5021DE39A1E207E32321BFDF4FCAEBE0D34EF8C8A64143AC7AADF6EB12"
624+
"integrity": "34AC2AD88B9AAFCFFA84B09DEDC625521B1C706B537F6838E7223190E40B1CCC"
625625
},
626626
{
627627
"id": "Razor",
628628
"description": "Razor Language Server (Windows / x86)",
629-
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/c7f08527fbb3809f6dc8e4bf2dc81571/razorlanguageserver-win-x86-7.0.0-preview.23513.5.zip",
629+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/34238df615079d207cd1ab976e363393/razorlanguageserver-win-x86-7.0.0-preview.23516.2.zip",
630630
"installPath": ".razor",
631631
"platforms": [
632632
"win32"
633633
],
634634
"architectures": [
635635
"x86"
636636
],
637-
"integrity": "DF2A885EC2FEE6DC6140A0465549476B164C6552040D6F946AD5B6C6FB85D2BE"
637+
"integrity": "5ED25B16574FA1FB89130B3D69DDF75EB6074B41A10CD7ABEB8E032BF70073EB"
638638
},
639639
{
640640
"id": "Razor",
641641
"description": "Razor Language Server (Windows / ARM64)",
642-
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/efe8ebdcd7f4162a537acb9325234f02/razorlanguageserver-win-arm64-7.0.0-preview.23513.5.zip",
642+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/381309a92ef7f19a36ce7460c1a2c90d/razorlanguageserver-win-arm64-7.0.0-preview.23516.2.zip",
643643
"installPath": ".razor",
644644
"platforms": [
645645
"win32"
646646
],
647647
"architectures": [
648648
"arm64"
649649
],
650-
"integrity": "3A7E49E531C6870B37341A8B57D0C26AB7BCD779CD173C02CBCDB16D0A273D82"
650+
"integrity": "F7D779918F622524E92FC072F30DE21D798F936A0123C75DABB1974CAA06178B"
651651
},
652652
{
653653
"id": "Razor",
654654
"description": "Razor Language Server (Linux / x64)",
655-
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/5ece63dde175c03ce79a8ec91005537b/razorlanguageserver-linux-x64-7.0.0-preview.23513.5.zip",
655+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/0b98a514b4f2720e9d49429147a8b676/razorlanguageserver-linux-x64-7.0.0-preview.23516.2.zip",
656656
"installPath": ".razor",
657657
"platforms": [
658658
"linux"
@@ -663,12 +663,12 @@
663663
"binaries": [
664664
"./rzls"
665665
],
666-
"integrity": "BB9856808252ADE6AAC1CD55939373E7237D846EC9101FE306113B5EE93376B7"
666+
"integrity": "0E44FD3D902EC055729F9BC1447411B37946D1093793FC2BFFDEA001CE4EAC97"
667667
},
668668
{
669669
"id": "Razor",
670670
"description": "Razor Language Server (Linux ARM64)",
671-
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/bb7cd0c44e45bd21cd1341a4a6e87f1c/razorlanguageserver-linux-arm64-7.0.0-preview.23513.5.zip",
671+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/4de42846aedae6ca331831a049a8305a/razorlanguageserver-linux-arm64-7.0.0-preview.23516.2.zip",
672672
"installPath": ".razor",
673673
"platforms": [
674674
"linux"
@@ -679,12 +679,12 @@
679679
"binaries": [
680680
"./rzls"
681681
],
682-
"integrity": "B7197A7C3F544BE91713C2776F86C32AF58B7D1B1FD43042ACC8AAA0541EAC75"
682+
"integrity": "E1FF36BE914066B2812D62F4B6C7E2BDEB6680FCCB968B121022C3AC2548744D"
683683
},
684684
{
685685
"id": "Razor",
686686
"description": "Razor Language Server (Linux musl / x64)",
687-
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/fb08013aad8cfbb2bc2c3f5f4d276a0d/razorlanguageserver-linux-musl-x64-7.0.0-preview.23513.5.zip",
687+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/1f2f6b84339bc5ee331edd8685bf1dd5/razorlanguageserver-linux-musl-x64-7.0.0-preview.23516.2.zip",
688688
"installPath": ".razor",
689689
"platforms": [
690690
"linux-musl"
@@ -695,12 +695,12 @@
695695
"binaries": [
696696
"./rzls"
697697
],
698-
"integrity": "28BD44F3ED9C6FDC8A2E8B73BD12587D5110898ABFB49D8D880748B33F6B050C"
698+
"integrity": "208A57E15921AC99FE7FB2D0672F0DF50985F2211627AE2861C7CD7D6E8249D1"
699699
},
700700
{
701701
"id": "Razor",
702702
"description": "Razor Language Server (Linux musl ARM64)",
703-
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/159a171a7cc1ceb96604d148d5c75574/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23513.5.zip",
703+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/80fc8d5b91d94f217e0a87f819ede69c/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23516.2.zip",
704704
"installPath": ".razor",
705705
"platforms": [
706706
"linux-musl"
@@ -711,12 +711,12 @@
711711
"binaries": [
712712
"./rzls"
713713
],
714-
"integrity": "F2BA9D7CA2B2424D6A5B00D8E23BC3BD646144FF1A623471A50F358277B7919B"
714+
"integrity": "582DEEB207BAFC9AF5E59038ED3B49F2E536BC231809ED5613C426C39B85C10A"
715715
},
716716
{
717717
"id": "Razor",
718718
"description": "Razor Language Server (macOS / x64)",
719-
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/8a13539f57d6e59b32e767d3684c6c84/razorlanguageserver-osx-x64-7.0.0-preview.23513.5.zip",
719+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/76a3232b4129c8e86e1cc86c10760b1e/razorlanguageserver-osx-x64-7.0.0-preview.23516.2.zip",
720720
"installPath": ".razor",
721721
"platforms": [
722722
"darwin"
@@ -727,12 +727,12 @@
727727
"binaries": [
728728
"./rzls"
729729
],
730-
"integrity": "9513C71E033B47DECC6077D93844E165FFA66800309169B6CEABC2CCEC7EAFFB"
730+
"integrity": "3FD1E24233731233AA5E1D61D36D27FBAB4A28FC46A4AAB4D432E42266016E17"
731731
},
732732
{
733733
"id": "Razor",
734734
"description": "Razor Language Server (macOS ARM64)",
735-
"url": "https://download.visualstudio.microsoft.com/download/pr/f8b5b74b-3df3-47cc-83b1-cd1d93d1771d/89a58de8daaea554d00105dc435dfc98/razorlanguageserver-osx-arm64-7.0.0-preview.23513.5.zip",
735+
"url": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/5926c1d3c57ebaa85f36884781b603ed/razorlanguageserver-osx-arm64-7.0.0-preview.23516.2.zip",
736736
"installPath": ".razor",
737737
"platforms": [
738738
"darwin"
@@ -743,7 +743,7 @@
743743
"binaries": [
744744
"./rzls"
745745
],
746-
"integrity": "A102654F519C7D3B8D60C8E5FF390ED08498E0A9BF23089DBDD581A148130A03"
746+
"integrity": "AB4D44465EA5135912737F8D943DB8DB7ADF1CC213F433188401FEE36B78A319"
747747
},
748748
{
749749
"id": "RazorOmnisharp",

‎src/razor/src/codeActions/codeActionsHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export class CodeActionsHandler {
9898
) {
9999
try {
100100
const codeAction = resolveCodeActionParams.codeAction;
101-
const razorDocumentUri = vscode.Uri.parse(resolveCodeActionParams.uri, true);
101+
const razorDocumentUri = vscode.Uri.parse(resolveCodeActionParams.identifier.uri, true);
102102
const razorDocument = await this.documentManager.getDocument(razorDocumentUri);
103103
if (razorDocument === undefined) {
104104
return this.emptyCodeAction;

‎src/razor/src/codeActions/serializableRazorResolveCodeActionParams.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
import { LanguageKind } from '../rpc/languageKind';
77
import { CodeAction } from 'vscode-languageserver-protocol';
8+
import { SerializableTextDocumentIdentifier } from '../rpc/serializableTextDocumentIdentifier';
89

910
export interface SerializableRazorResolveCodeActionParams {
1011
hostDocumentVersion: number;
11-
uri: string;
12+
identifier: SerializableTextDocumentIdentifier;
1213
languageKind: LanguageKind;
1314
codeAction: CodeAction;
1415
}

0 commit comments

Comments
 (0)