From ff9a652973f600a23c73d0d752f5d5d363a5ea22 Mon Sep 17 00:00:00 2001 From: yadu Date: Tue, 8 Jan 2019 20:13:06 +0800 Subject: [PATCH] Bug Fix. --- dist/facade/LanguageServiceFacade.js | 12 +++++----- dist/facade/LanguageServiceFacade.js.map | 2 +- src/facade/LanguageServiceFacade.ts | 28 +++++++++++------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dist/facade/LanguageServiceFacade.js b/dist/facade/LanguageServiceFacade.js index c2a2b42..1f1b26e 100644 --- a/dist/facade/LanguageServiceFacade.js +++ b/dist/facade/LanguageServiceFacade.js @@ -35,19 +35,22 @@ var LanguageServiceFacade = /** @class */ (function () { LanguageServiceFacade.workingWorker = new Worker(url); LanguageServiceFacade.workingWorker.onmessage = function (ev) { var processedResults = []; - var results = ev.data; + var parseResults = ev.data; if (parseReason === ParseReason.GetCompletionWords) { - results.forEach(function (label) { + parseResults.forEach(function (label) { if (!!label) { processedResults.push({ label: label, + insertText: label, kind: monaco_editor_1.languages.CompletionItemKind.Keyword }); } }); + var finalResult = { suggestions: processedResults }; + resolve(finalResult); } else if (parseReason === ParseReason.GetErrors) { - results.forEach(function (err) { + parseResults.forEach(function (err) { var mark = { severity: monaco_editor_1.MarkerSeverity.Error, message: err.Message, @@ -58,9 +61,8 @@ var LanguageServiceFacade = /** @class */ (function () { }; processedResults.push(mark); }); + resolve(processedResults); } - var completionItemList = { suggestions: processedResults }; - resolve(completionItemList); }; var source = { code: str, diff --git a/dist/facade/LanguageServiceFacade.js.map b/dist/facade/LanguageServiceFacade.js.map index 3374ce9..9248b63 100644 --- a/dist/facade/LanguageServiceFacade.js.map +++ b/dist/facade/LanguageServiceFacade.js.map @@ -1 +1 @@ -{"version":3,"file":"LanguageServiceFacade.js","sourceRoot":"","sources":["../../src/facade/LanguageServiceFacade.ts"],"names":[],"mappings":";;AAAA,qBAAuB;AACvB,+CAAgE;AAEhE,IAAY,WAGX;AAHD,WAAY,WAAW;IACnB,yEAAsB,CAAA;IACtB,uDAAa,CAAA;AACjB,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAED;IAAA;IAuEA,CAAC;IAlEiB,mDAA6B,GAA3C,UAA4C,GAAY,EAAE,WAAyB;QAC/E,IAAM,YAAY,GAAG,CAAC,CAAC,OAAO,CAAM,UAAC,OAAa,EAAE,MAAY;YAC5D,IAAM,IAAI,GAAG,UAAU,CAAC;gBACpB,IAAM,KAAK,GAAS,EAAE,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,IAAM,MAAM,GAAG,qBAAqB,CAAC,cAAc,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACtE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,UAAS,KAAK;YACrD,qBAAqB,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;IAjBuB,6BAAO,GAAY,IAAI,CAAC;IAEjC,mCAAa,GAAY,IAAI,CAAC;IAiB9B,oCAAc,GAAG,UAAC,GAAY,EAAE,WAAyB;QACpE,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,OAAa;YAE3B,IAAI,qBAAqB,CAAC,aAAa,IAAI,IAAI,EAAE;gBAC7C,qBAAqB,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;aACnD;YAED,IAAM,wCAAwC,GAAc,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAK,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAU,CAAC;YAC3I,IAAI,GAAG,GAAG,wCAAwC,CAAC,OAAO,CAAC,WAAW,EAAE,wFAAwF,CAAC,CAAC;YAClK,qBAAqB,CAAC,aAAa,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;YAEtD,qBAAqB,CAAC,aAAa,CAAC,SAAS,GAAG,UAAC,EAAiB;gBAC9D,IAAI,gBAAgB,GAAQ,EAAE,CAAC;gBAE/B,IAAI,OAAO,GAAW,EAAE,CAAC,IAAI,CAAC;gBAE9B,IAAI,WAAW,KAAK,WAAW,CAAC,kBAAkB,EAAE;oBAChD,OAAO,CAAC,OAAO,CAAC,UAAC,KAAa;wBAC1B,IAAI,CAAC,CAAC,KAAK,EAAE;4BACT,gBAAgB,CAAC,IAAI,CAAC;gCAClB,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,yBAAS,CAAC,kBAAkB,CAAC,OAAO;6BAC7C,CAAC,CAAC;yBACN;oBACL,CAAC,CAAC,CAAC;iBACN;qBAAM,IAAI,WAAW,KAAK,WAAW,CAAC,SAAS,EAAE;oBAC9C,OAAO,CAAC,OAAO,CAAC,UAAC,GAAQ;wBACrB,IAAM,IAAI,GAAuB;4BAC7B,QAAQ,EAAE,8BAAc,CAAC,KAAK;4BAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;4BACpB,eAAe,EAAE,GAAG,CAAC,IAAI;4BACzB,WAAW,EAAE,GAAG,CAAC,MAAM;4BACvB,aAAa,EAAE,GAAG,CAAC,IAAI;4BACvB,SAAS,EAAE,GAAG,CAAC,MAAM;yBACxB,CAAC;wBAEF,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBAC/B,CAAC,CAAC,CAAC;iBACN;gBAED,IAAI,kBAAkB,GAA8B,EAAC,WAAW,EAAG,gBAAgB,EAAC,CAAC;gBACrF,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAChC,CAAC,CAAA;YAED,IAAM,MAAM,GAAG;gBACX,IAAI,EAAG,GAAG;gBACV,MAAM,EAAG,WAAW;aACvB,CAAC;YACF,qBAAqB,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IACL,4BAAC;CAAA,AAvED,IAuEC;AAvEY,sDAAqB"} \ No newline at end of file +{"version":3,"file":"LanguageServiceFacade.js","sourceRoot":"","sources":["../../src/facade/LanguageServiceFacade.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/facade/LanguageServiceFacade.ts b/src/facade/LanguageServiceFacade.ts index 7d352fd..0e16600 100644 --- a/src/facade/LanguageServiceFacade.ts +++ b/src/facade/LanguageServiceFacade.ts @@ -28,31 +28,32 @@ export class LanguageServiceFacade { private static GetParseResult = (str : string, parseReason : ParseReason) : Q.Promise => { return Q.Promise((resolve : any) => { - if (LanguageServiceFacade.workingWorker != null) { LanguageServiceFacade.workingWorker.terminate(); } - + const currentUrlWithoutQueryParamsAndHashRoute: string = `${window.location.protocol}//${window.location.host}${window.location.pathname}`; let url = currentUrlWithoutQueryParamsAndHashRoute.replace(/\/[^\/]*$/, '/node_modules/@azure/cosmos-language-service/dist/worker/dist/LanguageServiceWorker.js'); LanguageServiceFacade.workingWorker = new Worker(url); - LanguageServiceFacade.workingWorker.onmessage = (ev : MessageEvent) => { - var processedResults: any = []; - - var results : any[] = ev.data; - + LanguageServiceFacade.workingWorker.onmessage = (ev : MessageEvent) => { + var processedResults: any[] = []; + var parseResults: any[] = ev.data; + if (parseReason === ParseReason.GetCompletionWords) { - results.forEach((label: string) => { + parseResults.forEach((label: string) => { if (!!label) { processedResults.push({ label: label, + insertText: label, kind: languages.CompletionItemKind.Keyword }); } }); + let finalResult : languages.CompletionList = {suggestions : processedResults}; + resolve(finalResult); } else if (parseReason === ParseReason.GetErrors) { - results.forEach((err: any) => { + parseResults.forEach((err: any) => { const mark: editor.IMarkerData = { severity: MarkerSeverity.Error, message: err.Message, @@ -61,13 +62,10 @@ export class LanguageServiceFacade { endLineNumber: err.line, endColumn: err.column }; - - processedResults.push(mark) - }); + processedResults.push(mark); + }); + resolve(processedResults); } - - let completionItemList : languages.CompletionList = {suggestions : processedResults}; - resolve(completionItemList); } const source = {