ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a binding causing autosuggestions to fail (#104)

Browse Source
This commit is contained in:
Karl Burtram
2016-10-19 10:35:53 -07:00
committed by GitHub
parent a3335708c6
commit b001f428bf
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Microsoft.SqlTools.ServiceLayer/LanguageServices/BindingQueue.cs
View File

@@ -4,6 +4,7 @@
// //
using System; using System;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -32,14 +33,14 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
/// Map from context keys to binding context instances /// Map from context keys to binding context instances
/// Internal for testing purposes only /// Internal for testing purposes only
/// </summary> /// </summary>
internal Dictionary<string, IBindingContext> BindingContextMap { get; set; } internal ConcurrentDictionary<string, IBindingContext> BindingContextMap { get; set; }
/// <summary> /// <summary>
/// Constructor for a binding queue instance /// Constructor for a binding queue instance
/// </summary> /// </summary>
public BindingQueue() public BindingQueue()
{ {
this.BindingContextMap = new Dictionary<string, IBindingContext>(); this.BindingContextMap = new ConcurrentDictionary<string, IBindingContext>();
this.queueProcessorTask = StartQueueProcessor(); this.queueProcessorTask = StartQueueProcessor();
} }
@@ -99,15 +100,12 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
key = "disconnected_binding_context"; key = "disconnected_binding_context";
} }
lock (this.bindingContextLock) if (!this.BindingContextMap.ContainsKey(key))
{ {
if (!this.BindingContextMap.ContainsKey(key)) this.BindingContextMap.TryAdd(key, new T());
{ }
this.BindingContextMap.Add(key, new T());
}
return this.BindingContextMap[key]; return this.BindingContextMap[key];
}
} }
private bool HasPendingQueueItems private bool HasPendingQueueItems
@@ -223,13 +221,17 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
queueItem.Result = result; queueItem.Result = result;
} }
else else
{ {
cancelToken.Cancel();
// if the task didn't complete then call the timeout callback // if the task didn't complete then call the timeout callback
if (queueItem.TimeoutOperation != null) if (queueItem.TimeoutOperation != null)
{ {
cancelToken.Cancel();
queueItem.Result = queueItem.TimeoutOperation(bindingContext); queueItem.Result = queueItem.TimeoutOperation(bindingContext);
} }
// we'll need to wait for the task to finsh canceling otherwise future binding will fail
bindTask.Wait();
} }
} }
catch (Exception ex) catch (Exception ex)