Merge pull request #62965 from CyrusNajmabadi/braceMatchingDowqn

Move BraceMatching data service down to Features layer.
dotnet · Jul 27, 2022 · 35fda5c · 35fda5c
2 parents bfb1e25 + ed4f098
commit 35fda5c
Show file tree

Hide file tree

Showing 43 changed files with 87 additions and 87 deletions.
diff --git a/src/EditorFeatures/Core.Cocoa/CommandHandlers/GoToMatchingBraceCommandHandler.cs b/src/EditorFeatures/Core.Cocoa/CommandHandlers/GoToMatchingBraceCommandHandler.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.ComponentModel.Composition;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;

diff --git a/src/EditorFeatures/Core/Extensibility/BraceMatching/BraceMatchingOptionsStorage.cs b/src/EditorFeatures/Core/Extensibility/BraceMatching/BraceMatchingOptionsStorage.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.DocumentHighlighting;
 using Microsoft.CodeAnalysis.Options;
 

diff --git a/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptBraceMatcher.cs b/src/EditorFeatures/Core/ExternalAccess/VSTypeScript/VSTypeScriptBraceMatcher.cs
@@ -3,16 +3,17 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript.Api;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.VSTypeScript
 {
-    [ExportBraceMatcher(InternalLanguageNames.TypeScript)]
+    [ExportBraceMatcher(InternalLanguageNames.TypeScript), Shared]
     internal sealed class VSTypeScriptBraceMatcher : IBraceMatcher
     {
         private readonly IVSTypeScriptBraceMatcherImplementation _impl;

diff --git a/src/EditorFeatures/Test/Attributes/AttributeTests.cs b/src/EditorFeatures/Test/Attributes/AttributeTests.cs
@@ -5,11 +5,7 @@
 #nullable disable
 
 using System;
-using Microsoft.CodeAnalysis.Classification.Classifiers;
-using Microsoft.CodeAnalysis.CodeRefactorings;
-using Microsoft.CodeAnalysis.Editor;
-using Microsoft.CodeAnalysis.Text;
-using Roslyn.Test.Utilities;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Xunit;
 
 namespace Microsoft.CodeAnalysis.Editor.UnitTests.Attributes

diff --git a/src/EditorFeatures/Test/Options/GlobalOptionsTests.cs b/src/EditorFeatures/Test/Options/GlobalOptionsTests.cs
@@ -11,6 +11,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using Microsoft.CodeAnalysis.AddImport;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.Classification;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeStyle;

diff --git a/src/EditorFeatures/TestUtilities/BraceHighlighting/MultiCharacterBraceHighlightingTests.cs b/src/EditorFeatures/TestUtilities/BraceHighlighting/MultiCharacterBraceHighlightingTests.cs
@@ -7,6 +7,7 @@
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Text;

diff --git a/src/EditorFeatures/TestUtilities/BraceMatching/AbstractBraceMatcherTests.cs b/src/EditorFeatures/TestUtilities/BraceMatching/AbstractBraceMatcherTests.cs
@@ -9,7 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Text;

diff --git a/...aceMatching/AbstractCSharpBraceMatcher.cs → ...aceMatching/AbstractCSharpBraceMatcher.cs b/...aceMatching/AbstractCSharpBraceMatcher.cs → ...aceMatching/AbstractCSharpBraceMatcher.cs
@@ -5,7 +5,7 @@
 using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.CSharp;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
+namespace Microsoft.CodeAnalysis.CSharp.BraceMatching
 {
     internal abstract class AbstractCSharpBraceMatcher : AbstractBraceMatcher
     {

diff --git a/...hing/CSharpDirectiveTriviaBraceMatcher.cs → ...hing/CSharpDirectiveTriviaBraceMatcher.cs b/...hing/CSharpDirectiveTriviaBraceMatcher.cs → ...hing/CSharpDirectiveTriviaBraceMatcher.cs
@@ -4,17 +4,18 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Composition;
+using System.Composition;
 using System.Linq;
 using System.Threading;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
+namespace Microsoft.CodeAnalysis.CSharp.BraceMatching
 {
-    [ExportBraceMatcher(LanguageNames.CSharp)]
+    [ExportBraceMatcher(LanguageNames.CSharp), Shared]
     internal class CSharpDirectiveTriviaBraceMatcher : AbstractDirectiveTriviaBraceMatcher<DirectiveTriviaSyntax,
         IfDirectiveTriviaSyntax, ElifDirectiveTriviaSyntax,
         ElseDirectiveTriviaSyntax, EndIfDirectiveTriviaSyntax,

diff --git a/...ing/CSharpEmbeddedLanguageBraceMatcher.cs → ...ing/CSharpEmbeddedLanguageBraceMatcher.cs b/...ing/CSharpEmbeddedLanguageBraceMatcher.cs → ...ing/CSharpEmbeddedLanguageBraceMatcher.cs
@@ -4,16 +4,16 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Composition;
+using System.Composition;
 using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.CSharp.EmbeddedLanguages.LanguageServices;
 using Microsoft.CodeAnalysis.CSharp.LanguageServices;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
+namespace Microsoft.CodeAnalysis.CSharp.BraceMatching
 {
-    [ExportBraceMatcher(LanguageNames.CSharp)]
+    [ExportBraceMatcher(LanguageNames.CSharp), Shared]
     internal class CSharpEmbeddedLanguageBraceMatcher : AbstractEmbeddedLanguageBraceMatcher
     {
         [ImportingConstructor]

diff --git a/...tching/LessThanGreaterThanBraceMatcher.cs → ...tching/LessThanGreaterThanBraceMatcher.cs b/...tching/LessThanGreaterThanBraceMatcher.cs → ...tching/LessThanGreaterThanBraceMatcher.cs
@@ -3,13 +3,14 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
+namespace Microsoft.CodeAnalysis.CSharp.BraceMatching
 {
-    [ExportBraceMatcher(LanguageNames.CSharp)]
+    [ExportBraceMatcher(LanguageNames.CSharp), Shared]
     internal class LessThanGreaterThanBraceMatcher : AbstractCSharpBraceMatcher
     {
         [ImportingConstructor]

diff --git a/...aceMatching/OpenCloseBraceBraceMatcher.cs → ...aceMatching/OpenCloseBraceBraceMatcher.cs b/...aceMatching/OpenCloseBraceBraceMatcher.cs → ...aceMatching/OpenCloseBraceBraceMatcher.cs
@@ -3,13 +3,14 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
+namespace Microsoft.CodeAnalysis.CSharp.BraceMatching
 {
-    [ExportBraceMatcher(LanguageNames.CSharp)]
+    [ExportBraceMatcher(LanguageNames.CSharp), Shared]
     internal class OpenCloseBraceBraceMatcher : AbstractCSharpBraceMatcher
     {
         [ImportingConstructor]

diff --git a/...eMatching/OpenCloseBracketBraceMatcher.cs → ...eMatching/OpenCloseBracketBraceMatcher.cs b/...eMatching/OpenCloseBracketBraceMatcher.cs → ...eMatching/OpenCloseBracketBraceMatcher.cs
@@ -3,13 +3,14 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
+namespace Microsoft.CodeAnalysis.CSharp.BraceMatching
 {
-    [ExportBraceMatcher(LanguageNames.CSharp)]
+    [ExportBraceMatcher(LanguageNames.CSharp), Shared]
     internal class OpenCloseBracketBraceMatcher : AbstractCSharpBraceMatcher
     {
         [ImportingConstructor]

diff --git a/...aceMatching/OpenCloseParenBraceMatcher.cs → ...aceMatching/OpenCloseParenBraceMatcher.cs b/...aceMatching/OpenCloseParenBraceMatcher.cs → ...aceMatching/OpenCloseParenBraceMatcher.cs
@@ -3,13 +3,14 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
+namespace Microsoft.CodeAnalysis.CSharp.BraceMatching
 {
-    [ExportBraceMatcher(LanguageNames.CSharp)]
+    [ExportBraceMatcher(LanguageNames.CSharp), Shared]
     internal class OpenCloseParenBraceMatcher : AbstractCSharpBraceMatcher
     {
         [ImportingConstructor]

diff --git a/...raceMatching/StringLiteralBraceMatcher.cs → ...raceMatching/StringLiteralBraceMatcher.cs b/...raceMatching/StringLiteralBraceMatcher.cs → ...raceMatching/StringLiteralBraceMatcher.cs
@@ -3,19 +3,20 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.BraceMatching;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
+namespace Microsoft.CodeAnalysis.CSharp.BraceMatching
 {
-    [ExportBraceMatcher(LanguageNames.CSharp)]
+    [ExportBraceMatcher(LanguageNames.CSharp), Shared]
     internal class StringLiteralBraceMatcher : IBraceMatcher
     {
         [ImportingConstructor]

diff --git a/...ore/BraceMatching/AbstractBraceMatcher.cs → ...ble/BraceMatching/AbstractBraceMatcher.cs b/...ore/BraceMatching/AbstractBraceMatcher.cs → ...ble/BraceMatching/AbstractBraceMatcher.cs
@@ -8,7 +8,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Editor;
 
 namespace Microsoft.CodeAnalysis.BraceMatching
 {

diff --git a/...ng/AbstractDirectiveTriviaBraceMatcher.cs → ...ng/AbstractDirectiveTriviaBraceMatcher.cs b/...ng/AbstractDirectiveTriviaBraceMatcher.cs → ...ng/AbstractDirectiveTriviaBraceMatcher.cs
@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.BraceMatching
 {
     internal abstract class AbstractDirectiveTriviaBraceMatcher<TDirectiveTriviaSyntax,
         TIfDirectiveTriviaSyntax, TElseIfDirectiveTriviaSyntax,

diff --git a/...g/AbstractEmbeddedLanguageBraceMatcher.cs → ...g/AbstractEmbeddedLanguageBraceMatcher.cs b/...g/AbstractEmbeddedLanguageBraceMatcher.cs → ...g/AbstractEmbeddedLanguageBraceMatcher.cs
@@ -6,10 +6,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.LanguageServices;
-using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
 namespace Microsoft.CodeAnalysis.BraceMatching

diff --git a/...re/BraceMatching/BraceCharacterAndKind.cs → ...le/BraceMatching/BraceCharacterAndKind.cs b/...re/BraceMatching/BraceCharacterAndKind.cs → ...le/BraceMatching/BraceCharacterAndKind.cs
@@ -2,19 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using Microsoft;
 
 namespace Microsoft.CodeAnalysis.BraceMatching
 {
-    internal struct BraceCharacterAndKind
+    internal readonly struct BraceCharacterAndKind
     {
         public char Character { get; }
         public int Kind { get; }
 
         public BraceCharacterAndKind(char character, int kind)
-            : this()
         {
             this.Character = character;
             this.Kind = kind;

diff --git a/...ity/BraceMatching/BraceMatchingOptions.cs → ...ble/BraceMatching/BraceMatchingOptions.cs b/...ity/BraceMatching/BraceMatchingOptions.cs → ...ble/BraceMatching/BraceMatchingOptions.cs
@@ -5,7 +5,7 @@
 using System.Runtime.Serialization;
 using Microsoft.CodeAnalysis.DocumentHighlighting;
 
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.BraceMatching
 {
     [DataContract]
     internal readonly record struct BraceMatchingOptions(

diff --git a/...ore/BraceMatching/BraceMatchingService.cs → ...ble/BraceMatching/BraceMatchingService.cs b/...ore/BraceMatching/BraceMatchingService.cs → ...ble/BraceMatching/BraceMatchingService.cs
@@ -7,16 +7,15 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.ComponentModel.Composition;
+using System.Composition;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.BraceMatching
 {
-    [Export(typeof(IBraceMatchingService))]
+    [Export(typeof(IBraceMatchingService)), Shared]
     internal class BraceMatchingService : IBraceMatchingService
     {
         private readonly ImmutableArray<Lazy<IBraceMatcher, LanguageMetadata>> _braceMatchers;

diff --git a/...ceMatching/ExportBraceMatcherAttribute.cs → ...ceMatching/ExportBraceMatcherAttribute.cs b/...ceMatching/ExportBraceMatcherAttribute.cs → ...ceMatching/ExportBraceMatcherAttribute.cs
@@ -5,13 +5,13 @@
 #nullable disable
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
 
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.BraceMatching
 {
     [MetadataAttribute]
     [AttributeUsage(AttributeTargets.Class)]
-    internal class ExportBraceMatcherAttribute : ExportAttribute
+    internal sealed class ExportBraceMatcherAttribute : ExportAttribute
     {
         public string Language { get; }
 

diff --git a/...tEmbeddedLanguageBraceMatcherAttribute.cs → ...tEmbeddedLanguageBraceMatcherAttribute.cs b/...tEmbeddedLanguageBraceMatcherAttribute.cs → ...tEmbeddedLanguageBraceMatcherAttribute.cs
diff --git a/...ensibility/BraceMatching/IBraceMatcher.cs → ...e/Portable/BraceMatching/IBraceMatcher.cs b/...ensibility/BraceMatching/IBraceMatcher.cs → ...e/Portable/BraceMatching/IBraceMatcher.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.BraceMatching
 {
     internal interface IBraceMatcher
     {

diff --git a/...torFeatures/Core/IBraceMatchingService.cs → ...le/BraceMatching/IBraceMatchingService.cs b/...torFeatures/Core/IBraceMatchingService.cs → ...le/BraceMatching/IBraceMatchingService.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.BraceMatching
 {
     internal interface IBraceMatchingService
     {

diff --git a/...nsions/IBraceMatchingServiceExtensions.cs → ...tching/IBraceMatchingServiceExtensions.cs b/...nsions/IBraceMatchingServiceExtensions.cs → ...tching/IBraceMatchingServiceExtensions.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.Editor.Shared.Extensions
+namespace Microsoft.CodeAnalysis.BraceMatching
 {
     internal static class IBraceMatchingServiceExtensions
     {

diff --git a/...Matching/IEmbeddedLanguageBraceMatcher.cs → ...Matching/IEmbeddedLanguageBraceMatcher.cs b/...Matching/IEmbeddedLanguageBraceMatcher.cs → ...Matching/IEmbeddedLanguageBraceMatcher.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Threading;
-using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
 
 namespace Microsoft.CodeAnalysis.BraceMatching

diff --git a/src/Features/Core/Portable/DocumentHighlighting/IDocumentHighlightsService.cs b/src/Features/Core/Portable/DocumentHighlighting/IDocumentHighlightsService.cs
@@ -6,9 +6,7 @@
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Features.EmbeddedLanguages.RegularExpressions.LanguageServices;
 using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.DocumentHighlighting

diff --git a/...mbeddedLanguages/Json/JsonBraceMatcher.cs → ...Json/LanguageServices/JsonBraceMatcher.cs b/...mbeddedLanguages/Json/JsonBraceMatcher.cs → ...Json/LanguageServices/JsonBraceMatcher.cs
@@ -6,16 +6,13 @@
 using System.Composition;
 using System.Threading;
 using Microsoft.CodeAnalysis.BraceMatching;
-using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.Common;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
-using Microsoft.CodeAnalysis.Features.EmbeddedLanguages.Json;
-using Microsoft.CodeAnalysis.Features.EmbeddedLanguages.Json.LanguageServices;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.EmbeddedLanguages.Json
+namespace Microsoft.CodeAnalysis.Features.EmbeddedLanguages.Json.LanguageServices
 {
     using JsonToken = EmbeddedSyntaxToken<JsonKind>;
 

diff --git a/...s/RegularExpressions/RegexBraceMatcher.cs → ...ons/LanguageServices/RegexBraceMatcher.cs b/...s/RegularExpressions/RegexBraceMatcher.cs → ...ons/LanguageServices/RegexBraceMatcher.cs
@@ -7,14 +7,14 @@
 using System.Composition;
 using System.Threading;
 using Microsoft.CodeAnalysis.BraceMatching;
-using Microsoft.CodeAnalysis.Editor;
+using Microsoft.CodeAnalysis.EmbeddedLanguages;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.Common;
+using Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions;
 using Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars;
-using Microsoft.CodeAnalysis.Features.EmbeddedLanguages.RegularExpressions.LanguageServices;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.EmbeddedLanguages.RegularExpressions
+namespace Microsoft.CodeAnalysis.Features.EmbeddedLanguages.RegularExpressions.LanguageServices
 {
     using RegexToken = EmbeddedSyntaxToken<RegexKind>;
     using RegexTrivia = EmbeddedSyntaxTrivia<RegexKind>;