From 03315475cb931e238272fc28e73b73ac7e2d5a89 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Mon, 19 Sep 2016 12:32:56 -0700 Subject: [PATCH] Misc. cleanup for PR --- .../LanguageServices/AutoCompleteHelper.cs | 1 - .../LanguageServices/LanguageService.cs | 1 - .../LanguageServices/ScriptParseInfo.cs | 2 +- src/Microsoft.SqlTools.ServiceLayer/Utility/Logger.cs | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs index 85e9b10b..ffc9811c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs @@ -492,7 +492,6 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices Label = autoCompleteItem.Title, Kind = CompletionItemKind.Variable, Detail = autoCompleteItem.Title, - // Documentation = autoCompleteItem.Description, TextEdit = new TextEdit { NewText = autoCompleteItem.Title, diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs index fd1afba4..3d412b56 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs @@ -427,7 +427,6 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices scriptInfo.Binder = BinderProvider.CreateBinder(scriptInfo.MetadataProvider); scriptInfo.ServerConnection = new ServerConnection(sqlConn.GetUnderlyingConnection()); scriptInfo.IsConnected = true; - //AddOrUpdateScriptParseInfo(info.OwnerUri, scriptInfo); } } catch (Exception) diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ScriptParseInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ScriptParseInfo.cs index 5c552531..7dca96ab 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ScriptParseInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ScriptParseInfo.cs @@ -198,6 +198,6 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices default: return TransactSqlVersion.Current; } - } + } } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Utility/Logger.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/Logger.cs index c8552d15..5c4adae4 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Utility/Logger.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Utility/Logger.cs @@ -132,7 +132,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Utility internal class LogWriter : IDisposable { private object logLock = new object(); - private TextWriter textWriter; private LogLevel minimumLogLevel = LogLevel.Verbose; @@ -173,7 +172,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Utility logLevel >= this.minimumLogLevel) { // System.IO is not thread safe - lock (logLock) + lock (this.logLock) { // Print the timestamp and log level this.textWriter.WriteLine(