feat: Rewrite suggestions and diagnostics in LG LSP with latest LG APIs

Composer/packages/tools/language-servers/language-generation/package.json

@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@bfc/indexers": "*",
-    "botbuilder-lg": "^4.8.0-preview.106823",
-    "botframework-expressions": "^4.8.0-preview.106476",
+    "botbuilder-lg": "^4.8.0-preview-109324",
+    "adaptive-expressions": "^4.8.0-preview-110700",
     "request-light": "^0.2.2",
     "vscode-languageserver": "^5.3.0-next"
   },

Composer/packages/tools/language-servers/language-generation/src/LGServer.ts

@@ -167,6 +167,7 @@ export class LGServer {
         content: editorContent,
       };
     };
+
     const { fileId, templateId } = this.getLGDocument(document) || {};
 
     if (this.importResolver && fileId) {
@@ -214,12 +215,12 @@ export class LGServer {
       let templates: LgTemplate[] = [];
       try {
         templates = parse(content, id);
-        const { imports } = LGParser.parse(content, id);
-        imports.forEach(({ id }) => {
-          const importedContent = importResolver('.', id).content;
-          const importedTemplates = parse(importedContent, '');
-          templates.push(...importedTemplates);
+        const lgImports = LGParser.parseText(content, id, importResolver).references;
+        lgImports.forEach(u => {
+          templates.push(...u.templates);
         });
+
+        console.log(templates);
       } catch (_error) {
         // ignore
       }
@@ -443,13 +444,12 @@ export class LGServer {
     const range = getRangeAtPosition(document, position);
     const wordAtCurRange = document.getText(range);
     const endWithDot = wordAtCurRange.endsWith('.');
-    const lgFile = this.getLGDocument(document)?.index();
+    const lgFile = LGParser.parseText(document.getText(), '', this.getImportResolver(document));
     if (!lgFile) {
       return Promise.resolve(null);
     }
-    const { templates } = lgFile;
 
-    const completionTemplateList: CompletionItem[] = templates.map(template => {
+    const completionTemplateList: CompletionItem[] = lgFile.allTemplates.map(template => {
       return {
         label: template.name,
         kind: CompletionItemKind.Reference,

Composer/packages/tools/language-servers/language-generation/src/utils.ts

@@ -2,17 +2,9 @@
 // Licensed under the MIT License.
 
 import { TextDocument, Range, Position, DiagnosticSeverity, Diagnostic } from 'vscode-languageserver-types';
-import {
-  DiagnosticSeverity as LGDiagnosticSeverity,
-  ImportResolver,
-  Diagnostic as LGDiagnostic,
-  StaticChecker,
-  LGParser,
-} from 'botbuilder-lg';
+import { DiagnosticSeverity as LGDiagnosticSeverity, Diagnostic as LGDiagnostic, LGParser } from 'botbuilder-lg';
 import { LgTemplate, Diagnostic as BFDiagnostic, offsetRange, LgFile, LgParsed } from '@bfc/indexers';
 
-const staticChecker = new StaticChecker();
-
 // state should map to tokenizer state
 export enum LGCursorState {
   ROOT = 'root',
@@ -123,19 +115,19 @@ export function textFromTemplate(template: Template): string {
 
 export function checkTemplate(template: Template): LGDiagnostic[] {
   const text = textFromTemplate(template);
-  return staticChecker.checkText(text, '', ImportResolver.fileResolver).filter(diagnostic => {
+  return LGParser.parseText(text, '').diagnostics.filter(diagnostic => {
     // ignore non-exist references in template body.
     return diagnostic.message.includes('does not have an evaluator') === false;
   });
 }
 
 export function updateTemplate(content: string, name: string, body: string): string {
-  const resource = LGParser.parse(content);
-  const template = resource.templates.find(t => t.name === name);
+  const lgFile = LGParser.parseText(content);
+  const template = lgFile.templates.find(t => t.name === name);
   // add if not exist
   if (!template) {
-    return resource.addTemplate(name, [], body).toString();
+    return lgFile.addTemplate(name, [], body).toString();
   } else {
-    return resource.updateTemplate(name, name, template.parameters, body).toString();
+    return lgFile.updateTemplate(name, name, template.parameters, body).toString();
   }
 }