Fixed autocomplete bugs (#110)

Autocomplete for items with special characters doesn't add [ ]
Autocomplete default list shows when it shouldn't..like in comments or literals

src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHost.cs

@@ -157,7 +157,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Hosting
                         CompletionProvider = new CompletionOptions
                         {
                             ResolveProvider = true,
-                            TriggerCharacters = new string[] { ".", "-", ":", "\\", ",", " " }
+                            TriggerCharacters = new string[] { ".", "-", ":", "\\", "," }
                         },
                         SignatureHelpProvider = new SignatureHelpOptions
                         {

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

@@ -4,6 +4,9 @@
 //
 
 using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 using Microsoft.SqlServer.Management.SqlParser.Binder;
 using Microsoft.SqlServer.Management.SqlParser.Intellisense;
@@ -26,6 +29,8 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
 
         private static WorkspaceService<SqlToolsSettings> workspaceServiceInstance;
 
+        private static Regex ValidSqlNameRegex = new Regex(@"^[\p{L}_][\p{L}\p{N}@$#_]{0,127}$");
+
         private static readonly string[] DefaultCompletionText = new string[]
         {
             "absolute",
@@ -484,14 +489,44 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
             int startColumn, 
             int endColumn)
         {
-            return new CompletionItem()
+            return CreateCompletionItem(label, label + " keyword", label, CompletionItemKind.Keyword, row, startColumn, endColumn);
+        }
+
+        internal static CompletionItem[] AddTokenToItems(CompletionItem[] currentList, Token token, int row,
+            int startColumn,
+            int endColumn)
+        {
+            if (currentList != null &&
+                token != null && !string.IsNullOrWhiteSpace(token.Text) &&
+                token.Text.All(ch => char.IsLetter(ch)) &&
+                currentList.All(x => string.Compare(x.Label, token.Text, true) != 0
+                ))
+            {
+                var list = currentList.ToList();
+                list.Insert(0, CreateCompletionItem(token.Text, token.Text, token.Text, CompletionItemKind.Text, row, startColumn, endColumn));
+                return list.ToArray();
+            }
+            return currentList;
+        }
+
+        private static CompletionItem CreateCompletionItem(
+            string label, 
+            string detail,
+            string insertText,
+            CompletionItemKind kind,
+            int row,
+            int startColumn,
+            int endColumn)
+        {
+            CompletionItem item = new CompletionItem()
             {
                 Label = label,
-                Kind = CompletionItemKind.Keyword,
+                Kind = kind,
-                Detail = label + " keyword",
+                Detail = detail,
+                InsertText = insertText,
                 TextEdit = new TextEdit
                 {
-                    NewText = label,
+                    NewText = insertText,
                     Range = new Range
                     {
                         Start = new Position
@@ -507,6 +542,8 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
                     }
                 }
             };
+
+            return item;
         }
 
         /// <summary>
@@ -523,38 +560,56 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
             int startColumn,
             int endColumn)
         {
+           
             List<CompletionItem> completions = new List<CompletionItem>();
+
             foreach (var autoCompleteItem in suggestions)
             {
-                // convert the completion item candidates into CompletionItems
+                string  insertText = GetCompletionItemInsertName(autoCompleteItem);
-                completions.Add(new CompletionItem()
+                CompletionItemKind kind = CompletionItemKind.Variable;
+                switch (autoCompleteItem.Type)
                 {
-                    Label = autoCompleteItem.Title,
+                    case DeclarationType.Schema:
-                    Kind = CompletionItemKind.Variable,
+                        kind = CompletionItemKind.Module;
-                    Detail = autoCompleteItem.Title,
+                        break;
-                    TextEdit = new TextEdit
+                    case DeclarationType.Column:
-                    {
+                        kind = CompletionItemKind.Field;
-                        NewText = autoCompleteItem.Title,
+                        break;
-                        Range = new Range
+                    case DeclarationType.Table:
-                        {
+                        kind = CompletionItemKind.Method;
-                            Start = new Position
+                        break;
-                            {
+                    case DeclarationType.Database:
-                                Line = row,
+                        kind = CompletionItemKind.File;
-                                Character = startColumn
+                        break;
-                            },
+                    case DeclarationType.Server:
-                            End = new Position
+                        kind = CompletionItemKind.Value;
-                            {
+                        break;
-                                Line = row,
+                    default:
-                                Character = endColumn
+                        kind = CompletionItemKind.Variable;
-                            }
+                        break;
-                        }
+                }
-                    }
+
-                });
+               
+
+                // convert the completion item candidates into CompletionItems
+                completions.Add(CreateCompletionItem(autoCompleteItem.Title, autoCompleteItem.Title, insertText, kind, row, startColumn, endColumn));
             }
 
+            
+
             return completions.ToArray();
         }
 
+        private static string GetCompletionItemInsertName(Declaration autoCompleteItem)
+        {
+            string insertText = autoCompleteItem.Title;
+            if (!string.IsNullOrEmpty(autoCompleteItem.Title) && !ValidSqlNameRegex.IsMatch(autoCompleteItem.Title))
+            {
+                insertText = string.Format(CultureInfo.InvariantCulture, "[{0}]", autoCompleteItem.Title);
+            }
+            return insertText;
+        }
+
         /// <summary>
         /// Preinitialize the parser and binder with common metadata.
         /// This should front load the long binding wait to the time the

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

