From 1aff9d0031f8846e836d4050aee6ab9de49b5f12 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 12 Dec 2017 10:26:42 -0800 Subject: [PATCH] Make RazorEditorFactoryService VS agnostic. - Moved the editor factory service into the Editor dll. It did not have any windows specific functionality within it. #1789 --- .../DefaultRazorEditorFactoryService.cs | 5 ++--- .../DefaultRazorEditorFactoryServiceTest.cs | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) rename src/{Microsoft.VisualStudio.LanguageServices.Razor/Editor => Microsoft.VisualStudio.Editor.Razor}/DefaultRazorEditorFactoryService.cs (97%) rename test/{Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor => Microsoft.VisualStudio.Editor.Razor.Test}/DefaultRazorEditorFactoryServiceTest.cs (98%) diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultRazorEditorFactoryService.cs b/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorEditorFactoryService.cs similarity index 97% rename from src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultRazorEditorFactoryService.cs rename to src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorEditorFactoryService.cs index 71cc07f20d..c795c1462d 100644 --- a/src/Microsoft.VisualStudio.LanguageServices.Razor/Editor/DefaultRazorEditorFactoryService.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorEditorFactoryService.cs @@ -5,10 +5,9 @@ using System; using System.ComponentModel.Composition; using System.Diagnostics; using Microsoft.CodeAnalysis.Razor; -using Microsoft.VisualStudio.Editor.Razor; using Microsoft.VisualStudio.Text; -namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor +namespace Microsoft.VisualStudio.Editor.Razor { [System.Composition.Shared] [Export(typeof(RazorEditorFactoryService))] @@ -74,7 +73,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor } EnsureTextBufferInitialized(textBuffer); - + if (!textBuffer.Properties.TryGetProperty(typeof(VisualStudioDocumentTracker), out documentTracker)) { Debug.Fail("Document tracker should have been stored on the text buffer during initialization."); diff --git a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor/DefaultRazorEditorFactoryServiceTest.cs b/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorEditorFactoryServiceTest.cs similarity index 98% rename from test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor/DefaultRazorEditorFactoryServiceTest.cs rename to test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorEditorFactoryServiceTest.cs index f92620cec7..af4e81ea95 100644 --- a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor/DefaultRazorEditorFactoryServiceTest.cs +++ b/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultRazorEditorFactoryServiceTest.cs @@ -2,13 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.CodeAnalysis.Razor; -using Microsoft.VisualStudio.Editor.Razor; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Utilities; using Moq; using Xunit; -namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor +namespace Microsoft.VisualStudio.Editor.Razor { public class DefaultRazorEditorFactoryServiceTest {