From 8c5d33189e792419cb09d808836be899f4f3a2a2 Mon Sep 17 00:00:00 2001 From: cosmicshuai Date: Wed, 21 Apr 2021 14:36:31 +0800 Subject: [PATCH 1/2] fix lg goto missing --- .../language-servers/language-generation/src/LGServer.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts index 60415b7282..e3560181a5 100644 --- a/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts +++ b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts @@ -165,6 +165,7 @@ export class LGServer { const wordRange = getRangeAtPosition(document, params.position); const word = document.getText(wordRange); + console.log('Cur word,', word, word.length); const curFileResult = this._lgFile?.templates.find((t) => t.name === word); if (curFileResult?.range) { @@ -174,6 +175,7 @@ export class LGServer { ); } + console.log('definitions:', this._templateDefinitions); const refResult = this._templateDefinitions[word]; if (refResult) { this.connection.sendNotification('GotoDefinition', refResult); @@ -278,11 +280,11 @@ export class LGServer { const curLocale = this.getLocale(fileId); const fileIdWitoutLocale = this.removeLocaleInId(fileId); const lgTextFiles = projectId ? this.getLgResources(projectId) : []; + this._templateDefinitions = {}; for (const file of lgTextFiles) { //Only stroe templates in other LG files if (this.removeLocaleInId(file.id) !== fileIdWitoutLocale && this.getLocale(file.id) === curLocale) { const lgTemplates = await this._lgParser.parse(file.id, file.content, lgTextFiles); - this._templateDefinitions = {}; for (const template of lgTemplates.templates) { this._templateDefinitions[template.name] = { fileId: file.id, From 55b449a01759d421e0a93e9200c1397c7d25f851 Mon Sep 17 00:00:00 2001 From: cosmicshuai Date: Wed, 21 Apr 2021 14:56:35 +0800 Subject: [PATCH 2/2] remove log --- .../tools/language-servers/language-generation/src/LGServer.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts index e3560181a5..ed2fa14dba 100644 --- a/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts +++ b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts @@ -165,7 +165,6 @@ export class LGServer { const wordRange = getRangeAtPosition(document, params.position); const word = document.getText(wordRange); - console.log('Cur word,', word, word.length); const curFileResult = this._lgFile?.templates.find((t) => t.name === word); if (curFileResult?.range) { @@ -175,7 +174,6 @@ export class LGServer { ); } - console.log('definitions:', this._templateDefinitions); const refResult = this._templateDefinitions[word]; if (refResult) { this.connection.sendNotification('GotoDefinition', refResult);