Skip to content

Move completion resolve code to common layer #11156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexgav merged 4 commits into from
Nov 11, 2024
Merged

Move completion resolve code to common layer #11156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
782d8cd
Move completion resolve code to common layer
alexgav Nov 3, 2024
c465bfb
Undo move of IProjectSnapshotManagerExtensions and MiscFilesHostProje…
alexgav Nov 8, 2024
ced3320
Undo unnecessary changes in tests
alexgav Nov 11, 2024
bf7559e
Refactor the code to remove usage of IProjectSnapshotManager
alexgav Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...letion/AggregateCompletionItemResolver.cs → ...letion/AggregateCompletionItemResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
using Microsoft.CodeAnalysis.Razor.Logging;
using Microsoft.VisualStudio.LanguageServer.Protocol;

namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion;
namespace Microsoft.CodeAnalysis.Razor.Completion;

internal class AggregateCompletionItemResolver
{
Expand Down
2 changes: 1 addition & 1 deletion ...rver/Completion/CompletionItemResolver.cs → ...aces/Completion/CompletionItemResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Microsoft.VisualStudio.LanguageServer.Protocol;

namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion;
namespace Microsoft.CodeAnalysis.Razor.Completion;

internal abstract class CompletionItemResolver
{
Expand Down
4 changes: 1 addition & 3 deletions ...Completion/RazorCompletionItemResolver.cs → ...Completion/RazorCompletionItemResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Razor.Completion;
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
using Microsoft.CodeAnalysis.Razor.Tooltip;
using Microsoft.VisualStudio.LanguageServer.Protocol;
using Microsoft.VisualStudio.Text.Adornments;

namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion;
namespace Microsoft.CodeAnalysis.Razor.Completion;

internal class RazorCompletionItemResolver(IProjectSnapshotManager projectManager) : CompletionItemResolver
{
Expand Down
4 changes: 1 addition & 3 deletions ...agerExtensions.SolutionQueryOperations.cs → ...agerExtensions.SolutionQueryOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using Microsoft.AspNetCore.Razor.PooledObjects;
using Microsoft.AspNetCore.Razor.Utilities;
using Microsoft.CodeAnalysis.Razor.ProjectSystem;

namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;

internal static partial class IProjectSnapshotManagerExtensions
{
Expand Down
4 changes: 1 addition & 3 deletions ...stem/IProjectSnapshotManagerExtensions.cs → ...stem/IProjectSnapshotManagerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
using System.Linq;
using Microsoft.AspNetCore.Razor.PooledObjects;
using Microsoft.AspNetCore.Razor.Utilities;
using Microsoft.CodeAnalysis.Razor;
using Microsoft.CodeAnalysis.Razor.Logging;
using Microsoft.CodeAnalysis.Razor.ProjectSystem;

namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;

internal static partial class IProjectSnapshotManagerExtensions
{
Expand Down
4 changes: 1 addition & 3 deletions ...ver/ProjectSystem/MiscFilesHostProject.cs → ...ces/ProjectSystem/MiscFilesHostProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
using System.IO;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.Utilities;
using Microsoft.CodeAnalysis.Razor;
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
using Microsoft.Extensions.Internal;

namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;

internal sealed record class MiscFilesHostProject : HostProject
{
Expand Down
12 changes: 6 additions & 6 deletions ...zor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Tooltip/ProjectAvailabilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
using Microsoft.AspNetCore.Razor.ProjectSystem;
using Microsoft.AspNetCore.Razor.Test.Common;
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
using Microsoft.CodeAnalysis.Razor.Workspaces.Test;
using Roslyn.Test.Utilities;
using Xunit;
using Xunit.Abstractions;
using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
using IProjectSnapshotManagerExtensions = Microsoft.CodeAnalysis.Razor.Workspaces.Test.IProjectSnapshotManagerExtensions;

namespace Microsoft.CodeAnalysis.Razor.Tooltip;

Expand All @@ -22,7 +22,7 @@ public class ProjectAvailabilityTests(ITestOutputHelper testOutput) : ToolingTes
public async Task GetProjectAvailabilityText_NoProjects_ReturnsNull()
{
var projectManager = CreateProjectSnapshotManager();
var solutionQueryOperations = projectManager.GetQueryOperations();
var solutionQueryOperations = IProjectSnapshotManagerExtensions.GetQueryOperations(projectManager);

var availability = await solutionQueryOperations.GetProjectAvailabilityTextAsync("file.razor", "MyTagHelper", DisposalToken);

Expand Down Expand Up @@ -60,7 +60,7 @@ await projectManager.UpdateAsync(updater =>
updater.DocumentAdded(hostProject.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
});

var solutionQueryOperations = projectManager.GetQueryOperations();
var solutionQueryOperations = IProjectSnapshotManagerExtensions.GetQueryOperations(projectManager);

var availability = await solutionQueryOperations.GetProjectAvailabilityTextAsync(hostDocument.FilePath, tagHelperTypeName, DisposalToken);

Expand Down Expand Up @@ -109,7 +109,7 @@ await projectManager.UpdateAsync(updater =>
updater.DocumentAdded(hostProject2.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
});

var solutionQueryOperations = projectManager.GetQueryOperations();
var solutionQueryOperations = IProjectSnapshotManagerExtensions.GetQueryOperations(projectManager);

var availability = await solutionQueryOperations.GetProjectAvailabilityTextAsync(hostDocument.FilePath, tagHelperTypeName, DisposalToken);

Expand Down Expand Up @@ -157,7 +157,7 @@ await projectManager.UpdateAsync(updater =>
updater.DocumentAdded(hostProject2.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
});

var solutionQueryOperations = projectManager.GetQueryOperations();
var solutionQueryOperations = IProjectSnapshotManagerExtensions.GetQueryOperations(projectManager);

var availability = await solutionQueryOperations.GetProjectAvailabilityTextAsync(hostDocument.FilePath, tagHelperTypeName, DisposalToken);

Expand Down Expand Up @@ -201,7 +201,7 @@ await projectManager.UpdateAsync(updater =>
updater.DocumentAdded(hostProject2.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
});

var solutionQueryOperations = projectManager.GetQueryOperations();
var solutionQueryOperations = IProjectSnapshotManagerExtensions.GetQueryOperations(projectManager);

var availability = await solutionQueryOperations.GetProjectAvailabilityTextAsync(hostDocument.FilePath, "MyTagHelper", DisposalToken);

Expand Down