More renames.

src/EditorFeatures/Core/EmbeddedLanguages/LanguageServices/AbstractEmbeddedLanguagesProvider.cs → src/EditorFeatures/Core/EmbeddedLanguages/AbstractEmbeddedLanguageEditorFeaturesProvider.cs

@@ -3,18 +3,21 @@
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions.LanguageServices;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
+using Microsoft.CodeAnalysis.Features.EmbeddedLanguages;
+using Microsoft.CodeAnalysis.Features.EmbeddedLanguages.RegularExpressions;
 using Microsoft.CodeAnalysis.LanguageServices;
 
-namespace Microsoft.CodeAnalysis.EmbeddedLanguages.LanguageServices
+namespace Microsoft.CodeAnalysis.Editor.EmbeddedLanguages
 {
     /// <summary>
     /// Abstract implementation of the C# and VB embedded language providers.
     /// </summary>
-    internal abstract class AbstractEditorFeaturesEmbeddedLanguagesProvider : AbstractFeaturesEmbeddedLanguagesProvider, IEditorFeaturesEmbeddedLanguagesProvider
+    internal abstract class AbstractEmbeddedLanguageEditorFeaturesProvider 
+        : AbstractEmbeddedLanguageFeaturesProvider, IEmbeddedLanguageEditorFeaturesProvider
     {
-        private readonly ImmutableArray<IEditorFeaturesEmbeddedLanguage> _embeddedLanguages;
+        private readonly ImmutableArray<IEmbeddedLanguageEditorFeatures> _embeddedLanguages;
          
-        protected AbstractEditorFeaturesEmbeddedLanguagesProvider(
+        protected AbstractEmbeddedLanguageEditorFeaturesProvider(
             int stringLiteralTokenKind,
             int interpolatedTextTokenKind,
             ISyntaxFactsService syntaxFacts,
@@ -22,11 +25,11 @@ internal abstract class AbstractEditorFeaturesEmbeddedLanguagesProvider : Abstra
             IVirtualCharService virtualCharService)
             : base(stringLiteralTokenKind, interpolatedTextTokenKind, syntaxFacts, semanticFacts, virtualCharService)
         {
-            _embeddedLanguages = ImmutableArray.Create<IEditorFeaturesEmbeddedLanguage>(
-                new RegexEditorFeaturesEmbeddedLanguage(stringLiteralTokenKind, syntaxFacts, semanticFacts, virtualCharService));
+            _embeddedLanguages = ImmutableArray.Create<IEmbeddedLanguageEditorFeatures>(
+                new RegexEmbeddedLanguageEditorFeatures(stringLiteralTokenKind, syntaxFacts, semanticFacts, virtualCharService));
         }
 
-        public new ImmutableArray<IEditorFeaturesEmbeddedLanguage> GetEmbeddedLanguages()
+        public new ImmutableArray<IEmbeddedLanguageEditorFeatures> GetEmbeddedLanguages()
             => _embeddedLanguages;
     }
 }

src/EditorFeatures/Core/EmbeddedLanguages/LanguageServices/IEmbeddedLanguage.cs → src/EditorFeatures/Core/EmbeddedLanguages/IEmbeddedLanguageEditorFeatures.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.DocumentHighlighting;
-using Microsoft.CodeAnalysis.Editor;
+using Microsoft.CodeAnalysis.Features.EmbeddedLanguages;
 
-namespace Microsoft.CodeAnalysis.EmbeddedLanguages.LanguageServices
+namespace Microsoft.CodeAnalysis.Editor.EmbeddedLanguages
 {
     /// <summary>
     /// Services related to a specific embedded language.
     /// </summary>
-    internal interface IEditorFeaturesEmbeddedLanguage : IFeaturesEmbeddedLanguage
+    internal interface IEmbeddedLanguageEditorFeatures : IEmbeddedLanguageFeatures
     {
         /// <summary>
         /// A optional brace matcher that can match braces in an embedded language string.

src/EditorFeatures/Core/EmbeddedLanguages/LanguageServices/IEmbeddedLanguagesProvider.cs → src/EditorFeatures/Core/EmbeddedLanguages/IEmbeddedLanguagesProvider.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Collections.Immutable;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Features.EmbeddedLanguages;
 
-namespace Microsoft.CodeAnalysis.EmbeddedLanguages.LanguageServices
+namespace Microsoft.CodeAnalysis.Editor.EmbeddedLanguages
 {
     /// <summary>
     /// Service that returns all the embedded languages supported.  Each embedded language can expose
-    /// individual language services through the <see cref="IEmbeddedLanguage"/> interface.
+    /// individual language services through the <see cref="IEmbeddedLanguageEditorFeatures"/> interface.
     /// </summary>
-    internal interface IEditorFeaturesEmbeddedLanguagesProvider : IFeaturesEmbeddedLanguagesProvider
+    internal interface IEmbeddedLanguageEditorFeaturesProvider : IEmbeddedLanguageFeaturesProvider
     {
-        new ImmutableArray<IEditorFeaturesEmbeddedLanguage> GetEmbeddedLanguages();
+        new ImmutableArray<IEmbeddedLanguageEditorFeatures> GetEmbeddedLanguages();
     }
 }

src/EditorFeatures/Core/EmbeddedLanguages/RegularExpressions/LanguageServices/RegexEmbeddedBraceMatcher.cs → src/EditorFeatures/Core/EmbeddedLanguages/RegularExpressions/RegexEmbeddedBraceMatcher.cs

@@ -6,12 +6,14 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.Common;
+using Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions;
+using Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions.LanguageServices;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions.LanguageServices
+namespace Microsoft.CodeAnalysis.Features.EmbeddedLanguages.RegularExpressions
 {
     using RegexToken = EmbeddedSyntaxToken<RegexKind>;
     using RegexTrivia = EmbeddedSyntaxTrivia<RegexKind>;
@@ -21,9 +23,9 @@ namespace Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions.LanguageSe
     /// </summary>
     internal sealed class RegexEmbeddedBraceMatcher : IBraceMatcher
     {
-        private readonly RegexEmbeddedLanguage _language;
+        private readonly RegexEmbeddedLanguageEditorFeatures _language;
 
-        public RegexEmbeddedBraceMatcher(RegexEmbeddedLanguage language)
+        public RegexEmbeddedBraceMatcher(RegexEmbeddedLanguageEditorFeatures language)
         {
             _language = language;
         }

src/EditorFeatures/Core/EmbeddedLanguages/RegularExpressions/LanguageServices/RegexEmbeddedLanguage.cs → src/EditorFeatures/Core/EmbeddedLanguages/RegularExpressions/RegexEmbeddedLanguage.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using Microsoft.CodeAnalysis.Editor;
+using Microsoft.CodeAnalysis.Editor.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.LanguageServices;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
 using Microsoft.CodeAnalysis.LanguageServices;
 
-namespace Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions.LanguageServices
+namespace Microsoft.CodeAnalysis.Features.EmbeddedLanguages.RegularExpressions
 {
-    internal class RegexEditorFeaturesEmbeddedLanguage : RegexFeaturesEmbeddedLanguage, IEditorFeaturesEmbeddedLanguage
+    internal class RegexEmbeddedLanguageEditorFeatures : RegexEmbeddedLanguageFeatures, IEmbeddedLanguageEditorFeatures
     {
         public IBraceMatcher BraceMatcher { get; }
 
-        public RegexEditorFeaturesEmbeddedLanguage(
+        public RegexEmbeddedLanguageEditorFeatures(
             int stringLiteralKind,
             ISyntaxFactsService syntaxFacts,
             ISemanticFactsService semanticFacts,

src/EditorFeatures/Core/Implementation/BraceMatching/AbstractEmbeddedLanguageBraceMatcher.cs

@@ -2,6 +2,7 @@
 
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editor.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
@@ -15,7 +16,7 @@ internal abstract class AbstractEmbeddedLanguageBraceMatcher : IBraceMatcher
         public async Task<BraceMatchingResult?> FindBracesAsync(
             Document document, int position, CancellationToken cancellationToken)
         {
-            var languagesProvider = document.GetLanguageService<IEditorFeaturesEmbeddedLanguagesProvider>();
+            var languagesProvider = document.GetLanguageService<IEmbeddedLanguageEditorFeaturesProvider>();
             if (languagesProvider != null)
             {
                 foreach (var language in languagesProvider.GetEmbeddedLanguages())

src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs

@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.LanguageServices;
 using Microsoft.CodeAnalysis.ErrorReporting;
+using Microsoft.CodeAnalysis.Features.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.PooledObjects;
@@ -95,7 +96,7 @@ internal abstract partial class AbstractDocumentHighlightsService : IDocumentHig
         private async Task<ImmutableArray<DocumentHighlights>> TryGetEmbeddedLanguageHighlightsAsync(
             Document document, int position, IImmutableSet<Document> documentsToSearch, CancellationToken cancellationToken)
         {
-            var languagesProvider = document.GetLanguageService<IFeaturesEmbeddedLanguagesProvider>();
+            var languagesProvider = document.GetLanguageService<IEmbeddedLanguageFeaturesProvider>();
             if (languagesProvider != null)
             {
                 foreach (var language in languagesProvider.GetEmbeddedLanguages())

src/Features/Core/Portable/EmbeddedLanguages/RegularExpressions/RegexDiagnosticAnalyzer.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions.LanguageServices;
 
 namespace Microsoft.CodeAnalysis.Features.EmbeddedLanguages.RegularExpressions