Integrate SMO .Net core into SQL Tools Service project

This commit is contained in:
Karl Burtram
2016-08-26 10:15:23 -07:00
parent b8329a7986
commit 99ab6406d2
3 changed files with 8 additions and 6 deletions

View File

@@ -75,16 +75,16 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
// Take a reference to the list at a point in time in case we update and replace the list // Take a reference to the list at a point in time in case we update and replace the list
//var suggestions = AutoCompleteList; //var suggestions = AutoCompleteList;
if (!LanguageService.Instance.ScriptParseInfoMap.ContainsKey(textDocumentPosition.Uri)) if (!LanguageService.Instance.ScriptParseInfoMap.ContainsKey(textDocumentPosition.TextDocument.Uri))
{ {
return completions; return completions;
} }
var scriptParseInfo = LanguageService.Instance.ScriptParseInfoMap[textDocumentPosition.Uri]; var scriptParseInfo = LanguageService.Instance.ScriptParseInfoMap[textDocumentPosition.TextDocument.Uri];
var suggestions = Resolver.FindCompletions( var suggestions = Resolver.FindCompletions(
scriptParseInfo.ParseResult, scriptParseInfo.ParseResult,
textDocumentPosition.Position.Line, textDocumentPosition.Position.Line + 1,
textDocumentPosition.Position.Character, textDocumentPosition.Position.Character + 1,
scriptParseInfo.MetadataDisplayInfoProvider); scriptParseInfo.MetadataDisplayInfoProvider);
int i = 0; int i = 0;

View File

@@ -173,6 +173,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
} }
ScriptParseInfo parseInfo = this.ScriptParseInfoMap[scriptFile.ClientFilePath]; ScriptParseInfo parseInfo = this.ScriptParseInfoMap[scriptFile.ClientFilePath];
parseInfo.ParseResult = parseResult;
List<ParseResult> parseResults = new List<ParseResult>(); List<ParseResult> parseResults = new List<ParseResult>();
parseResults.Add(parseResult); parseResults.Add(parseResult);
parseInfo.Binder.Bind( parseInfo.Binder.Bind(

View File

@@ -10,10 +10,11 @@
"Microsoft.SqlServer.SqlParser": "140.1.5", "Microsoft.SqlServer.SqlParser": "140.1.5",
"System.Data.Common": "4.1.0", "System.Data.Common": "4.1.0",
"System.Data.SqlClient": "4.1.0", "System.Data.SqlClient": "4.1.0",
"Microsoft.SqlServer.Smo": "140.1.2", "Microsoft.SqlServer.Smo": "140.1.5",
"System.Security.SecureString": "4.0.0", "System.Security.SecureString": "4.0.0",
"System.Collections.Specialized": "4.0.1", "System.Collections.Specialized": "4.0.1",
"System.ComponentModel.TypeConverter": "4.1.0" "System.ComponentModel.TypeConverter": "4.1.0",
"System.Diagnostics.TraceSource": "4.0.0"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {