Merge branch 'master' into dev

src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs

@@ -183,6 +183,10 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
                 // create a sql connection instance
                 connectionInfo.SqlConnection = connectionInfo.Factory.CreateSqlConnection(connectionString);
 
+                // turning on MARS to avoid break in LanguageService with multiple editors
+                // we'll remove this once ConnectionService is refactored to not own the LanguageService connection
+                connectionInfo.ConnectionDetails.MultipleActiveResultSets = true;
+
                 // Add a cancellation token source so that the connection OpenAsync() can be cancelled
                 using (source = new CancellationTokenSource())
                 {

src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs

@@ -633,7 +633,6 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
             }
         }
 
-
         /// <summary>
         /// Converts a SQL Parser QuickInfo object into a VS Code Hover object
         /// </summary>

src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs

@@ -253,7 +253,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
                 await Task.FromResult(true);
             }
             else
-            {                
+            {
                 // get the current list of completion items and return to client 
                 var scriptFile = LanguageService.WorkspaceServiceInstance.Workspace.GetFile(
                     textDocumentPosition.TextDocument.Uri);

src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs

@@ -99,6 +99,12 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
         /// </summary>
         public event Batch.BatchAsyncEventHandler BatchCompleted;
 
+        /// <summary>
+        /// Delegate type for callback when a query connection fails
+        /// </summary>
+        /// <param name="q">The query that completed</param>
+        public delegate Task QueryAsyncErrorEventHandler(string message);
+
         /// <summary>
         /// Callback for when the query has completed successfully
         /// </summary>

src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs

@@ -437,6 +437,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
                 };
                 await requestContext.SendEvent(QueryExecuteCompleteEvent.Type, eventParams);
             };
+
             query.QueryCompleted += callback;
             query.QueryFailed += callback;
             query.QueryConnectionException += errorCallback;

src/Microsoft.SqlTools.ServiceLayer/sr.cs

@@ -397,7 +397,7 @@ namespace Microsoft.SqlTools.ServiceLayer
         [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
         public class Keys
         {
-            static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.ServiceLayer.SR", typeof(SR).GetTypeInfo().Assembly);
+            static ResourceManager resourceManager = new ResourceManager(typeof(SR));
 
             static CultureInfo _culture = null;