Merge branch 'lg-lsp' of https://github.com/zhixzhan/BotFramework-Com…

…poser-1 into lg-lsp
microsoft · Nov 28, 2019 · 8ff61f2 · 8ff61f2
2 parents 5824cef + f68709f
commit 8ff61f2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Composer/packages/lib/code-editor/src/LgEditor.tsx b/Composer/packages/lib/code-editor/src/LgEditor.tsx
@@ -51,7 +51,7 @@ declare global {
 
 async function initializeDocuments(lgOption) {
   const languageClient = window.monacoLGEditorInstance;
-  if (languageClient && lgOption && lgOption.inline) {
+  if (languageClient) {
     await languageClient.onReady();
     languageClient.sendRequest('initializeDocuments', lgOption);
   }

diff --git a/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts
@@ -75,14 +75,12 @@ export class LGServer {
 
     this.connection.onRequest((method, params) => {
       if (InitializeDocumentsMethodName === method) {
-        const { uri, content, template } = params;
-        this.LGDocuments.push({ uri, content, template });
+        const { uri, inline = false, content, template } = params;
+        this.LGDocuments.push({ uri, inline, content, template });
         // run diagnostic
         const textDocument = this.documents.get(uri);
         if (textDocument) {
-          setTimeout(() => {
-            this.validate(textDocument);
-          }, 500);
+          this.validate(textDocument);
         }
       }
     });
@@ -98,8 +96,9 @@ export class LGServer {
   protected getLGDocumentContent(document: TextDocument): string {
     const LGDocument = this.LGDocuments.find(item => item.uri === document.uri);
     const text = document.getText();
-    if (LGDocument) {
+    if (LGDocument && LGDocument.inline) {
       const { content, template } = LGDocument;
+      if (!content || !template) return text;
       const updatedTemplate = {
         Name: template.Name,
         Parameters: template.Parameters,
@@ -313,9 +312,15 @@ export class LGServer {
     let lineOffset = 0;
     const LGDocument = this.getLGDocument(document);
 
+    // uninitialized
+    if (!LGDocument) {
+      return;
+    }
+
     // if inline editor, concat new content for validate
-    if (LGDocument) {
+    if (LGDocument.inline) {
       const { content, template } = LGDocument;
+      if (!content || !template) return;
       const updatedTemplate = {
         Name: template.Name,
         Parameters: template.Parameters,

diff --git a/Composer/packages/tools/language-servers/language-generation/src/utils.ts b/Composer/packages/tools/language-servers/language-generation/src/utils.ts
@@ -22,8 +22,9 @@ export interface Template {
 
 export interface LGDocument {
   uri: string;
-  content: string;
-  template: Template;
+  inline: boolean;
+  content?: string;
+  template?: Template;
 }
 
 export function getRangeAtPosition(document: TextDocument, position: Position): Range | undefined {