huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved RazorTextBufferProvider from Mef to ILanguageService

This commit is contained in:
Ajay Bhargav Baaskaran 2017-12-11 16:47:44 -08:00
parent fb68a31ad5
commit 6b8223b544
4 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Microsoft.VisualStudio.Editor.Razor/DefaultCodeDocumentProviderFactory.cs
View File

@ -13,19 +13,6 @@ namespace Microsoft.VisualStudio.Editor.Razor
[ExportLanguageServiceFactory(typeof(RazorCodeDocumentProvider), RazorLanguage.Name)]
internal class DefaultCodeDocumentProviderFactory : ILanguageServiceFactory
{
private readonly RazorTextBufferProvider _textBufferProvider;
[ImportingConstructor]
public DefaultCodeDocumentProviderFactory(RazorTextBufferProvider bufferProvider)
{
if (bufferProvider == null)
{
throw new ArgumentNullException(nameof(bufferProvider));
}
_textBufferProvider = bufferProvider;
}
public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
{
if (languageServices == null)
@ -33,9 +20,10 @@ namespace Microsoft.VisualStudio.Editor.Razor
throw new ArgumentNullException(nameof(languageServices));
}
var textBufferProvider = languageServices.GetRequiredService<RazorTextBufferProvider>();
var textBufferCodeDocumentProvider = languageServices.GetRequiredService<TextBufferCodeDocumentProvider>();
return new DefaultCodeDocumentProvider(_textBufferProvider, textBufferCodeDocumentProvider);
return new DefaultCodeDocumentProvider(textBufferProvider, textBufferCodeDocumentProvider);
}
}
}

4
src/Microsoft.VisualStudio.Editor.Razor/DefaultTextBufferProvider.cs
View File

@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.ComponentModel.Composition;
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Text;
@ -11,13 +10,10 @@ using Microsoft.VisualStudio.Text.Projection;
namespace Microsoft.VisualStudio.Editor.Razor
{
[System.Composition.Shared]
[Export(typeof(RazorTextBufferProvider))]
internal class DefaultTextBufferProvider : RazorTextBufferProvider
{
private readonly IBufferGraphFactoryService _bufferGraphService;
[ImportingConstructor]
public DefaultTextBufferProvider(IBufferGraphFactoryService bufferGraphService)
{
if (bufferGraphService == null)

40
src/Microsoft.VisualStudio.Editor.Razor/DefaultTextBufferProviderFactory.cs Normal file
View File

@ -0,0 +1,40 @@
// 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.Composition;
using Microsoft.CodeAnalysis.Host;
using Microsoft.CodeAnalysis.Host.Mef;
using Microsoft.CodeAnalysis.Razor;
using Microsoft.VisualStudio.Text.Projection;
namespace Microsoft.VisualStudio.Editor.Razor
{
[Shared]
[ExportLanguageServiceFactory(typeof(RazorTextBufferProvider), RazorLanguage.Name)]
internal class DefaultTextBufferProviderFactory : ILanguageServiceFactory
{
private readonly IBufferGraphFactoryService _bufferGraphService;
[ImportingConstructor]
public DefaultTextBufferProviderFactory(IBufferGraphFactoryService bufferGraphService)
{
if (bufferGraphService == null)
{
throw new ArgumentNullException(nameof(bufferGraphService));
}
_bufferGraphService = bufferGraphService;
}
public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
{
if (languageServices == null)
{
throw new ArgumentNullException(nameof(languageServices));
}
return new DefaultTextBufferProvider(_bufferGraphService);
}
}
}

3
src/Microsoft.VisualStudio.Editor.Razor/RazorTextBufferProvider.cs
View File

@ -2,11 +2,12 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Host;
using Microsoft.VisualStudio.Text;
namespace Microsoft.VisualStudio.Editor.Razor
{
internal abstract class RazorTextBufferProvider
internal abstract class RazorTextBufferProvider : ILanguageService
{
public abstract bool TryGetFromDocument(TextDocument document, out ITextBuffer textBuffer);
}