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

reserved words with brackets in autocomplete

Browse Source
This commit is contained in:
Aditya Bist
2016-12-15 11:12:36 -08:00
parent 9c6162282a
commit 6e746efad0
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs
View File

@@ -342,6 +342,14 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
} }
} }
/// <summary>
/// Retrieves the reserved word list
/// </summary>
public static string[] GetReservedWordList()
{
return DefaultCompletionText;
}
/// <summary> /// <summary>
/// Gets or sets the current workspace service instance /// Gets or sets the current workspace service instance
/// Setter for internal testing purposes only /// Setter for internal testing purposes only

10
src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/SqlCompletionItem.cs
View File

@@ -3,6 +3,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information. // Licensed under the MIT license. See LICENSE file in the project root for full license information.
// //
using System;
using System.Globalization; using System.Globalization;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Microsoft.SqlServer.Management.SqlParser.Intellisense; using Microsoft.SqlServer.Management.SqlParser.Intellisense;
@@ -45,7 +46,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion
{ {
InsertText = GetCompletionItemInsertName(); InsertText = GetCompletionItemInsertName();
Label = DeclarationTitle; Label = DeclarationTitle;
if (StartsWithBracket(TokenText)) if (StartsWithBracket(TokenText) || IsReservedWord(InsertText))
{ {
Label = WithBracket(Label); Label = WithBracket(Label);
InsertText = WithBracket(InsertText); InsertText = WithBracket(InsertText);
@@ -202,5 +203,12 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion
return text; return text;
} }
} }
private bool IsReservedWord(string text)
{
string[] ReservedWords = AutoCompleteHelper.GetReservedWordList();
int pos = Array.IndexOf(ReservedWords, text.ToLower());
return pos > -1 ? true : false;
}
} }
} }