Skip to content

Commit 34b3d19

Browse files
maryamariyanmaryamariyan
authored
Merge pull request #6304 from dotnet/dev/maryamariyan/ranges-changes
Reflecting changes in vscode to take ranges in `SerializableSemanticTokensParams`
2 parents 03b58ea + 9aac95f commit 34b3d19

File tree

7 files changed

+32
-39
lines changed

7 files changed

+32
-39
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@
290290
"updatePackageDependencies"
291291
],
292292
"env": {
293-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/5320a329751f981f4c994adcbbaf1831/razorlanguageserver-linux-arm64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/ad506dfb1de131553eeb5dffdd83f44d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/1fe6ed4de9370a8fff70df1133db7889/razorlanguageserver-linux-musl-x64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/8f59b89a029f07d4e5c20b9c2af4ca21/razorlanguageserver-linux-x64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/350f666a3a714c2c77d0e79e92238ad7/razorlanguageserver-osx-arm64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/0b9c653ee9c2815280877865013ab2e4/razorlanguageserver-osx-x64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/f9ab8a6e654818635e0cd9e3115b59fc/razorlanguageserver-win-arm64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/43a6adc38859d6cf4d524239b9c3ccf9/razorlanguageserver-win-x64-7.0.0-preview.23455.5.zip,https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/b3a60e667dc67edd38d2a7dd1d6ee139/razorlanguageserver-win-x86-7.0.0-preview.23455.5.zip",
294-
"NEW_DEPS_VERSION": "7.0.0-preview.23455.5",
293+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/af4c33cdb53e85a7de39fb07195e05b2/razorlanguageserver-linux-arm64-7.0.0-preview.23456.2.zip,https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/24783517c9a4729efbd7dfd2a97fe5cc/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23456.2.zip,https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/e5e12ac99072e02499bef77c2c5034a2/razorlanguageserver-linux-musl-x64-7.0.0-preview.23456.2.zip,https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/86a165500517ca828227bfd0f28f7a02/razorlanguageserver-linux-x64-7.0.0-preview.23456.2.zip,https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/d61e51f223e6bfeceae821b1cce36bfc/razorlanguageserver-osx-arm64-7.0.0-preview.23456.2.zip,https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/b9ee27ddd84b0f4faf82e88589c8584f/razorlanguageserver-osx-x64-7.0.0-preview.23456.2.zip,https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/d279c139e3d914fec96dfab50f05f438/razorlanguageserver-win-arm64-7.0.0-preview.23456.2.zip,https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/258d3df59cb903ca4bcb9d42b854e28b/razorlanguageserver-win-x64-7.0.0-preview.23456.2.zip,https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/d2ffb8978958712807d88ebf38914f47/razorlanguageserver-win-x86-7.0.0-preview.23456.2.zip",
294+
"NEW_DEPS_VERSION": "7.0.0-preview.23456.2",
295295
"NEW_DEPS_ID": "Razor"
296296
},
297297
"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.23456.2 (PR: [#6304](https://github.com/dotnet/vscode-csharp/pull/6304))
12+
* Fixes regression where semantic colors for razor components appear as red
1113
* Add support for specifying a .runsettings file when using Roslyn LSP (PR: [#6265](https://github.com/dotnet/vscode-csharp/pull/6265))
1214
* Update Roslyn version (PR: [#6265](https://github.com/dotnet/vscode-csharp/pull/6265))
1315
* Add server support for .runsettings in unit tests (PR: [#69792](https://github.com/dotnet/roslyn/pull/69792))

‎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.8.0-3.23458.4",
4141
"omniSharp": "1.39.7",
42-
"razor": "7.0.0-preview.23455.5",
42+
"razor": "7.0.0-preview.23456.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/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/43a6adc38859d6cf4d524239b9c3ccf9/razorlanguageserver-win-x64-7.0.0-preview.23455.5.zip",
616+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/258d3df59cb903ca4bcb9d42b854e28b/razorlanguageserver-win-x64-7.0.0-preview.23456.2.zip",
617617
"installPath": ".razor",
618618
"platforms": [
619619
"win32"
620620
],
621621
"architectures": [
622622
"x86_64"
623623
],
624-
"integrity": "01AC16CE66A293E8AEDE43947B41C46A24A35DCD5B23CBB966CA3FFB37894DC0"
624+
"integrity": "2776B6967DE613C03B2EFEA9490D8B82BDF23E435FE7C6167D6A3ED58EC706ED"
625625
},
626626
{
627627
"id": "Razor",
628628
"description": "Razor Language Server (Windows / x86)",
629-
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/b3a60e667dc67edd38d2a7dd1d6ee139/razorlanguageserver-win-x86-7.0.0-preview.23455.5.zip",
629+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/d2ffb8978958712807d88ebf38914f47/razorlanguageserver-win-x86-7.0.0-preview.23456.2.zip",
630630
"installPath": ".razor",
631631
"platforms": [
632632
"win32"
633633
],
634634
"architectures": [
635635
"x86"
636636
],
637-
"integrity": "059FA2081952AAD7CD1E6407B2D47D9AAEEA0F17EA35380ED5B3B26FDD0ED52F"
637+
"integrity": "E2040016EF17B2D181BFD5FD8D03FC2959AF8E909ADD17FABFC87370BBA42802"
638638
},
639639
{
640640
"id": "Razor",
641641
"description": "Razor Language Server (Windows / ARM64)",
642-
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/f9ab8a6e654818635e0cd9e3115b59fc/razorlanguageserver-win-arm64-7.0.0-preview.23455.5.zip",
642+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/d279c139e3d914fec96dfab50f05f438/razorlanguageserver-win-arm64-7.0.0-preview.23456.2.zip",
643643
"installPath": ".razor",
644644
"platforms": [
645645
"win32"
646646
],
647647
"architectures": [
648648
"arm64"
649649
],
650-
"integrity": "80F748457356E766685B17195CE70430938D55783AC976E5BC78395EE2B20622"
650+
"integrity": "FA3FD214F14C61D9E810F36060C09ED7E245697B34371EC705D275BF825E76C4"
651651
},
652652
{
653653
"id": "Razor",
654654
"description": "Razor Language Server (Linux / x64)",
655-
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/8f59b89a029f07d4e5c20b9c2af4ca21/razorlanguageserver-linux-x64-7.0.0-preview.23455.5.zip",
655+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/86a165500517ca828227bfd0f28f7a02/razorlanguageserver-linux-x64-7.0.0-preview.23456.2.zip",
656656
"installPath": ".razor",
657657
"platforms": [
658658
"linux"
@@ -663,12 +663,12 @@
663663
"binaries": [
664664
"./rzls"
665665
],
666-
"integrity": "D3D7BAB056AADD815E9B2D6F85BEF8CF0BEA1D5F662E6E7D07CA484C1AF25934"
666+
"integrity": "1B5F1A6A74FA0ADA04B7061C243FA4CA72591A1973B992A4C25E94A0137FD3DF"
667667
},
668668
{
669669
"id": "Razor",
670670
"description": "Razor Language Server (Linux ARM64)",
671-
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/5320a329751f981f4c994adcbbaf1831/razorlanguageserver-linux-arm64-7.0.0-preview.23455.5.zip",
671+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/af4c33cdb53e85a7de39fb07195e05b2/razorlanguageserver-linux-arm64-7.0.0-preview.23456.2.zip",
672672
"installPath": ".razor",
673673
"platforms": [
674674
"linux"
@@ -679,12 +679,12 @@
679679
"binaries": [
680680
"./rzls"
681681
],
682-
"integrity": "8C520CB788B3D31A519EF98E64BFEF80DC0142438DB91927588B03969A19805C"
682+
"integrity": "37EC155920952719CD76F7E8BFD65EA3D0A2738A675670B5614D23D9542D5DE8"
683683
},
684684
{
685685
"id": "Razor",
686686
"description": "Razor Language Server (Linux musl / x64)",
687-
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/1fe6ed4de9370a8fff70df1133db7889/razorlanguageserver-linux-musl-x64-7.0.0-preview.23455.5.zip",
687+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/e5e12ac99072e02499bef77c2c5034a2/razorlanguageserver-linux-musl-x64-7.0.0-preview.23456.2.zip",
688688
"installPath": ".razor",
689689
"platforms": [
690690
"linux-musl"
@@ -695,12 +695,12 @@
695695
"binaries": [
696696
"./rzls"
697697
],
698-
"integrity": "A8F2D1297BB16226394777BCB6149ED46E08339F639DB46395AFA9109CA59740"
698+
"integrity": "F4399BCEE6192BF3DBA1A6E93DE801075DF1433DF772143B7612FBD60B078361"
699699
},
700700
{
701701
"id": "Razor",
702702
"description": "Razor Language Server (Linux musl ARM64)",
703-
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/ad506dfb1de131553eeb5dffdd83f44d/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23455.5.zip",
703+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/24783517c9a4729efbd7dfd2a97fe5cc/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23456.2.zip",
704704
"installPath": ".razor",
705705
"platforms": [
706706
"linux-musl"
@@ -711,12 +711,12 @@
711711
"binaries": [
712712
"./rzls"
713713
],
714-
"integrity": "4A3A1D3239B0005E3185212E3A77CAAFD52B540C71C9D82FB8EB9998F1ADC29B"
714+
"integrity": "E471B4F4FB70BB22EB689A759BCAD22B12908EC7446BB98EA69EED974E28E9C7"
715715
},
716716
{
717717
"id": "Razor",
718718
"description": "Razor Language Server (macOS / x64)",
719-
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/0b9c653ee9c2815280877865013ab2e4/razorlanguageserver-osx-x64-7.0.0-preview.23455.5.zip",
719+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/b9ee27ddd84b0f4faf82e88589c8584f/razorlanguageserver-osx-x64-7.0.0-preview.23456.2.zip",
720720
"installPath": ".razor",
721721
"platforms": [
722722
"darwin"
@@ -727,12 +727,12 @@
727727
"binaries": [
728728
"./rzls"
729729
],
730-
"integrity": "D3259D7AFDD5C5B0D25BEBB9E6C00EF8F5ACF0932E902E58CDD9FA10E3BB5EE9"
730+
"integrity": "B0C40624FE418E3C47DCDC44DDF0643C7F980A254FEEEB49BAED21A010102EB8"
731731
},
732732
{
733733
"id": "Razor",
734734
"description": "Razor Language Server (macOS ARM64)",
735-
"url": "https://download.visualstudio.microsoft.com/download/pr/1f4eb4b9-e8b7-494b-81eb-29e9ffff39de/350f666a3a714c2c77d0e79e92238ad7/razorlanguageserver-osx-arm64-7.0.0-preview.23455.5.zip",
735+
"url": "https://download.visualstudio.microsoft.com/download/pr/e5617c98-d08e-43f2-a9bf-a36fec5306b7/d61e51f223e6bfeceae821b1cce36bfc/razorlanguageserver-osx-arm64-7.0.0-preview.23456.2.zip",
736736
"installPath": ".razor",
737737
"platforms": [
738738
"darwin"
@@ -743,7 +743,7 @@
743743
"binaries": [
744744
"./rzls"
745745
],
746-
"integrity": "9B28F0F60F2365A25505D6A9C40104A6CEB07D9AD5322609313177C001639C36"
746+
"integrity": "C0C325C057E9392845E19F1918F9DEA56500A4188FC619B5529B2785EB2A1D65"
747747
},
748748
{
749749
"id": "RazorOmnisharp",

‎src/razor/src/semantic/provideSemanticTokensResponse.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { SemanticTokensResponse } from './semanticTokensResponse';
7-
86
export class ProvideSemanticTokensResponse {
97
// tslint:disable-next-line: variable-name
10-
constructor(public Result: SemanticTokensResponse, public HostDocumentSyncVersion: number | null) {}
8+
constructor(public Tokens: Array<Array<number>>, public HostDocumentSyncVersion: number) {}
119
}

‎src/razor/src/semantic/semanticTokensRangeHandler.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import * as vscode from 'vscode';
77
import { RequestType } from 'vscode-languageclient';
88
import { RazorLanguageServerClient } from '../razorLanguageServerClient';
99
import { ProvideSemanticTokensResponse } from './provideSemanticTokensResponse';
10-
import { SemanticTokensResponse } from './semanticTokensResponse';
1110
import { SerializableSemanticTokensParams } from './serializableSemanticTokensParams';
1211

1312
export class SemanticTokensRangeHandler {
@@ -17,10 +16,7 @@ export class SemanticTokensRangeHandler {
1716
ProvideSemanticTokensResponse,
1817
any
1918
> = new RequestType(SemanticTokensRangeHandler.getSemanticTokensRangeEndpoint);
20-
private emptySemanticTokensResponse: ProvideSemanticTokensResponse = new ProvideSemanticTokensResponse(
21-
new SemanticTokensResponse(new Array<number>(), ''),
22-
null
23-
);
19+
private emptyTokensInResponse: Array<Array<number>> = new Array<Array<number>>();
2420

2521
constructor(private readonly serverClient: RazorLanguageServerClient) {}
2622

@@ -44,6 +40,9 @@ export class SemanticTokensRangeHandler {
4440
// (2) there seems to be an issue with the semantic tokens execute command - possibly either O# not
4541
// returning tokens, or an issue with the command itself:
4642
// https://github.com/dotnet/razor/issues/6922
47-
return this.emptySemanticTokensResponse;
43+
return new ProvideSemanticTokensResponse(
44+
this.emptyTokensInResponse,
45+
_semanticTokensParams.requiredHostDocumentVersion
46+
);
4847
}
4948
}

‎src/razor/src/semantic/semanticTokensResponse.ts‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/razor/src/semantic/serializableSemanticTokensParams.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import { SerializableRange } from '../rpc/serializableRange';
77
import { SerializableTextDocumentIdentifier } from '../rpc/serializableTextDocumentIdentifier';
88

99
export interface SerializableSemanticTokensParams {
10+
correlationId: string;
1011
textDocument: SerializableTextDocumentIdentifier;
11-
range: SerializableRange;
12+
ranges: SerializableRange[];
13+
requiredHostDocumentVersion: number;
1214
}

0 commit comments

Comments
 (0)