Skip to content

Commit b2c6d96

Browse files
author
Andrew Hall
authored
Fix EA layering for Razor.ExternalAccess (#77927)
Moves things to /Shared to ship in both MS.CA.EA.Razor and MS.CA.EA.Razor.Features At some point we can rename MS.CA.EA.Razor to MS.CA.EA.Razor.EditorFeatures but I didn't bother with that in this PR Shipping in both to not require dual insertion. We can fix this after a consuming change in Razor is inserted
1 parent b6d2dc0 commit b2c6d96

File tree

86 files changed

+102
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+102
-6
lines changed

src/LanguageServer/ProtocolUnitTests/Completion/CompletionResolveTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
using Microsoft.CodeAnalysis.Options;
1717
using Microsoft.CodeAnalysis.Shared.TestHooks;
1818
using Microsoft.CodeAnalysis.Text;
19-
using Microsoft.VisualStudio.Text.Adornments;
2019
using Roslyn.LanguageServer.Protocol;
2120
using Roslyn.Test.Utilities;
21+
using Roslyn.Text.Adornments;
2222
using Xunit;
2323
using Xunit.Abstractions;
2424
using LSP = Roslyn.LanguageServer.Protocol;
@@ -423,7 +423,7 @@ private static VSInternalCompletionItem CreateResolvedCompletionItem(
423423
};
424424
}
425425

426-
expectedCompletionItem.Description = description.ToLSPElement();
426+
expectedCompletionItem.Description = description;
427427
return expectedCompletionItem;
428428
}
429429

src/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
2424
<ProjectReference Include="..\..\Compilers\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" />
2525
<ProjectReference Include="..\..\Compilers\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.vbproj" />
26+
<ProjectReference Include="..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
2627
<ProjectReference Include="..\..\Interactive\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" />
2728
<ProjectReference Include="..\..\Scripting\Core\Microsoft.CodeAnalysis.Scripting.csproj" />
2829
<ProjectReference Include="..\..\Scripting\CSharp\Microsoft.CodeAnalysis.CSharp.Scripting.csproj" />

src/Tools/ExternalAccess/Razor/EditorFeatures/RazorDynamicFileInfoProviderWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.Razor
1414
[Shared]
1515
[ExportMetadata("Extensions", new string[] { "cshtml", "razor", })]
1616
[Export(typeof(IDynamicFileInfoProvider))]
17-
internal sealed class RazorDynamicFileInfoProviderWrapper : IDynamicFileInfoProvider
17+
internal class RazorDynamicFileInfoProviderWrapper : IDynamicFileInfoProvider
1818
{
1919
private readonly Lazy<IRazorDynamicFileInfoProvider> _innerDynamicFileInfoProvider;
2020
private readonly object _attachLock = new object();

src/Tools/ExternalAccess/Razor/Features/AbstractRazorLspServiceFactory.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
6+
using System.Collections.Generic;
57
using System.Diagnostics.CodeAnalysis;
68
using Microsoft.CodeAnalysis.LanguageServer;
79

src/Tools/ExternalAccess/Razor/Features/AbstractRazorNotificationHandler.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.Threading;
6+
using System.Threading.Tasks;
57
using Microsoft.CodeAnalysis.LanguageServer.Handler;
68

79
namespace Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;

src/Tools/ExternalAccess/Razor/Features/AbstractRazorRequestHandler.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.Threading;
6+
using System.Threading.Tasks;
57
using Microsoft.CodeAnalysis.LanguageServer.Handler;
68
using Microsoft.CommonLanguageServerProtocol.Framework;
79

src/Tools/ExternalAccess/Razor/Features/ExportRazorLspServiceFactoryAttribute.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Composition;
67
using Microsoft.CodeAnalysis.LanguageServer;
78

src/Tools/ExternalAccess/Razor/Features/ExportRazorStatelessLspServiceAttribute.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Composition;
67
using Microsoft.CodeAnalysis.LanguageServer;
78

src/Tools/ExternalAccess/Razor/Features/IRazorLspServices.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
6+
using System.Collections.Generic;
57
using System.Diagnostics.CodeAnalysis;
68

79
namespace Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;

src/Tools/ExternalAccess/Razor/Features/IRazorRequestWrapper.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.Threading;
6+
using System.Threading.Tasks;
7+
58
namespace Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
69

710
internal interface IRazorRequestWrapper

0 commit comments

Comments
 (0)