From 44e58740290f8622f8f83ecf7c3ff5c7728b64b6 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Mon, 13 Nov 2017 12:42:47 -0800 Subject: [PATCH] Move RazorSyntaxFactsService to VS.Editor.Razor and export it. - Moved service poco types: `AcceptedCharacters`, `BlockKind`, `ClassifiedSpan`, `SpanKind` and `TagHelperSpan` into VS.Editor.Razor. #1762 --- .../DefaultRazorSyntaxFactsServiceFactory.cs | 17 ----------------- .../AcceptedCharacters.cs | 2 +- .../BlockKind.cs | 2 +- .../ClassifiedSpan.cs | 2 +- .../DefaultRazorSyntaxFactsService.cs | 5 ++++- .../RazorSyntaxFactsService.cs | 3 ++- .../SpanKind.cs | 2 +- .../TagHelperSpan.cs | 2 +- 8 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorSyntaxFactsServiceFactory.cs rename src/{Microsoft.CodeAnalysis.Razor.Workspaces => Microsoft.VisualStudio.Editor.Razor}/AcceptedCharacters.cs (91%) rename src/{Microsoft.CodeAnalysis.Razor.Workspaces => Microsoft.VisualStudio.Editor.Razor}/BlockKind.cs (90%) rename src/{Microsoft.CodeAnalysis.Razor.Workspaces => Microsoft.VisualStudio.Editor.Razor}/ClassifiedSpan.cs (94%) rename src/{Microsoft.CodeAnalysis.Razor.Workspaces => Microsoft.VisualStudio.Editor.Razor}/DefaultRazorSyntaxFactsService.cs (96%) rename src/{Microsoft.CodeAnalysis.Razor.Workspaces => Microsoft.VisualStudio.Editor.Razor}/RazorSyntaxFactsService.cs (87%) rename src/{Microsoft.CodeAnalysis.Razor.Workspaces => Microsoft.VisualStudio.Editor.Razor}/SpanKind.cs (86%) rename src/{Microsoft.CodeAnalysis.Razor.Workspaces => Microsoft.VisualStudio.Editor.Razor}/TagHelperSpan.cs (94%) diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorSyntaxFactsServiceFactory.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorSyntaxFactsServiceFactory.cs deleted file mode 100644 index af38ae47e7..0000000000 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorSyntaxFactsServiceFactory.cs +++ /dev/null @@ -1,17 +0,0 @@ -// 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 Microsoft.CodeAnalysis.Host; -using Microsoft.CodeAnalysis.Host.Mef; - -namespace Microsoft.CodeAnalysis.Razor -{ - [ExportLanguageServiceFactory(typeof(RazorSyntaxFactsService), RazorLanguage.Name, ServiceLayer.Default)] - internal class DefaultRazorSyntaxFactsServiceFactory : ILanguageServiceFactory - { - public ILanguageService CreateLanguageService(HostLanguageServices languageServices) - { - return new DefaultRazorSyntaxFactsService(); - } - } -} \ No newline at end of file diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/AcceptedCharacters.cs b/src/Microsoft.VisualStudio.Editor.Razor/AcceptedCharacters.cs similarity index 91% rename from src/Microsoft.CodeAnalysis.Razor.Workspaces/AcceptedCharacters.cs rename to src/Microsoft.VisualStudio.Editor.Razor/AcceptedCharacters.cs index 108513d9bd..1d9ba282e9 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/AcceptedCharacters.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/AcceptedCharacters.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.CodeAnalysis.Razor +namespace Microsoft.VisualStudio.Editor.Razor { [Flags] public enum AcceptedCharacters diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/BlockKind.cs b/src/Microsoft.VisualStudio.Editor.Razor/BlockKind.cs similarity index 90% rename from src/Microsoft.CodeAnalysis.Razor.Workspaces/BlockKind.cs rename to src/Microsoft.VisualStudio.Editor.Razor/BlockKind.cs index abb703173a..48ad2e4fb4 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/BlockKind.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/BlockKind.cs @@ -1,7 +1,7 @@ // 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.CodeAnalysis.Razor +namespace Microsoft.VisualStudio.Editor.Razor { public enum BlockKind { diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/ClassifiedSpan.cs b/src/Microsoft.VisualStudio.Editor.Razor/ClassifiedSpan.cs similarity index 94% rename from src/Microsoft.CodeAnalysis.Razor.Workspaces/ClassifiedSpan.cs rename to src/Microsoft.VisualStudio.Editor.Razor/ClassifiedSpan.cs index 01684066e3..dc066c8fce 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/ClassifiedSpan.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/ClassifiedSpan.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.CodeAnalysis.Razor +namespace Microsoft.VisualStudio.Editor.Razor { public struct ClassifiedSpan { diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorSyntaxFactsService.cs b/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorSyntaxFactsService.cs similarity index 96% rename from src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorSyntaxFactsService.cs rename to src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorSyntaxFactsService.cs index 96590bb165..b6cbfe50af 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultRazorSyntaxFactsService.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorSyntaxFactsService.cs @@ -3,13 +3,16 @@ using System; using System.Collections.Generic; +using System.ComponentModel.Composition; using System.Linq; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Legacy; using Span = Microsoft.AspNetCore.Razor.Language.Legacy.Span; -namespace Microsoft.CodeAnalysis.Razor +namespace Microsoft.VisualStudio.Editor.Razor { + [System.Composition.Shared] + [Export(typeof(RazorSyntaxFactsService))] internal class DefaultRazorSyntaxFactsService : RazorSyntaxFactsService { public override IReadOnlyList GetClassifiedSpans(RazorSyntaxTree syntaxTree) diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorSyntaxFactsService.cs b/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsService.cs similarity index 87% rename from src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorSyntaxFactsService.cs rename to src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsService.cs index d63a34cda7..fc47c81991 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorSyntaxFactsService.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/RazorSyntaxFactsService.cs @@ -4,8 +4,9 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.Host; +using Microsoft.CodeAnalysis.Razor; -namespace Microsoft.CodeAnalysis.Razor +namespace Microsoft.VisualStudio.Editor.Razor { public abstract class RazorSyntaxFactsService : ILanguageService { diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/SpanKind.cs b/src/Microsoft.VisualStudio.Editor.Razor/SpanKind.cs similarity index 86% rename from src/Microsoft.CodeAnalysis.Razor.Workspaces/SpanKind.cs rename to src/Microsoft.VisualStudio.Editor.Razor/SpanKind.cs index c76a471f34..8e66d13408 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/SpanKind.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/SpanKind.cs @@ -1,7 +1,7 @@ // 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.CodeAnalysis.Razor +namespace Microsoft.VisualStudio.Editor.Razor { public enum SpanKind { diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperSpan.cs b/src/Microsoft.VisualStudio.Editor.Razor/TagHelperSpan.cs similarity index 94% rename from src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperSpan.cs rename to src/Microsoft.VisualStudio.Editor.Razor/TagHelperSpan.cs index 69654e3f06..15a88dee7a 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperSpan.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/TagHelperSpan.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.CodeAnalysis.Razor +namespace Microsoft.VisualStudio.Editor.Razor { public struct TagHelperSpan {