From 2b1bdb7342bec94dfc6fa9fb36723d12db7b3ab1 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Mon, 17 Sep 2018 17:50:28 -0700 Subject: [PATCH] Move RazorCompletionFactsService to CodeAnalysis.Workspaces.Razor. - Also updated workspaces test project to also compile for netcoreapp2.2. --- .../DefaultRazorCompletionFactsService.cs | 10 ++++------ .../RazorCompletionFactsService.cs | 4 ++-- .../RazorCompletionItem.cs | 4 ++-- .../RazorCompletionItemKind.cs | 4 ++-- .../RazorDirectiveCompletionProvider.cs | 1 + ...ft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj | 2 +- .../DefaultRazorCompletionFactsServiceTest.cs | 2 +- .../RazorDirectiveCompletionProviderTest.cs | 1 + .../RazorDirectiveCompletionSourceTest.cs | 1 + 9 files changed, 15 insertions(+), 14 deletions(-) rename src/{Microsoft.VisualStudio.Editor.Razor => Microsoft.CodeAnalysis.Razor.Workspaces}/DefaultRazorCompletionFactsService.cs (92%) rename src/{Microsoft.VisualStudio.Editor.Razor => Microsoft.CodeAnalysis.Razor.Workspaces}/RazorCompletionFactsService.cs (79%) rename src/{Microsoft.VisualStudio.Editor.Razor => Microsoft.CodeAnalysis.Razor.Workspaces}/RazorCompletionItem.cs (92%) rename src/{Microsoft.VisualStudio.Editor.Razor => Microsoft.CodeAnalysis.Razor.Workspaces}/RazorCompletionItemKind.cs (70%) rename test/{Microsoft.VisualStudio.Editor.Razor.Test => Microsoft.CodeAnalysis.Razor.Workspaces.Test}/DefaultRazorCompletionFactsServiceTest.cs (99%) diff --git a/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorCompletionFactsService.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorCompletionFactsService.cs similarity index 92% rename from src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorCompletionFactsService.cs rename to src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorCompletionFactsService.cs index 2f9146eab2..17c0664f4a 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorCompletionFactsService.cs +++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorCompletionFactsService.cs @@ -1,17 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Collections.Generic; -using System.ComponentModel.Composition; +using System.Composition; using System.Linq; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Legacy; -using Microsoft.AspNetCore.Razor.Language.Syntax; -namespace Microsoft.VisualStudio.Editor.Razor +namespace Microsoft.CodeAnalysis.Razor { - [System.Composition.Shared] + [Shared] [Export(typeof(RazorCompletionFactsService))] internal class DefaultRazorCompletionFactsService : RazorCompletionFactsService { @@ -84,7 +82,7 @@ namespace Microsoft.VisualStudio.Editor.Razor } // Internal for testing - internal static bool IsDirectiveCompletableToken(SyntaxToken token) + internal static bool IsDirectiveCompletableToken(AspNetCore.Razor.Language.Syntax.SyntaxToken token) { return token.Kind == SyntaxKind.Identifier || // Marker symbol diff --git a/src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionFactsService.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionFactsService.cs similarity index 79% rename from src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionFactsService.cs rename to src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionFactsService.cs index 2995b49007..f5051dd536 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionFactsService.cs +++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionFactsService.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.VisualStudio.Editor.Razor +namespace Microsoft.CodeAnalysis.Razor { - public abstract class RazorCompletionFactsService + internal abstract class RazorCompletionFactsService { public abstract IReadOnlyList GetCompletionItems(RazorSyntaxTree syntaxTree, SourceSpan location); } diff --git a/src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionItem.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItem.cs similarity index 92% rename from src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionItem.cs rename to src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItem.cs index 6b88af94f3..87bf19c858 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionItem.cs +++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItem.cs @@ -3,9 +3,9 @@ using System; -namespace Microsoft.VisualStudio.Editor.Razor +namespace Microsoft.CodeAnalysis.Razor { - public sealed class RazorCompletionItem + internal sealed class RazorCompletionItem { public RazorCompletionItem( string displayText, diff --git a/src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionItemKind.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItemKind.cs similarity index 70% rename from src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionItemKind.cs rename to src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItemKind.cs index 89ed05205e..64d2e1ccca 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/RazorCompletionItemKind.cs +++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorCompletionItemKind.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.VisualStudio.Editor.Razor +namespace Microsoft.CodeAnalysis.Razor { - public enum RazorCompletionItemKind + internal enum RazorCompletionItemKind { Directive } diff --git a/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs b/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs index 2b4788dad9..8b04eebdce 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs @@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Legacy; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Completion; +using Microsoft.CodeAnalysis.Razor; using Microsoft.CodeAnalysis.Tags; using Microsoft.CodeAnalysis.Text; using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion; diff --git a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj index c32bd85577..8e43f27fea 100644 --- a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj +++ b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common/Microsoft.CodeAnalysis.Razor.Workspaces.Test.Common.csproj @@ -1,7 +1,7 @@  - net46;$(StandardTestTfms) + net46;netcoreapp2.2;$(StandardTestTfms) diff --git a/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorCompletionFactsServiceTest.cs b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultRazorCompletionFactsServiceTest.cs similarity index 99% rename from test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorCompletionFactsServiceTest.cs rename to test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultRazorCompletionFactsServiceTest.cs index cfdf53b194..d9b107f69e 100644 --- a/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorCompletionFactsServiceTest.cs +++ b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultRazorCompletionFactsServiceTest.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Razor.Language.Syntax; using Moq; using Xunit; -namespace Microsoft.VisualStudio.Editor.Razor +namespace Microsoft.CodeAnalysis.Razor { public class DefaultRazorCompletionFactsServiceTest { diff --git a/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs b/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs index cd35510b36..7180a72937 100644 --- a/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs +++ b/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Completion; using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.Razor; using Microsoft.CodeAnalysis.Text; using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion; using Microsoft.VisualStudio.Text; diff --git a/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceTest.cs b/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceTest.cs index 1c9516fa8a..6a151f0546 100644 --- a/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceTest.cs +++ b/test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionSourceTest.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Extensions; using Microsoft.AspNetCore.Razor.Language.Legacy; +using Microsoft.CodeAnalysis.Razor; using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion; using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion.Data; using Microsoft.VisualStudio.Text;