diff --git a/src/EditorFeatures/CSharp/AddImports/CSharpAddImportsPasteCommandHandler.cs b/src/EditorFeatures/CSharp/AddImports/CSharpAddImportsPasteCommandHandler.cs index 9ba110442a275..7404845619259 100644 --- a/src/EditorFeatures/CSharp/AddImports/CSharpAddImportsPasteCommandHandler.cs +++ b/src/EditorFeatures/CSharp/AddImports/CSharpAddImportsPasteCommandHandler.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel.Composition; -using Microsoft.CodeAnalysis.Editor.Implementation.AddImports; +using Microsoft.CodeAnalysis.AddImport; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Options; diff --git a/src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler.cs b/src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler.cs index 0962222aa5239..c143f5359a16d 100644 --- a/src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler.cs +++ b/src/EditorFeatures/CSharp/AutomaticCompletion/AutomaticLineEnderCommandHandler.cs @@ -11,7 +11,7 @@ using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Utilities; -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Formatting; diff --git a/src/EditorFeatures/CSharp/AutomaticCompletion/CSharpBraceCompletionServiceFactory.cs b/src/EditorFeatures/CSharp/AutomaticCompletion/CSharpBraceCompletionServiceFactory.cs index 7dbf4a7d2c99b..923494039a630 100644 --- a/src/EditorFeatures/CSharp/AutomaticCompletion/CSharpBraceCompletionServiceFactory.cs +++ b/src/EditorFeatures/CSharp/AutomaticCompletion/CSharpBraceCompletionServiceFactory.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Composition; using Microsoft.CodeAnalysis.BraceCompletion; -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; diff --git a/src/EditorFeatures/CSharp/BraceMatching/AbstractCSharpBraceMatcher.cs b/src/EditorFeatures/CSharp/BraceMatching/AbstractCSharpBraceMatcher.cs index 155357c4bd6e6..d8f72ea040d82 100644 --- a/src/EditorFeatures/CSharp/BraceMatching/AbstractCSharpBraceMatcher.cs +++ b/src/EditorFeatures/CSharp/BraceMatching/AbstractCSharpBraceMatcher.cs @@ -4,8 +4,8 @@ #nullable disable +using Microsoft.CodeAnalysis.BraceMatching; using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching; namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching { diff --git a/src/EditorFeatures/CSharp/BraceMatching/CSharpEmbeddedLanguageBraceMatcher.cs b/src/EditorFeatures/CSharp/BraceMatching/CSharpEmbeddedLanguageBraceMatcher.cs index 8a479e5b36120..c423a5e88cb55 100644 --- a/src/EditorFeatures/CSharp/BraceMatching/CSharpEmbeddedLanguageBraceMatcher.cs +++ b/src/EditorFeatures/CSharp/BraceMatching/CSharpEmbeddedLanguageBraceMatcher.cs @@ -6,7 +6,7 @@ using System; using System.ComponentModel.Composition; -using Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching; +using Microsoft.CodeAnalysis.BraceMatching; using Microsoft.CodeAnalysis.Host.Mef; namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching diff --git a/src/EditorFeatures/CSharp/ChangeSignature/CSharpChangeSignatureCommandHandler.cs b/src/EditorFeatures/CSharp/ChangeSignature/CSharpChangeSignatureCommandHandler.cs index f6b300c18feb9..cdd64710822b8 100644 --- a/src/EditorFeatures/CSharp/ChangeSignature/CSharpChangeSignatureCommandHandler.cs +++ b/src/EditorFeatures/CSharp/ChangeSignature/CSharpChangeSignatureCommandHandler.cs @@ -6,7 +6,7 @@ using System; using System.ComponentModel.Composition; -using Microsoft.CodeAnalysis.Editor.Implementation.ChangeSignature; +using Microsoft.CodeAnalysis.ChangeSignature; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Commanding; diff --git a/src/EditorFeatures/CSharp/CommentSelection/CSharpToggleBlockCommentCommandHandler.cs b/src/EditorFeatures/CSharp/CommentSelection/CSharpToggleBlockCommentCommandHandler.cs index c76616cebf669..d8f4eebc7bb31 100644 --- a/src/EditorFeatures/CSharp/CommentSelection/CSharpToggleBlockCommentCommandHandler.cs +++ b/src/EditorFeatures/CSharp/CommentSelection/CSharpToggleBlockCommentCommandHandler.cs @@ -12,7 +12,6 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis.CommentSelection; using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Text; using Microsoft.VisualStudio.Commanding; diff --git a/src/EditorFeatures/CSharp/CompleteStatement/CompleteStatementCommandHandler.cs b/src/EditorFeatures/CSharp/CompleteStatement/CompleteStatementCommandHandler.cs index 81f053ad3f23d..2b2ac969a677b 100644 --- a/src/EditorFeatures/CSharp/CompleteStatement/CompleteStatementCommandHandler.cs +++ b/src/EditorFeatures/CSharp/CompleteStatement/CompleteStatementCommandHandler.cs @@ -11,7 +11,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Extensions; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; diff --git a/src/EditorFeatures/CSharp/ConvertNamespace/ConvertNamespaceCommandHandler.cs b/src/EditorFeatures/CSharp/ConvertNamespace/ConvertNamespaceCommandHandler.cs index 3b0cba7fa8cf0..4b49ddcb28b6d 100644 --- a/src/EditorFeatures/CSharp/ConvertNamespace/ConvertNamespaceCommandHandler.cs +++ b/src/EditorFeatures/CSharp/ConvertNamespace/ConvertNamespaceCommandHandler.cs @@ -11,7 +11,7 @@ using Microsoft.CodeAnalysis.CSharp.CodeStyle; using Microsoft.CodeAnalysis.CSharp.ConvertNamespace; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; diff --git a/src/EditorFeatures/CSharp/Interactive/CSharpInteractiveEvaluatorLanguageInfoProvider.cs b/src/EditorFeatures/CSharp/Interactive/CSharpInteractiveEvaluatorLanguageInfoProvider.cs index 35fd5917fbe83..2bda5f3b5ed34 100644 --- a/src/EditorFeatures/CSharp/Interactive/CSharpInteractiveEvaluatorLanguageInfoProvider.cs +++ b/src/EditorFeatures/CSharp/Interactive/CSharpInteractiveEvaluatorLanguageInfoProvider.cs @@ -7,7 +7,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Scripting; using Microsoft.CodeAnalysis.CSharp.Scripting.Hosting; -using Microsoft.CodeAnalysis.Editor.Interactive; +using Microsoft.CodeAnalysis.Interactive; namespace Microsoft.CodeAnalysis.Editor.CSharp.Interactive { diff --git a/src/EditorFeatures/CSharp/Interactive/CSharpSendToInteractiveSubmissionProvider.cs b/src/EditorFeatures/CSharp/Interactive/CSharpSendToInteractiveSubmissionProvider.cs index 5c6fa20416fcc..0a2cf45eee45c 100644 --- a/src/EditorFeatures/CSharp/Interactive/CSharpSendToInteractiveSubmissionProvider.cs +++ b/src/EditorFeatures/CSharp/Interactive/CSharpSendToInteractiveSubmissionProvider.cs @@ -10,8 +10,8 @@ using System.Linq; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; diff --git a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticBracketCompletionTests.cs b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticBracketCompletionTests.cs index 8aaf2260a4842..e07e1c348a77c 100644 --- a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticBracketCompletionTests.cs +++ b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticBracketCompletionTests.cs @@ -4,7 +4,7 @@ #nullable disable -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.cs b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.cs index ca4810a0575af..67227b294738d 100644 --- a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.cs +++ b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.cs @@ -4,7 +4,7 @@ #nullable disable -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLiteralCompletionTests.cs b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLiteralCompletionTests.cs index 96c6f4b160add..cb7076a293295 100644 --- a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLiteralCompletionTests.cs +++ b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticLiteralCompletionTests.cs @@ -4,7 +4,7 @@ #nullable disable -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticParenthesisCompletionTests.cs b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticParenthesisCompletionTests.cs index d9be3c712af3c..fa7614f564ed0 100644 --- a/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticParenthesisCompletionTests.cs +++ b/src/EditorFeatures/CSharpTest/AutomaticCompletion/AutomaticParenthesisCompletionTests.cs @@ -4,7 +4,7 @@ #nullable disable -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/Classification/CopyPasteAndPrintingClassifierTests.cs b/src/EditorFeatures/CSharpTest/Classification/CopyPasteAndPrintingClassifierTests.cs index 739373c2994e8..0f7795b03df51 100644 --- a/src/EditorFeatures/CSharpTest/Classification/CopyPasteAndPrintingClassifierTests.cs +++ b/src/EditorFeatures/CSharpTest/Classification/CopyPasteAndPrintingClassifierTests.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Implementation.Classification; +using Microsoft.CodeAnalysis.Classification; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Shared.Extensions; diff --git a/src/EditorFeatures/CSharpTest/Classification/SyntacticTaggerTests.cs b/src/EditorFeatures/CSharpTest/Classification/SyntacticTaggerTests.cs index b96ffd5624886..8d1135830acc7 100644 --- a/src/EditorFeatures/CSharpTest/Classification/SyntacticTaggerTests.cs +++ b/src/EditorFeatures/CSharpTest/Classification/SyntacticTaggerTests.cs @@ -9,7 +9,7 @@ using System.Diagnostics; using System.Linq; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Implementation.Classification; +using Microsoft.CodeAnalysis.Classification; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Shared.TestHooks; diff --git a/src/EditorFeatures/CSharpTest/CommentSelection/CSharpCommentSelectionTests.cs b/src/EditorFeatures/CSharpTest/CommentSelection/CSharpCommentSelectionTests.cs index 4583c3792e712..dd3958e5036d8 100644 --- a/src/EditorFeatures/CSharpTest/CommentSelection/CSharpCommentSelectionTests.cs +++ b/src/EditorFeatures/CSharpTest/CommentSelection/CSharpCommentSelectionTests.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection; +using Microsoft.CodeAnalysis.CommentSelection; using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/EditorFeatures/CSharpTest/CommentSelection/CSharpToggleBlockCommentCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/CommentSelection/CSharpToggleBlockCommentCommandHandlerTests.cs index aa3b343d0d81a..46cb4646e2091 100644 --- a/src/EditorFeatures/CSharpTest/CommentSelection/CSharpToggleBlockCommentCommandHandlerTests.cs +++ b/src/EditorFeatures/CSharpTest/CommentSelection/CSharpToggleBlockCommentCommandHandlerTests.cs @@ -6,8 +6,8 @@ using System; using System.Linq; +using Microsoft.CodeAnalysis.CommentSelection; using Microsoft.CodeAnalysis.Editor.CSharp.CommentSelection; -using Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities.CommentSelection; diff --git a/src/EditorFeatures/CSharpTest/CommentSelection/CSharpToggleLineCommentCommandHandlerTests.cs b/src/EditorFeatures/CSharpTest/CommentSelection/CSharpToggleLineCommentCommandHandlerTests.cs index 8aeecd61b933c..586a9090d4760 100644 --- a/src/EditorFeatures/CSharpTest/CommentSelection/CSharpToggleLineCommentCommandHandlerTests.cs +++ b/src/EditorFeatures/CSharpTest/CommentSelection/CSharpToggleLineCommentCommandHandlerTests.cs @@ -6,7 +6,7 @@ using System; using System.Linq; -using Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection; +using Microsoft.CodeAnalysis.CommentSelection; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities.CommentSelection; diff --git a/src/EditorFeatures/CSharpTest/Interactive/BraceMatching/InteractiveBraceHighlightingTests.cs b/src/EditorFeatures/CSharpTest/Interactive/BraceMatching/InteractiveBraceHighlightingTests.cs index 8a8b2be06ad0a..e977e57d074da 100644 --- a/src/EditorFeatures/CSharpTest/Interactive/BraceMatching/InteractiveBraceHighlightingTests.cs +++ b/src/EditorFeatures/CSharpTest/Interactive/BraceMatching/InteractiveBraceHighlightingTests.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching; +using Microsoft.CodeAnalysis.BraceMatching; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.Tagging; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; diff --git a/src/EditorFeatures/CSharpTest/Organizing/OrganizeTypeDeclarationTests.cs b/src/EditorFeatures/CSharpTest/Organizing/OrganizeTypeDeclarationTests.cs index 99ca6817b62fd..2f66d79bfcfb2 100644 --- a/src/EditorFeatures/CSharpTest/Organizing/OrganizeTypeDeclarationTests.cs +++ b/src/EditorFeatures/CSharpTest/Organizing/OrganizeTypeDeclarationTests.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using System.Xml.Linq; using Microsoft.CodeAnalysis.Editor.Commanding.Commands; -using Microsoft.CodeAnalysis.Editor.Implementation.Interactive; using Microsoft.CodeAnalysis.Editor.Implementation.Organizing; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.UnitTests; diff --git a/src/EditorFeatures/Core.Wpf/BraceMatching/BraceMatchingTypeFormatDefinitions.cs b/src/EditorFeatures/Core.Wpf/BraceMatching/BraceMatchingTypeFormatDefinitions.cs index 0dce2638b6d40..0c6d5d26a1e43 100644 --- a/src/EditorFeatures/Core.Wpf/BraceMatching/BraceMatchingTypeFormatDefinitions.cs +++ b/src/EditorFeatures/Core.Wpf/BraceMatching/BraceMatchingTypeFormatDefinitions.cs @@ -7,6 +7,7 @@ using System; using System.ComponentModel.Composition; using System.Windows.Media; +using Microsoft.CodeAnalysis.BraceMatching; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Utilities; diff --git a/src/EditorFeatures/Core.Wpf/Interactive/AbstractInteractiveWindowCommandCompletionProvider.cs b/src/EditorFeatures/Core.Wpf/Interactive/AbstractInteractiveWindowCommandCompletionProvider.cs index 3dd2df04cdbfa..5d03d024b3d9f 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/AbstractInteractiveWindowCommandCompletionProvider.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/AbstractInteractiveWindowCommandCompletionProvider.cs @@ -5,11 +5,10 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Completion; -using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.VisualStudio.InteractiveWindow.Commands; -namespace Microsoft.CodeAnalysis.Completion.Providers +namespace Microsoft.CodeAnalysis.Interactive { /// /// Provides completion items for Interactive Window commands (such as #help, #cls, etc.) at the start of a language buffer. diff --git a/src/EditorFeatures/Core.Wpf/Interactive/IResettableInteractiveEvaluator.cs b/src/EditorFeatures/Core.Wpf/Interactive/IResettableInteractiveEvaluator.cs index 8fe9f4020110f..e82f3282be2f0 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/IResettableInteractiveEvaluator.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/IResettableInteractiveEvaluator.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.InteractiveWindow; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal interface IResettableInteractiveEvaluator : IInteractiveEvaluator { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InertClassifierProvider.InertClassifier.cs b/src/EditorFeatures/Core.Wpf/Interactive/InertClassifierProvider.InertClassifier.cs index 0f44fc3ae6afb..b3a5954187080 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InertClassifierProvider.InertClassifier.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InertClassifierProvider.InertClassifier.cs @@ -11,7 +11,7 @@ using Microsoft.VisualStudio.Text.Classification; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal partial class InertClassifierProvider { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InertClassifierProvider.cs b/src/EditorFeatures/Core.Wpf/Interactive/InertClassifierProvider.cs index 916d7261b2494..83ea3a31148cd 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InertClassifierProvider.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InertClassifierProvider.cs @@ -14,7 +14,7 @@ using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive +namespace Microsoft.CodeAnalysis.Interactive { /// /// A classifier provider that caches the classification results from actual classifiers and diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs index 92787b1c45c5f..1883036ada181 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandContentTypeLanguageService.cs @@ -4,14 +4,14 @@ #nullable disable -using System.Composition; -using Microsoft.CodeAnalysis.Interactive; -using Microsoft.VisualStudio.Utilities; -using Microsoft.VisualStudio.InteractiveWindow.Commands; using System; +using System.Composition; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.VisualStudio.InteractiveWindow.Commands; +using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive +namespace Microsoft.CodeAnalysis.Interactive { [ExportContentTypeLanguageService(PredefinedInteractiveCommandsContentTypes.InteractiveCommandContentTypeName, InteractiveLanguageNames.InteractiveCommand), Shared] internal class InteractiveCommandContentTypeLanguageService : IContentTypeLanguageService diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs index 3205db76bcd48..950f687e7af53 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveCommandHandler.cs @@ -18,7 +18,7 @@ using Microsoft.VisualStudio.Commanding; using Microsoft.VisualStudio.Text.Editor.Commanding; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal abstract class InteractiveCommandHandler : ICommandHandler, diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveDocumentNavigationService.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveDocumentNavigationService.cs index 6b3e672a6e6ca..563417bbaef17 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveDocumentNavigationService.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveDocumentNavigationService.cs @@ -6,7 +6,6 @@ using System.Diagnostics; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Navigation; @@ -15,7 +14,7 @@ using Microsoft.VisualStudio.Text.Editor; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal sealed class InteractiveDocumentNavigationService : IDocumentNavigationService { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveDocumentNavigationServiceFactory.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveDocumentNavigationServiceFactory.cs index f090b159c0567..0cc118e18409c 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveDocumentNavigationServiceFactory.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveDocumentNavigationServiceFactory.cs @@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Navigation; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive +namespace Microsoft.CodeAnalysis.Interactive { [ExportWorkspaceServiceFactory(typeof(IDocumentNavigationService), WorkspaceKind.Interactive), Shared] internal sealed class InteractiveDocumentNavigationServiceFactory : IWorkspaceServiceFactory diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs index 38f78107a04b7..657f511cde164 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs @@ -10,7 +10,6 @@ using System.Diagnostics; using System.IO; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Implementation.Interactive; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.ErrorReporting; @@ -24,7 +23,7 @@ using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { using InteractiveHost::Microsoft.CodeAnalysis.Interactive; diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluatorResetOptions.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluatorResetOptions.cs index eb6a65b822172..e923100861a5b 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluatorResetOptions.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluatorResetOptions.cs @@ -5,7 +5,7 @@ extern alias InteractiveHost; using InteractiveHost::Microsoft.CodeAnalysis.Interactive; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal sealed class InteractiveEvaluatorResetOptions { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveGlobalUndoServiceFactory.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveGlobalUndoServiceFactory.cs index 78a124fbfa111..2e9b0946cba22 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveGlobalUndoServiceFactory.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveGlobalUndoServiceFactory.cs @@ -6,14 +6,13 @@ using System; using System.Composition; -using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.CodeAnalysis.Editor.Undo; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text.Operations; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive +namespace Microsoft.CodeAnalysis.Interactive { [ExportWorkspaceServiceFactory(typeof(IGlobalUndoService), WorkspaceKind.Interactive), Shared] internal sealed class InteractiveGlobalUndoServiceFactory : IWorkspaceServiceFactory diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractivePasteCommandHandler.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractivePasteCommandHandler.cs index 48dbd5836eb5e..7ff2059c19bdb 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractivePasteCommandHandler.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractivePasteCommandHandler.cs @@ -10,6 +10,7 @@ using System.IO; using System.Runtime.CompilerServices; using System.Windows; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Commanding; using Microsoft.VisualStudio.InteractiveWindow; @@ -21,7 +22,7 @@ using Microsoft.VisualStudio.Text.Operations; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.CommandHandlers +namespace Microsoft.CodeAnalysis.Interactive { // This command handler must be invoked after the handlers specified in `Order` attribute // (those handlers also implement `ICommandHandler`), diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs index 78aaa3c847bbb..272535c6711f1 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveSupportsFeatureService.cs @@ -10,7 +10,7 @@ using Microsoft.CodeAnalysis.Shared; using System; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal sealed class InteractiveSupportsFeatureService { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveTextUndoHistoryWorkspaceServiceFactory.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveTextUndoHistoryWorkspaceServiceFactory.cs index 4ee43210365b3..514666010f028 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveTextUndoHistoryWorkspaceServiceFactory.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveTextUndoHistoryWorkspaceServiceFactory.cs @@ -6,13 +6,13 @@ using System; using System.Composition; -using Microsoft.CodeAnalysis.Editor.Interactive; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Operations; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Interactive +namespace Microsoft.CodeAnalysis.Interactive { [ExportWorkspaceServiceFactory(typeof(ITextUndoHistoryWorkspaceService), WorkspaceKind.Interactive), Shared] internal sealed class InteractiveTextUndoHistoryWorkspaceServiceFactory : IWorkspaceServiceFactory diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowContentTypes.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowContentTypes.cs index 8b19d20475557..a2aa8986928a0 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowContentTypes.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowContentTypes.cs @@ -7,7 +7,7 @@ using System.ComponentModel.Composition; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.VisualStudio.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { /// /// Represents the content type for specialized interactive commands for C# and VB diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs index 1424d5018481b..3179927f9321f 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowResetCommand.cs @@ -11,7 +11,6 @@ using System.ComponentModel.Composition; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.VisualStudio.Editor.Interactive; using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.InteractiveWindow.Commands; using Microsoft.VisualStudio.Language.StandardClassification; @@ -21,7 +20,7 @@ using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { /// /// Represents a reset command which can be run from a REPL window. diff --git a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowWorkspace.cs b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowWorkspace.cs index bfa0abcd97c5c..c322d33c9168e 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowWorkspace.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowWorkspace.cs @@ -6,7 +6,7 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.VisualStudio.InteractiveWindow; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal sealed class InteractiveWindowWorkspace : InteractiveWorkspace { diff --git a/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs b/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs index bb49cea83a519..d298561b31a73 100644 --- a/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs +++ b/src/EditorFeatures/Core.Wpf/Interactive/ResetInteractive.cs @@ -5,23 +5,20 @@ #nullable disable extern alias InteractiveHost; - using System; +using System.Collections.Generic; +using System.Collections.Immutable; using System.Linq; using System.Threading.Tasks; -using Roslyn.Utilities; -using Microsoft.CodeAnalysis.Editor.Host; -using Microsoft.CodeAnalysis.Editor.Interactive; +using InteractiveHost::Microsoft.CodeAnalysis.Interactive; +using Microsoft.CodeAnalysis; using Microsoft.VisualStudio.InteractiveWindow; -using System.Collections.Immutable; -using Microsoft.CodeAnalysis.Editor; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; -using System.Collections.Generic; -using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.Utilities; +using Roslyn.Utilities; -namespace Microsoft.VisualStudio.LanguageServices.Interactive +namespace Microsoft.CodeAnalysis.Interactive { /// /// ResetInteractive class that implements base functionality for reset interactive command. diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj index 3ecafc689faad..b5f03f0b66d5f 100644 --- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj +++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj @@ -3,7 +3,7 @@ Library - Microsoft.CodeAnalysis.Editor + Microsoft.CodeAnalysis net472 true true diff --git a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSourceProvider.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSourceProvider.cs index a99c015036d7e..89a9c8218da4e 100644 --- a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSourceProvider.cs +++ b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSourceProvider.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.ComponentModel.Composition; +using Microsoft.CodeAnalysis.CodeActions; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.CodeRefactorings; using Microsoft.CodeAnalysis.Diagnostics; diff --git a/src/EditorFeatures/Core/AddImports/AbstractAddImportsPasteCommandHandler.cs b/src/EditorFeatures/Core/AddImports/AbstractAddImportsPasteCommandHandler.cs index c2cb8b262b551..115762c6da533 100644 --- a/src/EditorFeatures/Core/AddImports/AbstractAddImportsPasteCommandHandler.cs +++ b/src/EditorFeatures/Core/AddImports/AbstractAddImportsPasteCommandHandler.cs @@ -3,10 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.CodeAnalysis.AddImport; using Microsoft.CodeAnalysis.AddMissingImports; using Microsoft.CodeAnalysis.Completion; -using Microsoft.CodeAnalysis.CodeGeneration; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; @@ -18,7 +16,7 @@ using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; -namespace Microsoft.CodeAnalysis.Editor.Implementation.AddImports +namespace Microsoft.CodeAnalysis.AddImport { internal abstract class AbstractAddImportsPasteCommandHandler : IChainedCommandHandler { diff --git a/src/EditorFeatures/Core/AutomaticCompletion/AbstractAutomaticLineEnderCommandHandler.cs b/src/EditorFeatures/Core/AutomaticCompletion/AbstractAutomaticLineEnderCommandHandler.cs index bc05d24f30234..e45e609ba2573 100644 --- a/src/EditorFeatures/Core/AutomaticCompletion/AbstractAutomaticLineEnderCommandHandler.cs +++ b/src/EditorFeatures/Core/AutomaticCompletion/AbstractAutomaticLineEnderCommandHandler.cs @@ -4,9 +4,9 @@ using System; using System.Threading; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Options; -using Microsoft.CodeAnalysis.LanguageServices; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; @@ -16,7 +16,7 @@ using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; using Microsoft.VisualStudio.Text.Operations; -namespace Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +namespace Microsoft.CodeAnalysis.AutomaticCompletion { internal abstract class AbstractAutomaticLineEnderCommandHandler : IChainedCommandHandler diff --git a/src/EditorFeatures/Core/AutomaticCompletion/AbstractBraceCompletionServiceFactory.cs b/src/EditorFeatures/Core/AutomaticCompletion/AbstractBraceCompletionServiceFactory.cs index d612f968489e3..771d0f5b0b6da 100644 --- a/src/EditorFeatures/Core/AutomaticCompletion/AbstractBraceCompletionServiceFactory.cs +++ b/src/EditorFeatures/Core/AutomaticCompletion/AbstractBraceCompletionServiceFactory.cs @@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.BraceCompletion; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +namespace Microsoft.CodeAnalysis.AutomaticCompletion { internal abstract class AbstractBraceCompletionServiceFactory : ForegroundThreadAffinitizedObject, IBraceCompletionServiceFactory { diff --git a/src/EditorFeatures/Core/AutomaticCompletion/BraceCompletionSessionProvider.BraceCompletionSession.cs b/src/EditorFeatures/Core/AutomaticCompletion/BraceCompletionSessionProvider.BraceCompletionSession.cs index c9306b562bd4b..62dcf63715945 100644 --- a/src/EditorFeatures/Core/AutomaticCompletion/BraceCompletionSessionProvider.BraceCompletionSession.cs +++ b/src/EditorFeatures/Core/AutomaticCompletion/BraceCompletionSessionProvider.BraceCompletionSession.cs @@ -8,6 +8,7 @@ using System.Diagnostics; using System.Threading; using Microsoft.CodeAnalysis.BraceCompletion; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.ErrorReporting; @@ -20,7 +21,7 @@ using Microsoft.VisualStudio.Text.Operations; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +namespace Microsoft.CodeAnalysis.AutomaticCompletion { internal partial class BraceCompletionSessionProvider { diff --git a/src/EditorFeatures/Core/AutomaticCompletion/BraceCompletionSessionProvider.cs b/src/EditorFeatures/Core/AutomaticCompletion/BraceCompletionSessionProvider.cs index 2cdd7c93f14eb..865562f5963e5 100644 --- a/src/EditorFeatures/Core/AutomaticCompletion/BraceCompletionSessionProvider.cs +++ b/src/EditorFeatures/Core/AutomaticCompletion/BraceCompletionSessionProvider.cs @@ -7,6 +7,7 @@ using System; using System.ComponentModel.Composition; using System.Threading; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Shared.Extensions; @@ -19,7 +20,7 @@ using Roslyn.Utilities; using static Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService; -namespace Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +namespace Microsoft.CodeAnalysis.AutomaticCompletion { [Export(typeof(IBraceCompletionSessionProvider))] [ContentType(ContentTypeNames.RoslynContentType)] diff --git a/src/EditorFeatures/Core/AutomaticCompletion/Extensions.cs b/src/EditorFeatures/Core/AutomaticCompletion/Extensions.cs index f51a5f537606f..395ecf9154238 100644 --- a/src/EditorFeatures/Core/AutomaticCompletion/Extensions.cs +++ b/src/EditorFeatures/Core/AutomaticCompletion/Extensions.cs @@ -17,7 +17,7 @@ using Microsoft.VisualStudio.Text.Operations; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +namespace Microsoft.CodeAnalysis.AutomaticCompletion { internal static class Extensions { diff --git a/src/EditorFeatures/Core/AutomaticCompletion/IBraceCompletionServiceFactory.cs b/src/EditorFeatures/Core/AutomaticCompletion/IBraceCompletionServiceFactory.cs index 4c31f71f501bc..4c5c03440d6c5 100644 --- a/src/EditorFeatures/Core/AutomaticCompletion/IBraceCompletionServiceFactory.cs +++ b/src/EditorFeatures/Core/AutomaticCompletion/IBraceCompletionServiceFactory.cs @@ -7,7 +7,7 @@ using Microsoft.CodeAnalysis.BraceCompletion; using Microsoft.CodeAnalysis.Host; -namespace Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +namespace Microsoft.CodeAnalysis.AutomaticCompletion { internal interface IBraceCompletionServiceFactory : ILanguageService { diff --git a/src/EditorFeatures/Core/BraceMatching/AbstractBraceMatcher.cs b/src/EditorFeatures/Core/BraceMatching/AbstractBraceMatcher.cs index 14d17b7a5379b..bc772f929b8dd 100644 --- a/src/EditorFeatures/Core/BraceMatching/AbstractBraceMatcher.cs +++ b/src/EditorFeatures/Core/BraceMatching/AbstractBraceMatcher.cs @@ -7,8 +7,10 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Editor; -namespace Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +namespace Microsoft.CodeAnalysis.BraceMatching { internal abstract class AbstractBraceMatcher : IBraceMatcher { diff --git a/src/EditorFeatures/Core/BraceMatching/AbstractEmbeddedLanguageBraceMatcher.cs b/src/EditorFeatures/Core/BraceMatching/AbstractEmbeddedLanguageBraceMatcher.cs index ed2974b5972ca..9b193938ab523 100644 --- a/src/EditorFeatures/Core/BraceMatching/AbstractEmbeddedLanguageBraceMatcher.cs +++ b/src/EditorFeatures/Core/BraceMatching/AbstractEmbeddedLanguageBraceMatcher.cs @@ -6,11 +6,12 @@ using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.EmbeddedLanguages; using Microsoft.CodeAnalysis.EmbeddedLanguages.LanguageServices; using Microsoft.CodeAnalysis.Shared.Extensions; -namespace Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +namespace Microsoft.CodeAnalysis.BraceMatching { // Note: this type could be concrete, but we cannot export IBraceMatcher's for multiple // languages at once. So all logic is contained here. The derived types only exist for diff --git a/src/EditorFeatures/Core/BraceMatching/BraceCharacterAndKind.cs b/src/EditorFeatures/Core/BraceMatching/BraceCharacterAndKind.cs index d6630f51ef730..0d72b86c00ca7 100644 --- a/src/EditorFeatures/Core/BraceMatching/BraceCharacterAndKind.cs +++ b/src/EditorFeatures/Core/BraceMatching/BraceCharacterAndKind.cs @@ -4,7 +4,9 @@ #nullable disable -namespace Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +using Microsoft; + +namespace Microsoft.CodeAnalysis.BraceMatching { internal struct BraceCharacterAndKind { diff --git a/src/EditorFeatures/Core/BraceMatching/BraceHighlightTag.cs b/src/EditorFeatures/Core/BraceMatching/BraceHighlightTag.cs index 4b94261fa65ce..4d29cd5845325 100644 --- a/src/EditorFeatures/Core/BraceMatching/BraceHighlightTag.cs +++ b/src/EditorFeatures/Core/BraceMatching/BraceHighlightTag.cs @@ -6,7 +6,7 @@ using Microsoft.VisualStudio.Text.Tagging; -namespace Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +namespace Microsoft.CodeAnalysis.BraceMatching { internal class BraceHighlightTag : TextMarkerTag { diff --git a/src/EditorFeatures/Core/BraceMatching/BraceHighlightingViewTaggerProvider.cs b/src/EditorFeatures/Core/BraceMatching/BraceHighlightingViewTaggerProvider.cs index 7e21e6aef9fe1..3f0002fd0da86 100644 --- a/src/EditorFeatures/Core/BraceMatching/BraceHighlightingViewTaggerProvider.cs +++ b/src/EditorFeatures/Core/BraceMatching/BraceHighlightingViewTaggerProvider.cs @@ -9,6 +9,7 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; @@ -23,7 +24,7 @@ using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +namespace Microsoft.CodeAnalysis.BraceMatching { [Export(typeof(IViewTaggerProvider))] [ContentType(ContentTypeNames.RoslynContentType)] diff --git a/src/EditorFeatures/Core/BraceMatching/BraceMatchingService.cs b/src/EditorFeatures/Core/BraceMatching/BraceMatchingService.cs index 9ec0c50b28102..34f64ecf8b342 100644 --- a/src/EditorFeatures/Core/BraceMatching/BraceMatchingService.cs +++ b/src/EditorFeatures/Core/BraceMatching/BraceMatchingService.cs @@ -11,9 +11,10 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host.Mef; -namespace Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +namespace Microsoft.CodeAnalysis.BraceMatching { [Export(typeof(IBraceMatchingService))] internal class BraceMatchingService : IBraceMatchingService diff --git a/src/EditorFeatures/Core/BraceMatching/ClassificationTypeDefinitions.cs b/src/EditorFeatures/Core/BraceMatching/ClassificationTypeDefinitions.cs index 333ac2e5a3ed0..a7223f2027c57 100644 --- a/src/EditorFeatures/Core/BraceMatching/ClassificationTypeDefinitions.cs +++ b/src/EditorFeatures/Core/BraceMatching/ClassificationTypeDefinitions.cs @@ -9,7 +9,7 @@ using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +namespace Microsoft.CodeAnalysis.BraceMatching { internal sealed class ClassificationTypeDefinitions { diff --git a/src/EditorFeatures/Core/ChangeSignature/AbstractChangeSignatureCommandHandler.cs b/src/EditorFeatures/Core/ChangeSignature/AbstractChangeSignatureCommandHandler.cs index 38658c727e053..c00d4cfe0a923 100644 --- a/src/EditorFeatures/Core/ChangeSignature/AbstractChangeSignatureCommandHandler.cs +++ b/src/EditorFeatures/Core/ChangeSignature/AbstractChangeSignatureCommandHandler.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics.CodeAnalysis; -using Microsoft.CodeAnalysis.ChangeSignature; using Microsoft.CodeAnalysis.Editor.Host; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; @@ -17,7 +16,7 @@ using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.ChangeSignature +namespace Microsoft.CodeAnalysis.ChangeSignature { internal abstract class AbstractChangeSignatureCommandHandler : ICommandHandler, ICommandHandler diff --git a/src/EditorFeatures/Core/Classification/ClassificationTypeDefinitions.cs b/src/EditorFeatures/Core/Classification/ClassificationTypeDefinitions.cs index 264282140ae6e..ce30c28c46592 100644 --- a/src/EditorFeatures/Core/Classification/ClassificationTypeDefinitions.cs +++ b/src/EditorFeatures/Core/Classification/ClassificationTypeDefinitions.cs @@ -5,12 +5,11 @@ #nullable disable using System.ComponentModel.Composition; -using Microsoft.CodeAnalysis.Classification; using Microsoft.VisualStudio.Language.StandardClassification; using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { internal sealed class ClassificationTypeDefinitions { diff --git a/src/EditorFeatures/Core/Classification/CopyPasteAndPrintingClassificationBufferTaggerProvider.Tagger.cs b/src/EditorFeatures/Core/Classification/CopyPasteAndPrintingClassificationBufferTaggerProvider.Tagger.cs index 5d648822f06ec..0ea84597739af 100644 --- a/src/EditorFeatures/Core/Classification/CopyPasteAndPrintingClassificationBufferTaggerProvider.Tagger.cs +++ b/src/EditorFeatures/Core/Classification/CopyPasteAndPrintingClassificationBufferTaggerProvider.Tagger.cs @@ -9,6 +9,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Classification; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.Tagging; @@ -20,7 +21,7 @@ using Microsoft.VisualStudio.Text.Tagging; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { internal partial class CopyPasteAndPrintingClassificationBufferTaggerProvider { diff --git a/src/EditorFeatures/Core/Classification/CopyPasteAndPrintingClassificationBufferTaggerProvider.cs b/src/EditorFeatures/Core/Classification/CopyPasteAndPrintingClassificationBufferTaggerProvider.cs index 6b209997194fb..fdb1664ffb406 100644 --- a/src/EditorFeatures/Core/Classification/CopyPasteAndPrintingClassificationBufferTaggerProvider.cs +++ b/src/EditorFeatures/Core/Classification/CopyPasteAndPrintingClassificationBufferTaggerProvider.cs @@ -4,16 +4,16 @@ using System.ComponentModel.Composition; using System.Diagnostics.CodeAnalysis; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; -using Microsoft.CodeAnalysis.Notification; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Tagging; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { /// /// This is the tagger we use for buffer classification scenarios. It is only used for diff --git a/src/EditorFeatures/Core/Classification/Semantic/AbstractSemanticOrEmbeddedClassificationViewTaggerProvider.cs b/src/EditorFeatures/Core/Classification/Semantic/AbstractSemanticOrEmbeddedClassificationViewTaggerProvider.cs index 067f9f111e9f2..c9f54cc42566d 100644 --- a/src/EditorFeatures/Core/Classification/Semantic/AbstractSemanticOrEmbeddedClassificationViewTaggerProvider.cs +++ b/src/EditorFeatures/Core/Classification/Semantic/AbstractSemanticOrEmbeddedClassificationViewTaggerProvider.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Classification; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; @@ -22,7 +21,7 @@ using Microsoft.VisualStudio.Text.Tagging; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { /// /// This is the tagger we use for view classification scenarios. It is used for classifying code @@ -57,7 +56,7 @@ protected AbstractSemanticOrEmbeddedClassificationViewTaggerProvider( protected sealed override ITaggerEventSource CreateEventSource(ITextView textView, ITextBuffer subjectBuffer) { - this.AssertIsForeground(); + AssertIsForeground(); // Note: we don't listen for OnTextChanged. They'll get reported by the ViewSpan changing and also the // SemanticChange notification. @@ -69,23 +68,21 @@ protected sealed override ITaggerEventSource CreateEventSource(ITextView textVie subjectBuffer, AsyncListener, TaggerEventSources.OnViewSpanChanged(ThreadingContext, textView), - TaggerEventSources.OnWorkspaceChanged(subjectBuffer, this.AsyncListener), + TaggerEventSources.OnWorkspaceChanged(subjectBuffer, AsyncListener), TaggerEventSources.OnDocumentActiveContextChanged(subjectBuffer), TaggerEventSources.OnOptionChanged(subjectBuffer, ClassificationOptionsStorage.ClassifyReassignedVariables)); } protected sealed override IEnumerable GetSpansToTag(ITextView textView, ITextBuffer subjectBuffer) { - this.AssertIsForeground(); + AssertIsForeground(); // Find the visible span some 100 lines +/- what's actually in view. This way // if the user scrolls up/down, we'll already have the results. var visibleSpanOpt = textView.GetVisibleLinesSpan(subjectBuffer, extraLines: 100); if (visibleSpanOpt == null) - { // Couldn't find anything visible, just fall back to classifying everything. return base.GetSpansToTag(textView, subjectBuffer); - } return SpecializedCollections.SingletonEnumerable(visibleSpanOpt.Value); } @@ -117,9 +114,7 @@ protected sealed override Task ProduceTagsAsync( // If the LSP semantic tokens feature flag is enabled, return nothing to prevent conflicts. var isLspSemanticTokensEnabled = _globalOptions.GetOption(LspOptions.LspSemanticTokensFeatureFlag); if (isLspSemanticTokensEnabled) - { return Task.CompletedTask; - } var classificationOptions = _globalOptions.GetClassificationOptions(document.Project.Language); return ClassificationUtilities.ProduceTagsAsync( diff --git a/src/EditorFeatures/Core/Classification/Semantic/ClassificationUtilities.cs b/src/EditorFeatures/Core/Classification/Semantic/ClassificationUtilities.cs index e39dfbe5cd445..023191bdf5336 100644 --- a/src/EditorFeatures/Core/Classification/Semantic/ClassificationUtilities.cs +++ b/src/EditorFeatures/Core/Classification/Semantic/ClassificationUtilities.cs @@ -8,6 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Classification; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.Tagging; @@ -23,7 +24,7 @@ using Microsoft.VisualStudio.Text.Tagging; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { internal static class ClassificationUtilities { diff --git a/src/EditorFeatures/Core/Classification/Semantic/EmbeddedLanguageClassificationViewTaggerProvider.cs b/src/EditorFeatures/Core/Classification/Semantic/EmbeddedLanguageClassificationViewTaggerProvider.cs index f7b35ac9f446d..8520ec643f48e 100644 --- a/src/EditorFeatures/Core/Classification/Semantic/EmbeddedLanguageClassificationViewTaggerProvider.cs +++ b/src/EditorFeatures/Core/Classification/Semantic/EmbeddedLanguageClassificationViewTaggerProvider.cs @@ -4,14 +4,14 @@ using System.ComponentModel.Composition; using System.Diagnostics.CodeAnalysis; -using Microsoft.CodeAnalysis.Classification; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.Text.Tagging; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { /// /// This is the tagger we use for classifying the embedded language string literals currently visible in the editor view. diff --git a/src/EditorFeatures/Core/Classification/Semantic/SemanticClassificationViewTaggerProvider.cs b/src/EditorFeatures/Core/Classification/Semantic/SemanticClassificationViewTaggerProvider.cs index 3914701e8e971..ad5b5f0b3c483 100644 --- a/src/EditorFeatures/Core/Classification/Semantic/SemanticClassificationViewTaggerProvider.cs +++ b/src/EditorFeatures/Core/Classification/Semantic/SemanticClassificationViewTaggerProvider.cs @@ -4,14 +4,14 @@ using System.ComponentModel.Composition; using System.Diagnostics.CodeAnalysis; -using Microsoft.CodeAnalysis.Classification; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.VisualStudio.Text.Tagging; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { /// /// This is the tagger we use for view classification scenarios. It is used for classifying code diff --git a/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.LastLineCache.cs b/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.LastLineCache.cs index de61f30ff1020..d70e0e3951932 100644 --- a/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.LastLineCache.cs +++ b/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.LastLineCache.cs @@ -7,7 +7,7 @@ using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.VisualStudio.Text; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { internal partial class SyntacticClassificationTaggerProvider { diff --git a/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs b/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs index 92fbec8040e6a..dbb7f4733d63a 100644 --- a/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs +++ b/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs @@ -22,7 +22,7 @@ using Microsoft.VisualStudio.Text.Tagging; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { internal partial class SyntacticClassificationTaggerProvider { diff --git a/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.Tagger.cs b/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.Tagger.cs index 57919f73f2881..23379a675705b 100644 --- a/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.Tagger.cs +++ b/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.Tagger.cs @@ -7,7 +7,7 @@ using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Tagging; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { internal partial class SyntacticClassificationTaggerProvider { diff --git a/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.cs b/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.cs index 4dc841b722fea..9d79e1645f976 100644 --- a/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.cs +++ b/src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.cs @@ -5,7 +5,7 @@ using System.ComponentModel.Composition; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using Microsoft.CodeAnalysis.Editor.Shared.Extensions; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; @@ -17,7 +17,7 @@ using Microsoft.VisualStudio.Text.Tagging; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification +namespace Microsoft.CodeAnalysis.Classification { [Export(typeof(ITaggerProvider))] [ContentType(ContentTypeNames.RoslynContentType)] diff --git a/src/EditorFeatures/Core/CodeActions/CodeActionEditHandlerService.cs b/src/EditorFeatures/Core/CodeActions/CodeActionEditHandlerService.cs index 10e8485fdd503..34542f1205b1f 100644 --- a/src/EditorFeatures/Core/CodeActions/CodeActionEditHandlerService.cs +++ b/src/EditorFeatures/Core/CodeActions/CodeActionEditHandlerService.cs @@ -9,7 +9,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CodeActions; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.Undo; using Microsoft.CodeAnalysis.ErrorReporting; @@ -22,7 +23,7 @@ using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeActions +namespace Microsoft.CodeAnalysis.CodeActions { [Export(typeof(ICodeActionEditHandlerService))] internal class CodeActionEditHandlerService : ForegroundThreadAffinitizedObject, ICodeActionEditHandlerService diff --git a/src/EditorFeatures/Core/CodeActions/ICodeActionEditHandlerService.cs b/src/EditorFeatures/Core/CodeActions/ICodeActionEditHandlerService.cs index 66e77c014cceb..ff34e723b9ed3 100644 --- a/src/EditorFeatures/Core/CodeActions/ICodeActionEditHandlerService.cs +++ b/src/EditorFeatures/Core/CodeActions/ICodeActionEditHandlerService.cs @@ -5,10 +5,10 @@ using System.Collections.Immutable; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CodeActions; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Shared.Utilities; -namespace Microsoft.CodeAnalysis.Editor +namespace Microsoft.CodeAnalysis.CodeActions { internal interface ICodeActionEditHandlerService { diff --git a/src/EditorFeatures/Core/CodeDefinitionWindow/CodeDefinitionWindowLocation.cs b/src/EditorFeatures/Core/CodeDefinitionWindow/CodeDefinitionWindowLocation.cs index 7604cdc5e9389..860b8b826b53b 100644 --- a/src/EditorFeatures/Core/CodeDefinitionWindow/CodeDefinitionWindowLocation.cs +++ b/src/EditorFeatures/Core/CodeDefinitionWindow/CodeDefinitionWindowLocation.cs @@ -4,7 +4,6 @@ using Microsoft.CodeAnalysis.Text; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeDefinitionWindow -{ - internal record struct CodeDefinitionWindowLocation(string DisplayName, string FilePath, LinePosition Position); -} +namespace Microsoft.CodeAnalysis.CodeDefinitionWindow; + +internal record struct CodeDefinitionWindowLocation(string DisplayName, string FilePath, LinePosition Position); diff --git a/src/EditorFeatures/Core/CodeDefinitionWindow/DefinitionContextTracker.cs b/src/EditorFeatures/Core/CodeDefinitionWindow/DefinitionContextTracker.cs index e1e1059e5944b..b4fa664380ca4 100644 --- a/src/EditorFeatures/Core/CodeDefinitionWindow/DefinitionContextTracker.cs +++ b/src/EditorFeatures/Core/CodeDefinitionWindow/DefinitionContextTracker.cs @@ -10,6 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.GoToDefinition; using Microsoft.CodeAnalysis.Editor.Shared.Options; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; @@ -28,7 +29,7 @@ using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeDefinitionWindow +namespace Microsoft.CodeAnalysis.CodeDefinitionWindow { /// /// A type that tracks caret movements, and when you've been on an identifier for awhile, pushes the new diff --git a/src/EditorFeatures/Core/CodeDefinitionWindow/ICodeDefinitionWindowService.cs b/src/EditorFeatures/Core/CodeDefinitionWindow/ICodeDefinitionWindowService.cs index 90f7fd21f79fd..85103121e9279 100644 --- a/src/EditorFeatures/Core/CodeDefinitionWindow/ICodeDefinitionWindowService.cs +++ b/src/EditorFeatures/Core/CodeDefinitionWindow/ICodeDefinitionWindowService.cs @@ -6,11 +6,10 @@ using System.Threading; using System.Threading.Tasks; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeDefinitionWindow +namespace Microsoft.CodeAnalysis.CodeDefinitionWindow; + +internal interface ICodeDefinitionWindowService { - internal interface ICodeDefinitionWindowService - { - Task IsWindowOpenAsync(CancellationToken cancellationToken); - Task SetContextAsync(ImmutableArray locations, CancellationToken cancellationToken); - } + Task IsWindowOpenAsync(CancellationToken cancellationToken); + Task SetContextAsync(ImmutableArray locations, CancellationToken cancellationToken); } diff --git a/src/EditorFeatures/Core/CodeRefactorings/EditorLayerCodeActionHelpersService.cs b/src/EditorFeatures/Core/CodeRefactorings/EditorLayerCodeActionHelpersService.cs index 411b91c674bb0..1a697d8bf3aa7 100644 --- a/src/EditorFeatures/Core/CodeRefactorings/EditorLayerCodeActionHelpersService.cs +++ b/src/EditorFeatures/Core/CodeRefactorings/EditorLayerCodeActionHelpersService.cs @@ -6,11 +6,11 @@ using System; using System.Composition; -using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CodeRefactorings +namespace Microsoft.CodeAnalysis.CodeRefactorings { [ExportWorkspaceServiceFactory(typeof(ICodeRefactoringHelpersService), ServiceLayer.Editor), Shared] internal class EditorLayerCodeActionHelpersService : IWorkspaceServiceFactory diff --git a/src/EditorFeatures/Core/CommandHandlers/IExecuteInInteractiveCommandHandler.cs b/src/EditorFeatures/Core/CommandHandlers/IExecuteInInteractiveCommandHandler.cs deleted file mode 100644 index 6931c34d66a00..0000000000000 --- a/src/EditorFeatures/Core/CommandHandlers/IExecuteInInteractiveCommandHandler.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// 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.VisualStudio.Commanding; -using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; - -namespace Microsoft.CodeAnalysis.Editor.CommandHandlers -{ - /// - /// Interface for the ExecuteInInteractiveCommand handler. - /// Ensures that the command handler can be exported via MEF - /// without actually being instantiated as all other command handlers. - /// - internal interface IExecuteInInteractiveCommandHandler - : ICommandHandler - { - } -} diff --git a/src/EditorFeatures/Core/CommentSelection/AbstractCommentSelectionBase.cs b/src/EditorFeatures/Core/CommentSelection/AbstractCommentSelectionBase.cs index ff48b8e381f87..fecd79365b410 100644 --- a/src/EditorFeatures/Core/CommentSelection/AbstractCommentSelectionBase.cs +++ b/src/EditorFeatures/Core/CommentSelection/AbstractCommentSelectionBase.cs @@ -9,7 +9,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommentSelection; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.PooledObjects; @@ -22,7 +21,7 @@ using Microsoft.VisualStudio.Text.Operations; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +namespace Microsoft.CodeAnalysis.CommentSelection { internal enum Operation { diff --git a/src/EditorFeatures/Core/CommentSelection/AbstractToggleBlockCommentBase.cs b/src/EditorFeatures/Core/CommentSelection/AbstractToggleBlockCommentBase.cs index bf692eea16761..a035e42e67ba1 100644 --- a/src/EditorFeatures/Core/CommentSelection/AbstractToggleBlockCommentBase.cs +++ b/src/EditorFeatures/Core/CommentSelection/AbstractToggleBlockCommentBase.cs @@ -10,7 +10,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommentSelection; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.PooledObjects; @@ -23,7 +22,7 @@ using Microsoft.VisualStudio.Text.Operations; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +namespace Microsoft.CodeAnalysis.CommentSelection { internal abstract class AbstractToggleBlockCommentBase : // Value tuple to represent that there is no distinct command to be passed in. diff --git a/src/EditorFeatures/Core/CommentSelection/CommentSelectionResult.cs b/src/EditorFeatures/Core/CommentSelection/CommentSelectionResult.cs index 1ececa462caf0..56d7c381d1609 100644 --- a/src/EditorFeatures/Core/CommentSelection/CommentSelectionResult.cs +++ b/src/EditorFeatures/Core/CommentSelection/CommentSelectionResult.cs @@ -8,7 +8,7 @@ using System.Collections.Immutable; using Microsoft.CodeAnalysis.Text; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +namespace Microsoft.CodeAnalysis.CommentSelection { internal readonly struct CommentSelectionResult { diff --git a/src/EditorFeatures/Core/CommentSelection/CommentTrackingSpan.cs b/src/EditorFeatures/Core/CommentSelection/CommentTrackingSpan.cs index 9f93500cec0fc..980a959796347 100644 --- a/src/EditorFeatures/Core/CommentSelection/CommentTrackingSpan.cs +++ b/src/EditorFeatures/Core/CommentSelection/CommentTrackingSpan.cs @@ -6,7 +6,7 @@ using Microsoft.CodeAnalysis.Text; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +namespace Microsoft.CodeAnalysis.CommentSelection { /// /// Wrapper around a TextSpan that holds extra data used to create a tracking span. diff --git a/src/EditorFeatures/Core/CommentSelection/CommentUncommentSelectionCommandHandler.cs b/src/EditorFeatures/Core/CommentSelection/CommentUncommentSelectionCommandHandler.cs index 899c2166669bf..569ce65ee89ae 100644 --- a/src/EditorFeatures/Core/CommentSelection/CommentUncommentSelectionCommandHandler.cs +++ b/src/EditorFeatures/Core/CommentSelection/CommentUncommentSelectionCommandHandler.cs @@ -10,7 +10,7 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommentSelection; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; @@ -22,7 +22,7 @@ using Microsoft.VisualStudio.Text.Operations; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +namespace Microsoft.CodeAnalysis.CommentSelection { [Export(typeof(ICommandHandler))] [VisualStudio.Utilities.ContentType(ContentTypeNames.RoslynContentType)] diff --git a/src/EditorFeatures/Core/CommentSelection/ToggleBlockCommentCommandHandler.cs b/src/EditorFeatures/Core/CommentSelection/ToggleBlockCommentCommandHandler.cs index 905bece27711b..9f89e44b9fdb0 100644 --- a/src/EditorFeatures/Core/CommentSelection/ToggleBlockCommentCommandHandler.cs +++ b/src/EditorFeatures/Core/CommentSelection/ToggleBlockCommentCommandHandler.cs @@ -9,7 +9,7 @@ using System.ComponentModel.Composition; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommentSelection; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Shared.Extensions; @@ -18,7 +18,7 @@ using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Operations; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +namespace Microsoft.CodeAnalysis.CommentSelection { [Export(typeof(ICommandHandler))] [VisualStudio.Utilities.ContentType(ContentTypeNames.RoslynContentType)] diff --git a/src/EditorFeatures/Core/CommentSelection/ToggleLineCommentCommandHandler.cs b/src/EditorFeatures/Core/CommentSelection/ToggleLineCommentCommandHandler.cs index 2bf10c1d70a04..f6018bf1bb9f2 100644 --- a/src/EditorFeatures/Core/CommentSelection/ToggleLineCommentCommandHandler.cs +++ b/src/EditorFeatures/Core/CommentSelection/ToggleLineCommentCommandHandler.cs @@ -11,7 +11,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.CommentSelection; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Internal.Log; @@ -26,7 +26,7 @@ using Microsoft.VisualStudio.Text.Operations; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +namespace Microsoft.CodeAnalysis.CommentSelection { [Export(typeof(ICommandHandler))] [VisualStudio.Utilities.ContentType(ContentTypeNames.RoslynContentType)] diff --git a/src/EditorFeatures/Core/ContentTypes/ContentTypeDefinitions.cs b/src/EditorFeatures/Core/Editor/ContentTypeDefinitions.cs similarity index 100% rename from src/EditorFeatures/Core/ContentTypes/ContentTypeDefinitions.cs rename to src/EditorFeatures/Core/Editor/ContentTypeDefinitions.cs diff --git a/src/EditorFeatures/Core/CommandHandlers/ExecuteInInteractiveCommandHandler.cs b/src/EditorFeatures/Core/Interactive/CommandHandlers/ExecuteInInteractiveCommandHandler.cs similarity index 95% rename from src/EditorFeatures/Core/CommandHandlers/ExecuteInInteractiveCommandHandler.cs rename to src/EditorFeatures/Core/Interactive/CommandHandlers/ExecuteInInteractiveCommandHandler.cs index 7dec77f5464d6..2717f3e9d0391 100644 --- a/src/EditorFeatures/Core/CommandHandlers/ExecuteInInteractiveCommandHandler.cs +++ b/src/EditorFeatures/Core/Interactive/CommandHandlers/ExecuteInInteractiveCommandHandler.cs @@ -8,13 +8,15 @@ using System.Collections.Generic; using System.ComponentModel.Composition; using System.Linq; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Commanding; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.CodeAnalysis.Editor.CommandHandlers +namespace Microsoft.CodeAnalysis.Interactive { /// /// Implements a execute in interactive command handler. diff --git a/src/EditorFeatures/Core/Interactive/CommandHandlers/IExecuteInInteractiveCommandHandler.cs b/src/EditorFeatures/Core/Interactive/CommandHandlers/IExecuteInInteractiveCommandHandler.cs new file mode 100644 index 0000000000000..bca94026e7e4b --- /dev/null +++ b/src/EditorFeatures/Core/Interactive/CommandHandlers/IExecuteInInteractiveCommandHandler.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// 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.VisualStudio.Commanding; +using Microsoft.VisualStudio.Text.Editor.Commanding.Commands; + +namespace Microsoft.CodeAnalysis.Interactive; + +/// +/// Interface for the ExecuteInInteractiveCommand handler. +/// Ensures that the command handler can be exported via MEF +/// without actually being instantiated as all other command handlers. +/// +internal interface IExecuteInInteractiveCommandHandler + : ICommandHandler +{ +} diff --git a/src/EditorFeatures/Core/Interactive/Completion/InteractiveCommandCompletionService.cs b/src/EditorFeatures/Core/Interactive/Completion/InteractiveCommandCompletionService.cs index 6137124f9244d..ccc3ce9dc76d9 100644 --- a/src/EditorFeatures/Core/Interactive/Completion/InteractiveCommandCompletionService.cs +++ b/src/EditorFeatures/Core/Interactive/Completion/InteractiveCommandCompletionService.cs @@ -7,9 +7,8 @@ using Microsoft.CodeAnalysis.Completion; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.Interactive; -namespace Microsoft.CodeAnalysis.Editor.Implementation.Completion +namespace Microsoft.CodeAnalysis.Interactive { internal sealed class InteractiveCommandCompletionService : CompletionServiceWithProviders { diff --git a/src/EditorFeatures/Core/Interactive/ISendToInteractiveSubmissionProvider.cs b/src/EditorFeatures/Core/Interactive/ISendToInteractiveSubmissionProvider.cs index 0d525e4553186..a96574c0c119d 100644 --- a/src/EditorFeatures/Core/Interactive/ISendToInteractiveSubmissionProvider.cs +++ b/src/EditorFeatures/Core/Interactive/ISendToInteractiveSubmissionProvider.cs @@ -8,7 +8,7 @@ using Microsoft.VisualStudio.Text.Editor.Commanding; using System.Threading; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal interface ISendToInteractiveSubmissionProvider { diff --git a/src/EditorFeatures/Core/Interactive/InteractiveEvaluatorLanguageInfoProvider.cs b/src/EditorFeatures/Core/Interactive/InteractiveEvaluatorLanguageInfoProvider.cs index ca9d3bd4b270f..e8af95600e93b 100644 --- a/src/EditorFeatures/Core/Interactive/InteractiveEvaluatorLanguageInfoProvider.cs +++ b/src/EditorFeatures/Core/Interactive/InteractiveEvaluatorLanguageInfoProvider.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Immutable; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal abstract class InteractiveEvaluatorLanguageInfoProvider { diff --git a/src/EditorFeatures/Core/Interactive/InteractiveLanguageNames.cs b/src/EditorFeatures/Core/Interactive/InteractiveLanguageNames.cs index fbca023ac9bf4..91be4275b4af9 100644 --- a/src/EditorFeatures/Core/Interactive/InteractiveLanguageNames.cs +++ b/src/EditorFeatures/Core/Interactive/InteractiveLanguageNames.cs @@ -2,12 +2,9 @@ // 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 +namespace Microsoft.CodeAnalysis.Interactive; -namespace Microsoft.CodeAnalysis.Interactive +internal class InteractiveLanguageNames { - internal class InteractiveLanguageNames - { - public const string InteractiveCommand = "Interactive Command"; - } + public const string InteractiveCommand = "Interactive Command"; } diff --git a/src/EditorFeatures/Core/Interactive/InteractiveSession.cs b/src/EditorFeatures/Core/Interactive/InteractiveSession.cs index 1887e80eae6a8..0ce3e7a3f08d2 100644 --- a/src/EditorFeatures/Core/Interactive/InteractiveSession.cs +++ b/src/EditorFeatures/Core/Interactive/InteractiveSession.cs @@ -24,7 +24,7 @@ using Microsoft.VisualStudio.Text; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using RelativePathResolver = Scripting::Microsoft.CodeAnalysis.RelativePathResolver; diff --git a/src/EditorFeatures/Core/Interactive/InteractiveWorkspace.SolutionAnalyzerSetter.cs b/src/EditorFeatures/Core/Interactive/InteractiveWorkspace.SolutionAnalyzerSetter.cs index a5e19dc6ded99..24eab269c2826 100644 --- a/src/EditorFeatures/Core/Interactive/InteractiveWorkspace.SolutionAnalyzerSetter.cs +++ b/src/EditorFeatures/Core/Interactive/InteractiveWorkspace.SolutionAnalyzerSetter.cs @@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal partial class InteractiveWorkspace { diff --git a/src/EditorFeatures/Core/Interactive/InteractiveWorkspace.cs b/src/EditorFeatures/Core/Interactive/InteractiveWorkspace.cs index d817dd125ba24..2348187d602f1 100644 --- a/src/EditorFeatures/Core/Interactive/InteractiveWorkspace.cs +++ b/src/EditorFeatures/Core/Interactive/InteractiveWorkspace.cs @@ -9,7 +9,7 @@ using Microsoft.VisualStudio.Text; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { internal partial class InteractiveWorkspace : Workspace { diff --git a/src/EditorFeatures/Core/Interactive/SendToInteractiveSubmissionProvider.cs b/src/EditorFeatures/Core/Interactive/SendToInteractiveSubmissionProvider.cs index 22512e24dfec3..ae3f4c7138782 100644 --- a/src/EditorFeatures/Core/Interactive/SendToInteractiveSubmissionProvider.cs +++ b/src/EditorFeatures/Core/Interactive/SendToInteractiveSubmissionProvider.cs @@ -16,7 +16,7 @@ using Microsoft.VisualStudio.Text.Editor.OptionsExtensionMethods; using Microsoft.VisualStudio.Text.Editor.Commanding; -namespace Microsoft.CodeAnalysis.Editor.Interactive +namespace Microsoft.CodeAnalysis.Interactive { /// /// Implementers of this interface are responsible for retrieving source code that diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj index 6a935b276cb16..e473623bbd306 100644 --- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj +++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj @@ -3,7 +3,7 @@ Library - Microsoft.CodeAnalysis.Editor + Microsoft.CodeAnalysis netcoreapp3.1;netstandard2.0 true $(DefineConstants);EDITOR_FEATURES diff --git a/src/EditorFeatures/Core/NavigationBar/NavigationBarController.cs b/src/EditorFeatures/Core/NavigationBar/NavigationBarController.cs index c9d7440fcc6e1..9f5ef7bede815 100644 --- a/src/EditorFeatures/Core/NavigationBar/NavigationBarController.cs +++ b/src/EditorFeatures/Core/NavigationBar/NavigationBarController.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Implementation.Classification; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.Tagging; diff --git a/src/EditorFeatures/Test/CommentSelection/CommentUncommentSelectionCommandHandlerTests.cs b/src/EditorFeatures/Test/CommentSelection/CommentUncommentSelectionCommandHandlerTests.cs index 894a1c88be905..eeb60484cba53 100644 --- a/src/EditorFeatures/Test/CommentSelection/CommentUncommentSelectionCommandHandlerTests.cs +++ b/src/EditorFeatures/Test/CommentSelection/CommentUncommentSelectionCommandHandlerTests.cs @@ -10,7 +10,6 @@ using System.Threading; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CommentSelection; -using Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; diff --git a/src/EditorFeatures/Test/CommentSelection/ToggleBlockCommentCommandHandlerTests.cs b/src/EditorFeatures/Test/CommentSelection/ToggleBlockCommentCommandHandlerTests.cs index 6d48772c5cfed..d016446a873fc 100644 --- a/src/EditorFeatures/Test/CommentSelection/ToggleBlockCommentCommandHandlerTests.cs +++ b/src/EditorFeatures/Test/CommentSelection/ToggleBlockCommentCommandHandlerTests.cs @@ -6,7 +6,7 @@ using System; using System.Linq; -using Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection; +using Microsoft.CodeAnalysis.CommentSelection; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Test.Utilities.CommentSelection; diff --git a/src/EditorFeatures/Test2/CodeDefinitionWindow/AbstractCodeDefinitionWindowTests.vb b/src/EditorFeatures/Test2/CodeDefinitionWindow/AbstractCodeDefinitionWindowTests.vb index 8260d2fcdafcf..cfe39af1b9f6d 100644 --- a/src/EditorFeatures/Test2/CodeDefinitionWindow/AbstractCodeDefinitionWindowTests.vb +++ b/src/EditorFeatures/Test2/CodeDefinitionWindow/AbstractCodeDefinitionWindowTests.vb @@ -5,7 +5,7 @@ Imports System.Collections.Immutable Imports System.ComponentModel.Composition Imports System.Threading -Imports Microsoft.CodeAnalysis.Editor.Implementation.CodeDefinitionWindow +Imports Microsoft.CodeAnalysis.CodeDefinitionWindow Imports Microsoft.CodeAnalysis.Editor.UnitTests Imports Microsoft.CodeAnalysis.Editor.UnitTests.Utilities Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces diff --git a/src/EditorFeatures/Test2/CodeDefinitionWindow/CrossLanguageCodeDefinitionWindowTests.vb b/src/EditorFeatures/Test2/CodeDefinitionWindow/CrossLanguageCodeDefinitionWindowTests.vb index 1e80b0647b588..f5f8b82f1edd0 100644 --- a/src/EditorFeatures/Test2/CodeDefinitionWindow/CrossLanguageCodeDefinitionWindowTests.vb +++ b/src/EditorFeatures/Test2/CodeDefinitionWindow/CrossLanguageCodeDefinitionWindowTests.vb @@ -5,7 +5,7 @@ Imports System.Collections.Immutable Imports System.Composition Imports System.Threading -Imports Microsoft.CodeAnalysis.Editor.Implementation.CodeDefinitionWindow +Imports Microsoft.CodeAnalysis.CodeDefinitionWindow Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Navigation diff --git a/src/EditorFeatures/Test2/InteractivePaste/InteractivePasteCommandHandlerTests.vb b/src/EditorFeatures/Test2/InteractivePaste/InteractivePasteCommandHandlerTests.vb index 4cb6c57e81e07..11ee202a02739 100644 --- a/src/EditorFeatures/Test2/InteractivePaste/InteractivePasteCommandHandlerTests.vb +++ b/src/EditorFeatures/Test2/InteractivePaste/InteractivePasteCommandHandlerTests.vb @@ -4,10 +4,10 @@ Imports System.Text Imports System.Windows -Imports Microsoft.CodeAnalysis.Editor.CommandHandlers Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Utilities Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces +Imports Microsoft.CodeAnalysis.Interactive Imports Microsoft.VisualStudio.InteractiveWindow Imports Microsoft.VisualStudio.Text.Editor.Commanding.Commands Imports Microsoft.VisualStudio.Text.Operations diff --git a/src/EditorFeatures/TestUtilities/AutomaticCompletion/AbstractAutomaticBraceCompletionTests.cs b/src/EditorFeatures/TestUtilities/AutomaticCompletion/AbstractAutomaticBraceCompletionTests.cs index ea8cc6bd553ec..0f3190db3c2cd 100644 --- a/src/EditorFeatures/TestUtilities/AutomaticCompletion/AbstractAutomaticBraceCompletionTests.cs +++ b/src/EditorFeatures/TestUtilities/AutomaticCompletion/AbstractAutomaticBraceCompletionTests.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion; +using Microsoft.CodeAnalysis.AutomaticCompletion; using Microsoft.CodeAnalysis.Editor.Shared.Extensions; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Options; diff --git a/src/EditorFeatures/TestUtilities/BraceHighlighting/AbstractBraceHighlightingTests.cs b/src/EditorFeatures/TestUtilities/BraceHighlighting/AbstractBraceHighlightingTests.cs index e181761bb4bcd..c4e90e683a047 100644 --- a/src/EditorFeatures/TestUtilities/BraceHighlighting/AbstractBraceHighlightingTests.cs +++ b/src/EditorFeatures/TestUtilities/BraceHighlighting/AbstractBraceHighlightingTests.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching; +using Microsoft.CodeAnalysis.BraceMatching; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Editor.Tagging; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; diff --git a/src/EditorFeatures/TestUtilities/CommentSelection/AbstractToggleCommentTestBase.cs b/src/EditorFeatures/TestUtilities/CommentSelection/AbstractToggleCommentTestBase.cs index 780ee65e69fd9..f74e6163b3813 100644 --- a/src/EditorFeatures/TestUtilities/CommentSelection/AbstractToggleCommentTestBase.cs +++ b/src/EditorFeatures/TestUtilities/CommentSelection/AbstractToggleCommentTestBase.cs @@ -9,8 +9,8 @@ using System.Collections.Immutable; using System.Linq; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CommentSelection; using Microsoft.CodeAnalysis.Editor; -using Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection; using Microsoft.CodeAnalysis.Editor.UnitTests; using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; diff --git a/src/EditorFeatures/VisualBasic/AddImports/VisualBasicAddImportsOnPasteCommandHandler.vb b/src/EditorFeatures/VisualBasic/AddImports/VisualBasicAddImportsOnPasteCommandHandler.vb index eaf6b5eb55c46..0f67a04f5e839 100644 --- a/src/EditorFeatures/VisualBasic/AddImports/VisualBasicAddImportsOnPasteCommandHandler.vb +++ b/src/EditorFeatures/VisualBasic/AddImports/VisualBasicAddImportsOnPasteCommandHandler.vb @@ -3,7 +3,7 @@ ' See the LICENSE file in the project root for more information. Imports System.ComponentModel.Composition -Imports Microsoft.CodeAnalysis.Editor.Implementation.AddImports +Imports Microsoft.CodeAnalysis.AddImport Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Options Imports Microsoft.VisualStudio.Commanding diff --git a/src/EditorFeatures/VisualBasic/AutomaticCompletion/AutomaticLineEnderCommandHandler.vb b/src/EditorFeatures/VisualBasic/AutomaticCompletion/AutomaticLineEnderCommandHandler.vb index 561c150b4911e..ccc68f928c989 100644 --- a/src/EditorFeatures/VisualBasic/AutomaticCompletion/AutomaticLineEnderCommandHandler.vb +++ b/src/EditorFeatures/VisualBasic/AutomaticCompletion/AutomaticLineEnderCommandHandler.vb @@ -4,7 +4,7 @@ Imports System.ComponentModel.Composition Imports System.Threading -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.Host.Mef Imports Microsoft.CodeAnalysis.Options Imports Microsoft.CodeAnalysis.Text diff --git a/src/EditorFeatures/VisualBasic/AutomaticCompletion/VisualBasicBraceCompletionServiceFactory.vb b/src/EditorFeatures/VisualBasic/AutomaticCompletion/VisualBasicBraceCompletionServiceFactory.vb index a719f5735c03b..c99c8769a8a3d 100644 --- a/src/EditorFeatures/VisualBasic/AutomaticCompletion/VisualBasicBraceCompletionServiceFactory.vb +++ b/src/EditorFeatures/VisualBasic/AutomaticCompletion/VisualBasicBraceCompletionServiceFactory.vb @@ -4,7 +4,7 @@ Imports System.Composition Imports Microsoft.CodeAnalysis.BraceCompletion -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.Shared.Utilities Imports Microsoft.CodeAnalysis.Host.Mef diff --git a/src/EditorFeatures/VisualBasic/BraceMatching/AbstractVisualBasicBraceMatcher.vb b/src/EditorFeatures/VisualBasic/BraceMatching/AbstractVisualBasicBraceMatcher.vb index 47e74e35dd616..91141ae17e88a 100644 --- a/src/EditorFeatures/VisualBasic/BraceMatching/AbstractVisualBasicBraceMatcher.vb +++ b/src/EditorFeatures/VisualBasic/BraceMatching/AbstractVisualBasicBraceMatcher.vb @@ -2,7 +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. -Imports Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +Imports Microsoft.CodeAnalysis.BraceMatching Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.BraceMatching Friend Class AbstractVisualBasicBraceMatcher diff --git a/src/EditorFeatures/VisualBasic/BraceMatching/VisualBasicEmbeddedLanguageBraceMatcher.vb b/src/EditorFeatures/VisualBasic/BraceMatching/VisualBasicEmbeddedLanguageBraceMatcher.vb index 7d2d9ef4397f1..6cec66774d37c 100644 --- a/src/EditorFeatures/VisualBasic/BraceMatching/VisualBasicEmbeddedLanguageBraceMatcher.vb +++ b/src/EditorFeatures/VisualBasic/BraceMatching/VisualBasicEmbeddedLanguageBraceMatcher.vb @@ -3,7 +3,7 @@ ' See the LICENSE file in the project root for more information. Imports System.ComponentModel.Composition -Imports Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +Imports Microsoft.CodeAnalysis.BraceMatching Imports Microsoft.CodeAnalysis.Host.Mef Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.BraceMatching diff --git a/src/EditorFeatures/VisualBasic/ChangeSignature/VisualBasicChangeSignatureCommandHandler.vb b/src/EditorFeatures/VisualBasic/ChangeSignature/VisualBasicChangeSignatureCommandHandler.vb index 5455e2d02e823..a5b353b551371 100644 --- a/src/EditorFeatures/VisualBasic/ChangeSignature/VisualBasicChangeSignatureCommandHandler.vb +++ b/src/EditorFeatures/VisualBasic/ChangeSignature/VisualBasicChangeSignatureCommandHandler.vb @@ -4,7 +4,7 @@ Imports System.ComponentModel.Composition Imports System.Diagnostics.CodeAnalysis -Imports Microsoft.CodeAnalysis.Editor.Implementation.ChangeSignature +Imports Microsoft.CodeAnalysis.ChangeSignature Imports Microsoft.CodeAnalysis.Editor.[Shared].Utilities Imports Microsoft.VisualStudio.Commanding Imports Microsoft.VisualStudio.Utilities diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb index 5777d8043472d..0e0fc0b78634c 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb @@ -6,7 +6,7 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb index 13728b565e302..aadadaa8f856f 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb @@ -6,7 +6,7 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb index 75838e25a0686..6e275792fd881 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb @@ -6,7 +6,7 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb index 7da7aa798f945..f3297741cdf4b 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb @@ -6,7 +6,7 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb index ff04188c4773d..224fb1ab98cef 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb @@ -6,7 +6,7 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb index 2e1c6957a158e..fa3ac9459cd66 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb @@ -6,7 +6,7 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb index e253c26cc6545..d842f76c65711 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb @@ -6,7 +6,7 @@ Imports System.Xml.Linq Imports Microsoft.CodeAnalysis.Editor.UnitTests.AutomaticCompletion Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces -Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion +Imports Microsoft.CodeAnalysis.AutomaticCompletion Imports Microsoft.CodeAnalysis.BraceCompletion.AbstractBraceCompletionService Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AutomaticCompletion diff --git a/src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb b/src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb index 6ace85d59cb76..588e40ecd0291 100644 --- a/src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb +++ b/src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb @@ -4,7 +4,7 @@ Imports System.Threading Imports Microsoft.CodeAnalysis -Imports Microsoft.CodeAnalysis.Editor.Implementation.BraceMatching +Imports Microsoft.CodeAnalysis.BraceMatching Imports Microsoft.CodeAnalysis.Editor.Shared.Utilities Imports Microsoft.CodeAnalysis.Editor.Tagging Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces diff --git a/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicCommentSelectionTests.vb b/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicCommentSelectionTests.vb index 6fdd8f9a6e526..cbab1ed3c388d 100644 --- a/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicCommentSelectionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicCommentSelectionTests.vb @@ -4,7 +4,7 @@ Imports System.Collections.Immutable Imports Microsoft.CodeAnalysis -Imports Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +Imports Microsoft.CodeAnalysis.CommentSelection Imports Microsoft.CodeAnalysis.Editor.UnitTests.Utilities Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Imports Microsoft.CodeAnalysis.Text diff --git a/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicToggleLineCommentTests.vb b/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicToggleLineCommentTests.vb index 22eddcdf992c0..4cf434a9f54ed 100644 --- a/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicToggleLineCommentTests.vb +++ b/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicToggleLineCommentTests.vb @@ -2,7 +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. -Imports Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection +Imports Microsoft.CodeAnalysis.CommentSelection Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Imports Microsoft.CodeAnalysis.Test.Utilities.CommentSelection Imports Microsoft.VisualStudio.Commanding diff --git a/src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldCommandHandlerTests.vb b/src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldCommandHandlerTests.vb index 3fc3de3d33734..52751d09a40a8 100644 --- a/src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldCommandHandlerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldCommandHandlerTests.vb @@ -2,7 +2,6 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Editor.Implementation.Interactive Imports Microsoft.CodeAnalysis.Editor.Shared.Utilities Imports Microsoft.CodeAnalysis.Editor.UnitTests Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces diff --git a/src/EditorFeatures/VisualBasicTest/ExtractInterface/ExtractInterfaceTests.vb b/src/EditorFeatures/VisualBasicTest/ExtractInterface/ExtractInterfaceTests.vb index 9970047a917a1..e165acd5194d5 100644 --- a/src/EditorFeatures/VisualBasicTest/ExtractInterface/ExtractInterfaceTests.vb +++ b/src/EditorFeatures/VisualBasicTest/ExtractInterface/ExtractInterfaceTests.vb @@ -2,7 +2,6 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Editor.Implementation.Interactive Imports Microsoft.CodeAnalysis.Editor.Shared.Utilities Imports Microsoft.CodeAnalysis.Editor.UnitTests Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions diff --git a/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.vb b/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.vb index 45d239267732a..5dd707d0522f9 100644 --- a/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.vb +++ b/src/EditorFeatures/VisualBasicTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.vb @@ -2,7 +2,6 @@ ' The .NET Foundation licenses this file to you under the MIT license. ' See the LICENSE file in the project root for more information. -Imports Microsoft.CodeAnalysis.Editor.Implementation.Interactive Imports Microsoft.CodeAnalysis.Editor.[Shared].Utilities Imports Microsoft.CodeAnalysis.Editor.UnitTests Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces diff --git a/src/EditorFeatures/VisualBasicTest/Organizing/OrganizeTypeDeclarationTests.vb b/src/EditorFeatures/VisualBasicTest/Organizing/OrganizeTypeDeclarationTests.vb index ea82442fddc2f..584ea3db95efe 100644 --- a/src/EditorFeatures/VisualBasicTest/Organizing/OrganizeTypeDeclarationTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Organizing/OrganizeTypeDeclarationTests.vb @@ -3,7 +3,6 @@ ' See the LICENSE file in the project root for more information. Imports Microsoft.CodeAnalysis.Editor.Commanding.Commands -Imports Microsoft.CodeAnalysis.Editor.Implementation.Interactive Imports Microsoft.CodeAnalysis.Editor.Implementation.Organizing Imports Microsoft.CodeAnalysis.Editor.[Shared].Utilities Imports Microsoft.CodeAnalysis.Editor.UnitTests diff --git a/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveCommandHandler.cs b/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveCommandHandler.cs index 52557cf48654d..f635bc344e563 100644 --- a/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveCommandHandler.cs +++ b/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveCommandHandler.cs @@ -7,10 +7,9 @@ using System; using System.ComponentModel.Composition; using Microsoft.CodeAnalysis.Editor; -using Microsoft.CodeAnalysis.Editor.CommandHandlers; using Microsoft.CodeAnalysis.Editor.Host; -using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Operations; diff --git a/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveWindowCommandCompletionProvider.cs b/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveWindowCommandCompletionProvider.cs index 7eefc79a87a35..7aee63e03175c 100644 --- a/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveWindowCommandCompletionProvider.cs +++ b/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveWindowCommandCompletionProvider.cs @@ -6,13 +6,11 @@ using System.Collections.Immutable; using System.ComponentModel.Composition; using System.Threading; -using System.Threading.Tasks; using Microsoft.CodeAnalysis.Completion; -using Microsoft.CodeAnalysis.Completion.Providers; using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery; using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Host.Mef; -using Microsoft.CodeAnalysis.Options; +using Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; using Microsoft.VisualStudio.InteractiveWindow; diff --git a/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsInteractiveWindowProvider.cs b/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsInteractiveWindowProvider.cs index 3e0e10a0ac2ee..e3f78bd80f8b6 100644 --- a/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsInteractiveWindowProvider.cs +++ b/src/VisualStudio/CSharp/Impl/Interactive/CSharpVsInteractiveWindowProvider.cs @@ -6,9 +6,9 @@ using System.ComponentModel.Composition; using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.CSharp.Interactive; -using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; +using Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.TestHooks; diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/InteractiveWindowCommandHandlerTestState.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/InteractiveWindowCommandHandlerTestState.cs index 7bfe9d7e57e77..690622508aab3 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/InteractiveWindowCommandHandlerTestState.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/InteractiveWindowCommandHandlerTestState.cs @@ -5,9 +5,9 @@ #nullable disable using System.Xml.Linq; -using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.CodeAnalysis.Editor.UnitTests; using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities; +using Microsoft.CodeAnalysis.Interactive; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.Commanding; using Microsoft.VisualStudio.Composition; diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestInteractiveCommandHandler.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestInteractiveCommandHandler.cs index 389b4cdb7dbfb..2b737fea9282b 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestInteractiveCommandHandler.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestInteractiveCommandHandler.cs @@ -5,7 +5,7 @@ #nullable disable using Microsoft.CodeAnalysis.Editor.Host; -using Microsoft.CodeAnalysis.Editor.Interactive; +using Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.InteractiveWindow; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Text.Operations; diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs index 30ae70228355a..e167bc7c92725 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestResetInteractive.cs @@ -7,7 +7,6 @@ extern alias InteractiveHost; using Microsoft.CodeAnalysis.Editor.Host; -using Microsoft.VisualStudio.LanguageServices.Interactive; using Microsoft.VisualStudio.Text.Editor; using System; using System.Collections.Immutable; @@ -17,6 +16,7 @@ using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.Utilities; using Microsoft.VisualStudio.Language.Intellisense.Utilities; +using Microsoft.CodeAnalysis.Interactive; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Interactive.Commands { diff --git a/src/VisualStudio/CSharp/Test/Interactive/TestInteractiveEvaluator.cs b/src/VisualStudio/CSharp/Test/Interactive/TestInteractiveEvaluator.cs index b8f391be1eb88..80d0836b721c9 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/TestInteractiveEvaluator.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/TestInteractiveEvaluator.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Immutable; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Interactive; +using Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.InteractiveWindow; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Interactive diff --git a/src/VisualStudio/Core/Def/Implementation/CodeDefinitionWindow/VisualStudioCodeDefinitionWindowService.cs b/src/VisualStudio/Core/Def/Implementation/CodeDefinitionWindow/VisualStudioCodeDefinitionWindowService.cs index 7f7702d6effe8..2d46bb0af8159 100644 --- a/src/VisualStudio/Core/Def/Implementation/CodeDefinitionWindow/VisualStudioCodeDefinitionWindowService.cs +++ b/src/VisualStudio/Core/Def/Implementation/CodeDefinitionWindow/VisualStudioCodeDefinitionWindowService.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Editor.Implementation.CodeDefinitionWindow; +using Microsoft.CodeAnalysis.CodeDefinitionWindow; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.VisualStudio.Shell; diff --git a/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerProvider.WorkspaceEventListener.cs b/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerProvider.WorkspaceEventListener.cs index 6bad518c9ea18..ce1d8d54c2928 100644 --- a/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerProvider.WorkspaceEventListener.cs +++ b/src/VisualStudio/Core/Def/Implementation/Diagnostics/VisualStudioDiagnosticAnalyzerProvider.WorkspaceEventListener.cs @@ -3,20 +3,16 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Immutable; using System.Composition; using System.Reflection; using System.Threading.Tasks; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Editor.Interactive; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.ErrorReporting; using Microsoft.CodeAnalysis.Host; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.Shared.TestHooks; -using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem; using Roslyn.Utilities; namespace Microsoft.VisualStudio.LanguageServices.Implementation.Diagnostics diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs index 527fd1571cf11..37508676c7820 100644 --- a/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs +++ b/src/VisualStudio/Core/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs @@ -2,17 +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. -using Microsoft.VisualStudio.Utilities; -using System.ComponentModel.Composition; -using Microsoft.VisualStudio.Shell.TableControl; -using Microsoft.VisualStudio.Text.Classification; using System; -using Microsoft.CodeAnalysis.Host.Mef; -using System.Threading; -using Microsoft.CodeAnalysis.Editor; +using System.ComponentModel.Composition; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Shared.TestHooks; +using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Navigation; +using Microsoft.CodeAnalysis.Shared.TestHooks; +using Microsoft.VisualStudio.Shell.TableControl; +using Microsoft.VisualStudio.Text.Classification; +using Microsoft.VisualStudio.Utilities; namespace Microsoft.VisualStudio.LanguageServices.FindUsages { diff --git a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioDiagnosticListTableCommandHandler.cs b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioDiagnosticListTableCommandHandler.cs index ee2b6ccd9d0d7..722578c8fa93a 100644 --- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioDiagnosticListTableCommandHandler.cs +++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioDiagnosticListTableCommandHandler.cs @@ -14,7 +14,6 @@ using Microsoft.CodeAnalysis.CodeFixes.Configuration; using Microsoft.CodeAnalysis.CodeFixes.Suppression; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Implementation; using Microsoft.CodeAnalysis.ErrorReporting; using Microsoft.CodeAnalysis.Host.Mef; diff --git a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioSuppressionFixService.cs b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioSuppressionFixService.cs index 7b1536d7f6a5e..c0603edd00fbe 100644 --- a/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioSuppressionFixService.cs +++ b/src/VisualStudio/Core/Def/Implementation/TableDataSource/Suppression/VisualStudioSuppressionFixService.cs @@ -14,7 +14,6 @@ using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.CodeFixes.Suppression; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Implementation; using Microsoft.CodeAnalysis.Editor.Implementation.Suggestions; using Microsoft.CodeAnalysis.ErrorReporting; diff --git a/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs b/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs index 10a8aa789ee4f..17d98114c523a 100644 --- a/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs +++ b/src/VisualStudio/Core/Def/Interactive/VsInteractiveWindowProvider.cs @@ -11,9 +11,7 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using Microsoft.CodeAnalysis.Editor.Interactive; -using Microsoft.CodeAnalysis.Options; -using Microsoft.VisualStudio.Editor.Interactive; +using Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.InteractiveWindow.Commands; using Microsoft.VisualStudio.InteractiveWindow.Shell; using Microsoft.VisualStudio.Shell; diff --git a/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs b/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs index f26e64902a17d..3ac7d774c577b 100644 --- a/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs +++ b/src/VisualStudio/Core/Def/Interactive/VsResetInteractive.cs @@ -25,6 +25,7 @@ using Roslyn.Utilities; using InteractiveHost::Microsoft.CodeAnalysis.Interactive; using Microsoft.VisualStudio.Utilities; +using Microsoft.CodeAnalysis.Interactive; namespace Microsoft.VisualStudio.LanguageServices.Interactive { diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs index 87a0878048dc3..9bb3f34a2df6b 100644 --- a/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs +++ b/src/VisualStudio/Core/Impl/SolutionExplorer/AnalyzersCommandHandler.cs @@ -17,7 +17,6 @@ using EnvDTE; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeActions; -using Microsoft.CodeAnalysis.Editor; using Microsoft.CodeAnalysis.Editor.Implementation; using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.CodeAnalysis.Notification;