From d191b0483cc13609e44ce6596d41f8d5e6bd6f41 Mon Sep 17 00:00:00 2001 From: Benjamin Russell Date: Wed, 3 Aug 2016 15:41:11 -0700 Subject: [PATCH] Small bugfix after the previous merge My mistake, didn't pay enough attention when performing the refactoring as requested in the last code review. --- .../Connection/ConnectionService.cs | 2 +- .../LanguageServices/AutoCompleteService.cs | 4 ++-- .../LanguageServices/Contracts/Completion.cs | 2 +- .../LanguageServices/Contracts/Definition.cs | 2 +- .../LanguageServices/Contracts/Diagnostics.cs | 2 +- .../LanguageServices/Contracts/DocumentHighlight.cs | 2 +- .../LanguageServices/Contracts/Hover.cs | 2 +- .../LanguageServices/Contracts/References.cs | 2 +- .../LanguageServices/Contracts/SignatureHelp.cs | 2 +- .../LanguageServices/LanguageService.cs | 11 +++++------ src/Microsoft.SqlTools.ServiceLayer/Program.cs | 4 ++-- .../LanguageServer/LanguageServiceTests.cs | 2 +- .../Utility/TestObjects.cs | 4 ++-- 13 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs index dec645d6..fb61ef4a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs @@ -13,7 +13,7 @@ using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices; +using Microsoft.SqlTools.ServiceLayer.Workspace; namespace Microsoft.SqlTools.ServiceLayer.Connection { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteService.cs index 9af007a6..9ed4e42d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteService.cs @@ -8,10 +8,10 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.ConnectionServices; +using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs index 6dc41130..64c0464f 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Completion.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs index 1c40996f..d17930e1 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Definition.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs index a591b925..73d75e5e 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Diagnostics.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs index f266801f..968e390b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/DocumentHighlight.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs index 04c27d33..fbce0883 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/Hover.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs index ad2f23bd..90b0b3f6 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/References.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs index bd1103c9..e8fab16b 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SignatureHelp.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts { diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs index 77890bef..97113943 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs @@ -13,13 +13,12 @@ using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using System.Linq; using Microsoft.SqlServer.Management.SqlParser.Parser; -using Location = Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts.Location; -using Microsoft.SqlTools.ServiceLayer.ConnectionServices; -using Microsoft.SqlTools.ServiceLayer.ConnectionServices.Contracts; +using Location = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Location; +using Microsoft.SqlTools.ServiceLayer.Connection; namespace Microsoft.SqlTools.ServiceLayer.LanguageServices { @@ -57,7 +56,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices get { return WorkspaceService.Instance.CurrentSettings; } } - private Workspace CurrentWorkspace + private Workspace.Workspace CurrentWorkspace { get { return WorkspaceService.Instance.Workspace; } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Program.cs b/src/Microsoft.SqlTools.ServiceLayer/Program.cs index 5711e8b3..f6054354 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Program.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Program.cs @@ -5,9 +5,9 @@ using System; using Microsoft.SqlTools.EditorServices.Utility; using Microsoft.SqlTools.ServiceLayer.Hosting; using Microsoft.SqlTools.ServiceLayer.SqlContext; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices; +using Microsoft.SqlTools.ServiceLayer.Workspace; using Microsoft.SqlTools.ServiceLayer.LanguageServices; -using Microsoft.SqlTools.ServiceLayer.ConnectionServices; +using Microsoft.SqlTools.ServiceLayer.Connection; namespace Microsoft.SqlTools.ServiceLayer { diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs index ad560d4d..873ed4e2 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.Test/LanguageServer/LanguageServiceTests.cs @@ -4,7 +4,7 @@ // using Microsoft.SqlTools.ServiceLayer.LanguageServices; -using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Microsoft.SqlTools.Test.Utility; using Xunit; diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs index 6bf4d738..3a39227a 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.Test/Utility/TestObjects.cs @@ -14,8 +14,8 @@ using System.Data.SqlClient; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.SqlTools.ServiceLayer.ConnectionServices; -using Microsoft.SqlTools.ServiceLayer.ConnectionServices.Contracts; +using Microsoft.SqlTools.ServiceLayer.Connection; +using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; using Microsoft.SqlTools.ServiceLayer.LanguageServices; using Microsoft.SqlTools.ServiceLayer.SqlContext; using Xunit;