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 intellisense if multiple kusto queries exist (#1080)

Browse Source 
Co-authored-by: Monica Gupta <mogupt@microsoft.com>
This commit is contained in:
Monica Gupta
2020-09-21 10:23:00 -07:00
committed by GitHub
parent 2e6b134953
commit fd4d067e71
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Microsoft.Kusto.ServiceLayer/DataSource/KustoDataSource.cs
View File

@@ -19,6 +19,7 @@ using Kusto.Data.Common;
using Kusto.Data.Data; using Kusto.Data.Data;
using Kusto.Data.Net.Client; using Kusto.Data.Net.Client;
using Kusto.Language; using Kusto.Language;
using KustoDiagnostic = Kusto.Language.Diagnostic;
using Kusto.Language.Editor; using Kusto.Language.Editor;
using Microsoft.Kusto.ServiceLayer.DataSource.DataSourceIntellisense; using Microsoft.Kusto.ServiceLayer.DataSource.DataSourceIntellisense;
using Microsoft.Kusto.ServiceLayer.DataSource.Metadata; using Microsoft.Kusto.ServiceLayer.DataSource.Metadata;
@@ -438,11 +439,11 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
/// <inheritdoc/> /// <inheritdoc/>
public override LanguageServices.Contracts.CompletionItem[] GetAutoCompleteSuggestions(ScriptDocumentInfo scriptDocumentInfo, Position textPosition, bool throwOnError = false){ public override LanguageServices.Contracts.CompletionItem[] GetAutoCompleteSuggestions(ScriptDocumentInfo scriptDocumentInfo, Position textPosition, bool throwOnError = false){
var kustoCodeService = new KustoCodeService(scriptDocumentInfo.Contents, SchemaState);
var script = CodeScript.From(scriptDocumentInfo.Contents, SchemaState); var script = CodeScript.From(scriptDocumentInfo.Contents, SchemaState);
script.TryGetTextPosition(textPosition.Line + 1, textPosition.Character + 1, out int position); // Gets the actual offset based on line and local offset script.TryGetTextPosition(textPosition.Line + 1, textPosition.Character + 1, out int position); // Gets the actual offset based on line and local offset
var completion = kustoCodeService.GetCompletionItems(position); var codeBlock = script.GetBlockAtPosition(position);
var completion = codeBlock.Service.GetCompletionItems(position);
scriptDocumentInfo.ScriptParseInfo.CurrentSuggestions = completion.Items; // this is declaration item so removed for now, but keep the info when api gets updated scriptDocumentInfo.ScriptParseInfo.CurrentSuggestions = completion.Items; // this is declaration item so removed for now, but keep the info when api gets updated
List<LanguageServices.Contracts.CompletionItem> completions = new List<LanguageServices.Contracts.CompletionItem>(); List<LanguageServices.Contracts.CompletionItem> completions = new List<LanguageServices.Contracts.CompletionItem>();
@@ -461,11 +462,11 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
/// <inheritdoc/> /// <inheritdoc/>
public override Hover GetHoverHelp(ScriptDocumentInfo scriptDocumentInfo, Position textPosition, bool throwOnError = false){ public override Hover GetHoverHelp(ScriptDocumentInfo scriptDocumentInfo, Position textPosition, bool throwOnError = false){
var kustoCodeService = new KustoCodeService(scriptDocumentInfo.Contents, SchemaState);
var script = CodeScript.From(scriptDocumentInfo.Contents, SchemaState); var script = CodeScript.From(scriptDocumentInfo.Contents, SchemaState);
script.TryGetTextPosition(textPosition.Line + 1, textPosition.Character, out int position); script.TryGetTextPosition(textPosition.Line + 1, textPosition.Character + 1, out int position);
var quickInfo = kustoCodeService.GetQuickInfo(position); var codeBlock = script.GetBlockAtPosition(position);
var quickInfo = codeBlock.Service.GetQuickInfo(position);
return AutoCompleteHelper.ConvertQuickInfoToHover( return AutoCompleteHelper.ConvertQuickInfoToHover(
quickInfo.Text, quickInfo.Text,
@@ -496,8 +497,12 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
{ {
var kustoCodeService = new KustoCodeService(queryText, SchemaState); var kustoCodeService = new KustoCodeService(queryText, SchemaState);
var script = CodeScript.From(queryText, SchemaState); var script = CodeScript.From(queryText, SchemaState);
var parseResult = kustoCodeService.GetDiagnostics(); var parseResult = new List<KustoDiagnostic>();
foreach (var codeBlock in script.Blocks)
{
parseResult.AddRange(codeBlock.Service.GetDiagnostics());
}
parseInfo.ParseResult = parseResult; parseInfo.ParseResult = parseResult;