@@ -264,10 +264,10 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
 
                 var completionItems = Instance.GetCompletionItems(
                     textDocumentPosition, scriptFile, connInfo);
-
+               
-                await requestContext.SendResult(completionItems); 
+                   await requestContext.SendResult(completionItems);
+                }  
             }
-        }
 
         /// <summary>
         /// Handle the resolve completion request event to provide additional
@@ -686,12 +686,17 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
             bool useLowerCaseSuggestions = this.CurrentSettings.SqlTools.IntelliSense.LowerCaseSuggestions.Value;
 
             this.currentCompletionParseInfo = null;
+            CompletionItem[] defaultCompletionItems = AutoCompleteHelper.GetDefaultCompletionItems(startLine, startColumn, endColumn, useLowerCaseSuggestions);
+            CompletionItem[] resultCompletionItems = defaultCompletionItems;
+            CompletionItem[] emptyCompletionItems = new CompletionItem[0];
+            int line = textDocumentPosition.Position.Line + 1;
+            int column = textDocumentPosition.Position.Character + 1;
 
             // get the current script parse info object
             ScriptParseInfo scriptParseInfo = GetScriptParseInfo(textDocumentPosition.TextDocument.Uri);
             if (connInfo == null || scriptParseInfo == null)
             {
-                return AutoCompleteHelper.GetDefaultCompletionItems(startLine, startColumn, endColumn, useLowerCaseSuggestions);
+                return defaultCompletionItems;
             }
 
             // reparse and bind the SQL statement if needed
@@ -702,8 +707,9 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
 
             if (scriptParseInfo.ParseResult == null)
             {
-                return AutoCompleteHelper.GetDefaultCompletionItems(startLine, startColumn, endColumn, useLowerCaseSuggestions);
+                return defaultCompletionItems;
             }
+            Token token = GetToken(scriptParseInfo, line, column);
 
             if (scriptParseInfo.IsConnected 
                 && Monitor.TryEnter(scriptParseInfo.BuildingMetadataLock, LanguageService.FindCompletionStartTimeout))
@@ -721,42 +727,76 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
                             // get the completion list from SQL Parser
                             scriptParseInfo.CurrentSuggestions = Resolver.FindCompletions(
                                 scriptParseInfo.ParseResult, 
-                                textDocumentPosition.Position.Line + 1, 
+                                line, 
-                                textDocumentPosition.Position.Character + 1, 
+                                column, 
                                 bindingContext.MetadataDisplayInfoProvider); 
 
                             // cache the current script parse info object to resolve completions later
                             this.currentCompletionParseInfo = scriptParseInfo;
-
+                            
                             // convert the suggestion list to the VS Code format
                             completions = AutoCompleteHelper.ConvertDeclarationsToCompletionItems(
                                 scriptParseInfo.CurrentSuggestions, 
                                 startLine, 
                                 startColumn, 
-                                endColumn);                        
+                                endColumn
+                               );
 
                             return completions;
                         },
                         timeoutOperation: (bindingContext) =>
                         {
-                            return AutoCompleteHelper.GetDefaultCompletionItems(startLine, startColumn, endColumn, useLowerCaseSuggestions);
+                            return defaultCompletionItems;
                         });
 
                     queueItem.ItemProcessed.WaitOne();
 
-                    var completionItems = queueItem.GetResultAsT<CompletionItem[]>(); 
+                    var completionItems = queueItem.GetResultAsT<CompletionItem[]>();
                     if (completionItems != null && completionItems.Length > 0)
                     {
-                        return completionItems;
+                        resultCompletionItems = completionItems;
-                    }          
+                    }
+                    else if (!ShouldShowCompletionList(token))
+                    {
+                        resultCompletionItems = emptyCompletionItems;
+                    }
                 }
                 finally
-                {                    
+                {
                     Monitor.Exit(scriptParseInfo.BuildingMetadataLock);
-                }                
+                }
             }
-            
+            //resultCompletionItems = AutoCompleteHelper.AddTokenToItems(resultCompletionItems, token, startLine, startColumn, endColumn);
-            return AutoCompleteHelper.GetDefaultCompletionItems(startLine, startColumn, endColumn, useLowerCaseSuggestions);
+            return resultCompletionItems;
+        }
+
+        private static Token GetToken(ScriptParseInfo scriptParseInfo, int startLine, int startColumn)
+        {
+            if (scriptParseInfo != null && scriptParseInfo.ParseResult != null && scriptParseInfo.ParseResult.Script != null && scriptParseInfo.ParseResult.Script.Tokens != null)
+            {
+                var tokenIndex = scriptParseInfo.ParseResult.Script.TokenManager.FindToken(startLine, startColumn);
+                if (tokenIndex >= 0)
+                {
+                    return scriptParseInfo.ParseResult.Script.Tokens.ToList()[tokenIndex];
+                }
+            }
+            return null;
+        }
+
+        private static bool ShouldShowCompletionList(Token token)
+        {
+            bool result = true;
+            if (token != null)
+            {
+                switch (token.Id)
+                {
+                    case (int)Tokens.LEX_MULTILINE_COMMENT:
+                    case (int)Tokens.LEX_END_OF_LINE_COMMENT:
+                        result = false;
+                        break;
+                }
+            }
+            return result;
         }
 
         #endregion