From 3607ad9e54b4142f8fb0f8244fc72ab732408baf Mon Sep 17 00:00:00 2001 From: CyrusNajmabadi Date: Tue, 3 May 2016 12:47:43 -0700 Subject: [PATCH] Move types to SymbolSearch. --- .../ProjectSystem/VisualStudioWorkspaceImpl.cs | 1 + src/VisualStudio/Core/Def/ServicesVisualStudio.csproj | 2 +- .../Core/Def/SymbolSearch/IDatabaseFactoryService.cs | 2 +- src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs | 6 +----- src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs | 7 +------ src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs | 6 +----- src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs | 8 +------- .../Core/Def/SymbolSearch/IRemoteControlService.cs | 2 +- .../Def/{Packaging => SymbolSearch}/Patching/Delta.cs | 2 +- .../SymbolSearchService.DatabaseFactoryService.cs | 2 +- .../Def/SymbolSearch/SymbolSearchService.DelayService.cs | 2 +- .../Def/SymbolSearch/SymbolSearchService.IOService.cs | 2 +- .../Def/SymbolSearch/SymbolSearchService.LogService.cs | 2 +- .../Def/SymbolSearch/SymbolSearchService.PatchService.cs | 2 +- .../SymbolSearchService.RemoteControlService.cs | 2 +- .../Core/Def/SymbolSearch/SymbolSearchService.Update.cs | 2 +- .../Core/Def/SymbolSearch/SymbolSearchService.cs | 2 +- .../Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs | 2 +- .../Core/Test/Packaging/PackageSearchServiceTests.vb | 1 + 19 files changed, 19 insertions(+), 36 deletions(-) rename src/VisualStudio/Core/Def/{Packaging => SymbolSearch}/Patching/Delta.cs (97%) diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs index 4f0eb91abd8..cb5c4c6b189 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs @@ -22,6 +22,7 @@ using Microsoft.VisualStudio.Feedback.Interop; using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem.Extensions; using Microsoft.VisualStudio.LanguageServices.Packaging; +using Microsoft.VisualStudio.LanguageServices.SymbolSearch; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Text; diff --git a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj index 04c4113f713..0703045cab5 100644 --- a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj +++ b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj @@ -168,7 +168,7 @@ - + True diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IDatabaseFactoryService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IDatabaseFactoryService.cs index 611fb46b2de..6f91494de4e 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/IDatabaseFactoryService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/IDatabaseFactoryService.cs @@ -2,7 +2,7 @@ using Microsoft.CodeAnalysis.Elfie.Model; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { internal interface IDatabaseFactoryService { diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs index cc66af2e073..59952ddf12e 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { /// /// Used so we can mock out how the search service delays work for testing purposes. diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs index 2ad69774b42..2488ba9bd4d 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs @@ -1,13 +1,8 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { /// /// Used so we can mock out how the search service does IO for testing purposes. diff --git a/src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs b/src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs index d28e3111d71..d528d52042b 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { /// /// Used so we can mock out logging in unit tests. diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs index 563224cd40a..867cc9baf74 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs @@ -1,12 +1,6 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { /// /// Used so we can mock out patching in unit tests. diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IRemoteControlService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IRemoteControlService.cs index e7266ce8e58..02cc22fbbae 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/IRemoteControlService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/IRemoteControlService.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.Internal.VisualStudio.Shell.Interop; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { /// /// Used so we can mock out the remote control service in unit tests. diff --git a/src/VisualStudio/Core/Def/Packaging/Patching/Delta.cs b/src/VisualStudio/Core/Def/SymbolSearch/Patching/Delta.cs similarity index 97% rename from src/VisualStudio/Core/Def/Packaging/Patching/Delta.cs rename to src/VisualStudio/Core/Def/SymbolSearch/Patching/Delta.cs index 6705c804a1e..2e14fe31718 100644 --- a/src/VisualStudio/Core/Def/Packaging/Patching/Delta.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/Patching/Delta.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; -namespace Microsoft.VisualStudio.LanguageServices.Packaging.Patching +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch.Patching { /// /// Wrapper around the msdelta api so we can consume patches produced by the Elfie service. diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DatabaseFactoryService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DatabaseFactoryService.cs index 4f522d45f7d..005985f81e3 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DatabaseFactoryService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DatabaseFactoryService.cs @@ -3,7 +3,7 @@ using System.IO; using Microsoft.CodeAnalysis.Elfie.Model; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { internal partial class SymbolSearchService { diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DelayService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DelayService.cs index 7099237f027..50480d70db7 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DelayService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DelayService.cs @@ -2,7 +2,7 @@ using System; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { internal partial class SymbolSearchService { diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.IOService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.IOService.cs index a3abb40b322..57c160145de 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.IOService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.IOService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { internal partial class SymbolSearchService { diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.LogService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.LogService.cs index d3ca7b25e38..5cb2f7486e5 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.LogService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.LogService.cs @@ -4,7 +4,7 @@ using Microsoft.CodeAnalysis.Editor.Shared.Utilities; using Microsoft.VisualStudio.Shell.Interop; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { internal partial class SymbolSearchService { diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.PatchService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.PatchService.cs index 86f33a5f0a1..3e57e52c7f5 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.PatchService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.PatchService.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { internal partial class SymbolSearchService { diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.RemoteControlService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.RemoteControlService.cs index 7d4c7e574ce..625c973758d 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.RemoteControlService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.RemoteControlService.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.Internal.VisualStudio.Shell.Interop; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { internal partial class SymbolSearchService { diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.Update.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.Update.cs index 142646c21e8..e588990c774 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.Update.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.Update.cs @@ -22,7 +22,7 @@ using System.Linq; using System.Collections.Immutable; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { /// /// A service which enables searching for packages matching certain criteria. diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.cs index 58e47ec2d73..b0043a3f13c 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.cs @@ -23,7 +23,7 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.SymbolSearch; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { /// /// A service which enables searching for packages matching certain criteria. diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs index 15b05d76d77..dce114cc9e3 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs @@ -12,7 +12,7 @@ using Roslyn.Utilities; using VSShell = Microsoft.VisualStudio.Shell; -namespace Microsoft.VisualStudio.LanguageServices.Packaging +namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch { [ExportWorkspaceServiceFactory(typeof(ISymbolSearchService), WorkspaceKind.Host), Shared] internal class SymbolSearchServiceFactory : IWorkspaceServiceFactory diff --git a/src/VisualStudio/Core/Test/Packaging/PackageSearchServiceTests.vb b/src/VisualStudio/Core/Test/Packaging/PackageSearchServiceTests.vb index 218bc20f41f..d6edb5e2115 100644 --- a/src/VisualStudio/Core/Test/Packaging/PackageSearchServiceTests.vb +++ b/src/VisualStudio/Core/Test/Packaging/PackageSearchServiceTests.vb @@ -11,6 +11,7 @@ Imports Microsoft.CodeAnalysis.Elfie.Model Imports Microsoft.CodeAnalysis.Packaging Imports Microsoft.Internal.VisualStudio.Shell.Interop Imports Microsoft.VisualStudio.LanguageServices.Packaging +Imports Microsoft.VisualStudio.LanguageServices.SymbolSearch Imports Moq Imports Roslyn.Test.Utilities -- GitLab