diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c7fae0d1..ebd5041c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,13 @@ - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951) - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) -# 2.150.x +# 2.151.x +* Update Roslyn to 5.12.0-1.26452.1 (PR: [#9725](https://github.com/dotnet/vscode-csharp/pull/9725)) + * Ignore spurious TypeScript diagnostics caused by Razor code (PR: [#85129](https://github.com/dotnet/roslyn/pull/85129)) + * Clamp LSP position character to the line end (PR: [#85125](https://github.com/dotnet/roslyn/pull/85125)) + * Fix IDE0002 for static abstract and virtual interface member access (PR: [#85037](https://github.com/dotnet/roslyn/pull/85037)) + * Don't reload the entire project if only a cs file changes (PR: [#85091](https://github.com/dotnet/roslyn/pull/85091)) + * Prevent Introduce Constant crash in top-level lambdas (PR: [#85071](https://github.com/dotnet/roslyn/pull/85071)) * Update Roslyn to 5.12.0-1.26428.1 (PR: [#9712](https://github.com/dotnet/vscode-csharp/pull/9712)) * Fix extra newline after primary constructor parameter (PR: [#85030](https://github.com/dotnet/roslyn/pull/85030)) * Read unopened LSP files from disk without persisting them (PR: [#85061](https://github.com/dotnet/roslyn/pull/85061)) diff --git a/package.json b/package.json index e0cc57320..186923237 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "workspace" ], "defaults": { - "roslyn": "5.12.0-1.26428.1", + "roslyn": "5.12.0-1.26452.1", "omniSharp": "1.39.14", "razorOmnisharp": "7.0.0-preview.23363.1", "xamlTools": "18.10.12014.341", diff --git a/test/razor/razorIntegrationTests/reference.integration.test.ts b/test/razor/razorIntegrationTests/reference.integration.test.ts index db16443eb..067ed0b05 100644 --- a/test/razor/razorIntegrationTests/reference.integration.test.ts +++ b/test/razor/razorIntegrationTests/reference.integration.test.ts @@ -46,7 +46,7 @@ describe(`Razor References ${testAssetWorkspace.description}`, function () { expect(locations.length).toBe(1); const definitionLocation = locations[0]; - expect(definitionLocation.uri.path).toBe(vscode.window.activeTextEditor!.document.uri.path); + integrationHelpers.expectPath(vscode.window.activeTextEditor!.document.uri, definitionLocation.uri); expect(definitionLocation.range.start.line).toBe(11); expect(definitionLocation.range.start.character).toBe(16); expect(definitionLocation.range.end.line).toBe(11); @@ -74,21 +74,21 @@ describe(`Razor References ${testAssetWorkspace.description}`, function () { expect(locations.length).toBe(3); let definitionLocation = locations[0]; - expect(definitionLocation.uri.path).toBe(vscode.window.activeTextEditor!.document.uri.path); + integrationHelpers.expectPath(vscode.window.activeTextEditor!.document.uri, definitionLocation.uri); expect(definitionLocation.range.start.line).toBe(6); expect(definitionLocation.range.start.character).toBe(33); expect(definitionLocation.range.end.line).toBe(6); expect(definitionLocation.range.end.character).toBe(45); definitionLocation = locations[1]; - expect(definitionLocation.uri.path).toBe(vscode.window.activeTextEditor!.document.uri.path); + integrationHelpers.expectPath(vscode.window.activeTextEditor!.document.uri, definitionLocation.uri); expect(definitionLocation.range.start.line).toBe(11); expect(definitionLocation.range.start.character).toBe(16); expect(definitionLocation.range.end.line).toBe(11); expect(definitionLocation.range.end.character).toBe(28); definitionLocation = locations[2]; - expect(definitionLocation.uri.path).toBe(vscode.window.activeTextEditor!.document.uri.path); + integrationHelpers.expectPath(vscode.window.activeTextEditor!.document.uri, definitionLocation.uri); expect(definitionLocation.range.start.line).toBe(15); expect(definitionLocation.range.start.character).toBe(8); expect(definitionLocation.range.end.line).toBe(15); @@ -117,7 +117,7 @@ describe(`Razor References ${testAssetWorkspace.description}`, function () { expect(locations.length).toBe(1); const definitionLocation = locations[0]; - expect(definitionLocation.uri.path).toBe(vscode.window.activeTextEditor!.document.uri.path); + integrationHelpers.expectPath(vscode.window.activeTextEditor!.document.uri, definitionLocation.uri); expect(definitionLocation.range.start.line).toBe(23); expect(definitionLocation.range.start.character).toBe(10); expect(definitionLocation.range.end.line).toBe(23);