From 98019dd4f909d445be398917f79489f62be7968a Mon Sep 17 00:00:00 2001 From: dibarbet Date: Fri, 26 Jul 2024 23:01:15 +0000 Subject: [PATCH 1/7] Update main version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 087c91fcd..8fcdcb14f 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.41", + "version": "2.42", "publicReleaseRefSpec": [ "^refs/heads/release$", "^refs/heads/prerelease$", From bdca8b67071ac94fae2f79c8ff600a84dc614102 Mon Sep 17 00:00:00 2001 From: Jordi Ramos Date: Mon, 29 Jul 2024 15:09:14 -0700 Subject: [PATCH 2/7] Fix completion handler bug that causes language server to crash (#7401) filter out incorrect request, can be undone after issue # 7250 is resolved --- src/razor/src/completion/completionHandler.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/razor/src/completion/completionHandler.ts b/src/razor/src/completion/completionHandler.ts index bf45e7a8f..1ca47a316 100644 --- a/src/razor/src/completion/completionHandler.ts +++ b/src/razor/src/completion/completionHandler.ts @@ -156,7 +156,10 @@ export class CompletionHandler { // TODO: Snippet support try { - if (delegatedCompletionItemResolveParams.originatingKind != LanguageKind.CSharp) { + if ( + delegatedCompletionItemResolveParams.originatingKind != LanguageKind.CSharp || + delegatedCompletionItemResolveParams.completionItem.data.TextDocument == null + ) { return delegatedCompletionItemResolveParams.completionItem; } else { const newItem = await vscode.commands.executeCommand( From 0ba9137ec6ae4518ac4535415332af7238e66293 Mon Sep 17 00:00:00 2001 From: Jordi Ramos Date: Mon, 29 Jul 2024 15:09:14 -0700 Subject: [PATCH 3/7] Fix completion handler bug that causes language server to crash (#7401) filter out incorrect request, can be undone after issue # 7250 is resolved --- src/razor/src/completion/completionHandler.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/razor/src/completion/completionHandler.ts b/src/razor/src/completion/completionHandler.ts index bf45e7a8f..1ca47a316 100644 --- a/src/razor/src/completion/completionHandler.ts +++ b/src/razor/src/completion/completionHandler.ts @@ -156,7 +156,10 @@ export class CompletionHandler { // TODO: Snippet support try { - if (delegatedCompletionItemResolveParams.originatingKind != LanguageKind.CSharp) { + if ( + delegatedCompletionItemResolveParams.originatingKind != LanguageKind.CSharp || + delegatedCompletionItemResolveParams.completionItem.data.TextDocument == null + ) { return delegatedCompletionItemResolveParams.completionItem; } else { const newItem = await vscode.commands.executeCommand( From 9c29b1b3adacc5fff7ccd5864a96437235406ad4 Mon Sep 17 00:00:00 2001 From: Liz Hare Date: Wed, 31 Jul 2024 11:50:43 -0400 Subject: [PATCH 4/7] UI Tools Bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2e5ce3cd..805d41898 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "omniSharp": "1.39.11", "razor": "9.0.0-preview.24366.2", "razorOmnisharp": "7.0.0-preview.23363.1", - "xamlTools": "17.12.35126.17" + "xamlTools": "17.12.35131.21" }, "main": "./dist/extension", "l10n": "./l10n", From 8119aec42c6f56aa6a5573672a46d2d2edfb27d9 Mon Sep 17 00:00:00 2001 From: Liz Hare Date: Wed, 31 Jul 2024 11:52:36 -0400 Subject: [PATCH 5/7] Changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5522397c1..f87b89db5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ - 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) +# Latest +* Bump xamltools to 17.12.35131.21 (PR: [#7409](https://github.com/dotnet/vscode-csharp/pull/7409)) + # 2.41.x * Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393)) * Fix race condition in LSP FindAllReferences when linked files were involved.(PR: [#74566](https://github.com/dotnet/roslyn/pull/74566)) From dd5f35a4d4638416deb1a4b5871808ff7b445d1f Mon Sep 17 00:00:00 2001 From: David Barbet Date: Fri, 2 Aug 2024 13:57:08 -0700 Subject: [PATCH 6/7] Upgrade roslyn version --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f87b89db5..2d783b6f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # Latest +* Bump Roslyn to 4.12.0-2.24401.2 (PR: [#7413](https://github.com/dotnet/vscode-csharp/pull/7413)) + * Reduce allocations in SyntaxEquivalence.AreEquivalent by using a more appropriate pooling mechanism for the stack it uses to walk trees. (PR: [#74610](https://github.com/dotnet/roslyn/pull/74610)) + * Reduce allocations in SyntaxNodeExtensions.GetMembers to instead execute a given lambda over the collection. (PR: [#74628](https://github.com/dotnet/roslyn/pull/74628)) + * Modify ISyntaxFacts methods to allocate less (PR: [#74596](https://github.com/dotnet/roslyn/pull/74596)) + * Fix cases where unused private members were not grayed out (PR: [#74589](https://github.com/dotnet/roslyn/pull/74589)) + * Fix URI handling when comparing encoded and unencoded URIs (PR: [#74544](https://github.com/dotnet/roslyn/pull/74544)) * Bump xamltools to 17.12.35131.21 (PR: [#7409](https://github.com/dotnet/vscode-csharp/pull/7409)) # 2.41.x diff --git a/package.json b/package.json index 805d41898..2aa0d15d4 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ } }, "defaults": { - "roslyn": "4.12.0-1.24376.3", + "roslyn": "4.12.0-2.24401.2", "omniSharp": "1.39.11", "razor": "9.0.0-preview.24366.2", "razorOmnisharp": "7.0.0-preview.23363.1", From 39718699d0f9a6c2e731db88fe1fad9cfc59aa21 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 16:02:28 -0700 Subject: [PATCH 7/7] Fix completion handler bug that causes language server to crash (#7401) (#7406) filter out incorrect request, can be undone after issue # 7250 is resolved Co-authored-by: Jordi Ramos Co-authored-by: David Barbet